Merge pull request #49 from dmadison/dj-unsigned

Unsigned DJ Crossfade

Author: dmadison

examples/DJ/DJ_Demo/DJ_Demo.ino

@@ -48,7 +48,7 @@ void loop() {
 		delay(1000);
 	}
 	else {
-		// Read the turntable, basic (-30-29. Clockwise = positive, faster = larger)
+		// Read the turntable, basic (-30-29. Clockwise = positive, faster = larger). ~900 ticks per revolution.
 		int turntable = dj.turntable();
 
 		Serial.print("The turntable is ");
@@ -108,19 +108,19 @@ void loop() {
 		Serial.print("The effect dial is at ");
 		Serial.println(fx);
 
-		// Read the crossfade slider (-8-7, negative to the left)
+		// Read the crossfade slider (0-15, left to right)
 		int cross = dj.crossfadeSlider();
 
 		Serial.print("The crossfade slider is ");
 
-		if (cross <= -2) {
+		if (cross <= 6) {
 			Serial.println("left");
 		}
-		else if (cross >= 1) {
+		else if (cross >= 9) {
 			Serial.println("right");
 		}
 		else {
-			Serial.println("center");
+			Serial.println("centered");
 		}
 
 		// Read the joystick axis (0-63 XY)

src/controllers/DJTurntable.cpp

@@ -69,8 +69,8 @@ uint8_t DJTurntableController_Shared::effectDial() const {
 	return getControlData(Maps::EffectDial);
 }
 
-int8_t DJTurntableController_Shared::crossfadeSlider() const {
-	return getControlData(Maps::CrossfadeSlider) - 8;  // Shifted to signed int
+uint8_t DJTurntableController_Shared::crossfadeSlider() const {
+	return getControlData(Maps::CrossfadeSlider);
 }
 
 boolean DJTurntableController_Shared::buttonEuphoria() const {
@@ -154,7 +154,7 @@ void DJTurntableController_Shared::printDebug(Print& output) {
 	char euphoriaPrint = buttonEuphoria() ? 'E' : fillCharacter;
 
 	sprintf(buffer,
-		" Joy:(%2u, %2u) | %c | %c%c | FX: %2u | Fade: %2d",
+		" Joy:(%2u, %2u) | %c | %c%c | FX: %2u | Fade: %2u",
 		joyX(), joyY(),
 		euphoriaPrint,
 		minusPrint, plusPrint,

src/controllers/DJTurntable.h

@@ -68,14 +68,14 @@ namespace NintendoExtensionCtrl {
 			Both,
 		};
 
-		int8_t turntable() const;  // 6 bits, -30-29. Clockwise = positive, faster = larger.
+		int8_t turntable() const;  // 6 bits, -30-29. Clockwise = positive, faster = larger. ~900 ticks per revolution.
 
 		boolean buttonGreen() const;
 		boolean buttonRed() const;
 		boolean buttonBlue() const;
 
 		uint8_t effectDial() const;  // 5 bits, 0-31. One rotation per rollover.
-		int8_t crossfadeSlider() const;  // 4 bits, -8-7. Negative to the left.
+		uint8_t crossfadeSlider() const;  // 4 bits, 0-15. Left to right.
 
 		boolean buttonEuphoria() const;