Pads and joystick are working fine.

Author: moussu

RX/RX.pde

@@ -4,7 +4,7 @@
 #include "nRF24L01.h"
 #include "MirfHardwareSpiDriver.h"
 
-#define CHANNEL 16
+#define CHANNEL 1
 
 void hello();
 
@@ -33,47 +33,50 @@ void loop()
   static bool padsStates[N_PADS] = {0};
   bool padsPressed = false;
 
-  static int joyCtrls[2] = {14, 15};
-  static uint8_t joyLastVals[2] = {0};
-  uint8_t joyVals[2] = {0};
+  static int joyCtrls[2] = {0, 1};
+  static uint16_t joyLastVals[2] = {0};
+  uint16_t joyVals[2] = {0};
   bool pitchChanged = false;
 
   if(Mirf.dataReady())
   {
     Mirf.getData(buf);
 
-    padsPressed = false;
     for (int pad = 0; pad < N_PADS; pad++)
     {
       if (buf[pad] && !padsStates[pad])
       {
-        usbMIDI.sendNoteOn(padsNotes[pad], 255, CHANNEL);
+        usbMIDI.sendNoteOn(padsNotes[pad], 50, CHANNEL);
         padsStates[pad] = true;
         padsPressed = true;
       }
-      else if (padsStates[pad])
+      else if (!buf[pad] && padsStates[pad])
       {
         usbMIDI.sendNoteOff(padsNotes[pad], 0, CHANNEL);
         padsStates[pad] = false;
       }
     }
 
-    joyVals[0] = (buf[N_PADS + 0] << 6) - 0x2000;
-    joyVals[1] = (buf[N_PADS + 1] << 6) - 0x2000;
-    // [ val * 0x4000 / 256 - 0x2000 ]
+    joyVals[0] = (uint16_t)buf[N_PADS + 0] | ((uint16_t)buf[N_PADS + 1] << 8);
+    joyVals[1] = buf[N_PADS + 2];
 
-    if (joyVals[0] != joyLastVals[0] || joyVals[1] != joyLastVals[1])
+    if (joyVals[0] != joyLastVals[0])
     {
-      usbMIDI.sendControlChange(joyCtrls[0], joyVals[0], CHANNEL);
-      usbMIDI.sendControlChange(joyCtrls[1], joyVals[1], CHANNEL);
+      usbMIDI.sendPitchBend(joyVals[0], CHANNEL);
+      pitchChanged = true;
       joyLastVals[0] = joyVals[0];
-      joyLastVals[1] = joyVals[1];
+    }
+    
+    if (joyVals[1] != joyLastVals[1])
+    {
+      usbMIDI.sendControlChange(joyCtrls[1], joyVals[1], CHANNEL);
       pitchChanged = true;
+      joyLastVals[1] = joyVals[1];
     }
 
     usbMIDI.send_now();
 
-    if (padsPressed || pitchChanged)
+    if (padsPressed || pitchChanged)
       digitalWrite(LED, HIGH);
     else
       digitalWrite(LED, LOW);

TX/TX.pde

@@ -19,8 +19,8 @@ typedef enum {
 bool padsPressed = false;
 bool padsStates[N_PADS] = {false};
 bool joyPressed = true;
-int16_t joyValX = 0;
-int16_t joyValY = 0;
+uint16_t joyValX = 0;
+uint16_t joyValY = 0;
 
 void hello();
 void readPads();
@@ -31,6 +31,8 @@ void setup()
   // with a 3.3V supply we need 8MHz instead of 16MHz
   SET_CPU_FREQ;
 
+  Serial.begin(115200);
+
   pinMode(LED, OUTPUT);
   hello();
 
@@ -52,8 +54,9 @@ void loop()
     buf[i] = padsStates[i] ? 1 : 0;
 
   readJoy();
-  buf[N_PADS + 0] = (uint8_t)joyValX;
-  buf[N_PADS + 1] = (uint8_t)joyValY;
+  buf[N_PADS + 0] = (uint8_t)(joyValX >> 0);
+  buf[N_PADS + 1] = (uint8_t)(joyValX >> 8);
+  buf[N_PADS + 2] = (uint8_t)joyValY;
 
 #ifdef DEBUG_LED
   if (padsPressed || joyPressed)
@@ -69,7 +72,7 @@ void loop()
 void readPads()
 {
   padsPressed = false;
-  for (uint8_t i = 0; i < N_PADS; i++)
+  for (int i = 0; i < N_PADS; i++)
   {
     if(digitalRead(PAD1 + i) == HIGH)
     {
@@ -83,18 +86,21 @@ void readPads()
 
 void readJoy()
 {
-  const int16_t THRESHOLD = 1 << 3; //neglect up to the 3th LSB
-
-  int16_t newJoyValX = analogRead(JOY_X) >> 3;
-  int16_t newJoyValY = ABS( ((analogRead(JOY_Y) >> 2) - 127) );
-  newJoyValY = newJoyValY>127? 127 : newJoyValY;
-
+  uint16_t newJoyValX = 16383 - analogRead(JOY_X) * (16384 / 1023);
+  uint16_t newJoyValY = ABS(((analogRead(JOY_Y) >> 2) - 127));
+  newJoyValY = newJoyValY > 127 ? 127 : newJoyValY;
+  
   joyPressed = false;
-  if (ABS(joyValX - newJoyValX) > THRESHOLD ||
-      ABS(joyValY - newJoyValY) > THRESHOLD)
+  
+  if (ABS(joyValX - newJoyValX) > (1 << 5))
+  {
+    joyValX = newJoyValX;
+    joyPressed = true;
+  }
+  
+  if (ABS(joyValY - newJoyValY) > (1 << 3))
   {
-    joyValX = newJoyValX; // keep only 8 significant bits...
-    joyValY = newJoyValY; // ...out of the 10 obtained.
+    joyValY = newJoyValY;
     joyPressed = true;
   }
 }

common.h

@@ -19,7 +19,7 @@
 
 #define N_PADS 4
 #define N_JOYS 1
-#define PAYLOAD (N_PADS + 2 * N_JOYS)
+#define PAYLOAD (N_PADS + 3 * N_JOYS)
 #define LED 11
 
 #endif