Work in progress...

Saitek-X52-PPM.ino

@@ -17,6 +17,9 @@
 #include "hid_parser.h"
 #include "x52.h"
 
+#define ENABLE_SERIAL_PORT
+#define DEBUG_OUTPUT
+
 USB usb;
 USBHub hub(&usb);
 HIDUniversal hid(&usb);
@@ -24,12 +27,19 @@ X52 x52(&usb, &hid);
 JoystickEvents joyevents;
 JoystickReportParser joy(&joyevents);
 
-void setup() {  
+void setup() {
+#ifdef ENABLE_SERIAL_PORT
     Serial.begin(115200);
+#endif
+
+#ifdef DEBUG_OUTPUT
     Serial.println("Start");
+#endif
 
     if (usb.Init() == -1) {
+#ifdef DEBUG_OUTPUT
         Serial.println("OSC did not start.");
+#endif
     }
 
     delay(200);
@@ -39,20 +49,30 @@ void setup() {
     }
 }
 
+void init_joystick() {
+    x52.setLEDBrightness(2);
+    x52.setMFDBrightness(2);
+    x52.setShift(0);
+    x52.setBlink(0);
+    x52.setMFDText(0, "Arduino X52 Host");
+    x52.setMFDText(1, "    has been    ");
+    x52.setMFDText(2, "  initialized!  ");
+}
+
 void loop() {
     usb.Task();
 
     static unsigned long lastTime = 0;
-    static uint8_t d = 0;
-    if ((millis() - lastTime) >= 500) {
-        //x52.setDate(d, d, d);
-        d++;
+    static uint8_t initialized = 0;
+    if ((millis() - lastTime) >= 1000) {
         lastTime = millis();
-
-        String tmp = String(d);
-        //x52.setMFDText(0, tmp.c_str());
+        if (!initialized) {
+            init_joystick();
+            initialized = 1;
+        }
     }
 
+#ifdef DEBUG_OUTPUT
     if (Serial.available()) {
         char c = Serial.read();
         if (c == 't') {
@@ -89,5 +109,6 @@ void loop() {
             Serial.println("Unknown command!");
         }
     }
+#endif
 }
 

hid_parser.cpp

@@ -12,14 +12,17 @@
 
 #include "hid_parser.h"
 
+//#define DEBUG_OUTPUT
+
 JoystickReportParser::JoystickReportParser(JoystickEvents* evt)
-        : joyEvents(evt), oldHat(0), oldButtons(0), oldMouse(0) {
+        : joyEvents(evt), oldHat(0), oldButtons(0), oldMouse(0), buffer(0) {
     for (uint8_t i = 0; i < RPT_GEMEPAD_LEN; i++) {
         oldPad[i] = 0;
     }
 }
 
 void JoystickReportParser::Parse(HID* hid, bool is_rpt_id, uint8_t len, uint8_t* bufPart) {
+    // Ugly hack for too small packet size in USB Host library...
     if (len == 8) {
         // First part of buffer, store and do nothing
         for (uint8_t i = 0; i < 8; i++) {
@@ -33,7 +36,8 @@ void JoystickReportParser::Parse(HID* hid, bool is_rpt_id, uint8_t len, uint8_t*
         }
     }
 
-    /*
+    // Dump whole USB HID packet for debugging purposes
+#ifdef DEBUG_OUTPUT
     Serial.println("");
     Serial.print("Packet: ");
     for (uint8_t i = 0; i < (8 + len); i++) {
@@ -42,7 +46,7 @@ void JoystickReportParser::Parse(HID* hid, bool is_rpt_id, uint8_t len, uint8_t*
     }
     Serial.println("");
     Serial.println("");
-    */
+#endif
 
     // Checking if there are changes in report since the method was last called
     bool match = true;
@@ -70,7 +74,7 @@ void JoystickReportParser::Parse(HID* hid, bool is_rpt_id, uint8_t len, uint8_t*
         }
     }
 
-    // Calling Hat Switch event handler`
+    // Calling Hat Switch event handler
     uint8_t hat = (buf[12] & 0xF0) >> 4;
     if (hat != oldHat && joyEvents) {
         joyEvents->OnHatSwitch(hat);
@@ -103,6 +107,7 @@ void JoystickReportParser::Parse(HID* hid, bool is_rpt_id, uint8_t len, uint8_t*
         oldButtons = buttons;
     }
 
+    // Calling Mouse Event Handler if state has changed
     if (oldMouse != buf[13] && joyEvents) {
         oldMouse = buf[13];
         joyEvents->OnMouseMoved((buf[13] & 0xF0) >> 4, buf[13] & 0x0F);

joystick_events.cpp

@@ -12,45 +12,174 @@
 
 #include "hid_parser.h"
 
+//#define DEBUG_OUTPUT_RAW
+#define DEBUG_OUTPUT
+
+
+/*
+ * Uuuhhh TODO!!
+ * This is not a deadzone, this is something like sensitivity.
+ * For deadzone, we need to only apply it from the center outwards.
+ */
+
+
+JoystickEvents::JoystickEvents()
+        : lastData(0), lastMouseX(0), lastMouseY(0), deadZone(0) {
+    deadZone.X = 0;
+    deadZone.Y = 0;
+    deadZone.Z = 0;
+    deadZone.Rx = 0;
+    deadZone.Ry = 0;
+    deadZone.Rz = 50;
+    deadZoneMouseX = 0;
+    deadZoneMouseY = 0;
+}
+
 void JoystickEvents::OnGamePadChanged(const GamePadEventData *evt) {
+#ifdef DEBUG_OUTPUT_RAW
     Serial.print("X: ");
     PrintHex<uint16_t > (evt->X, 0x80);
-    Serial.print("\tY: ");
+    Serial.print(" Y: ");
     PrintHex<uint16_t > (evt->Y, 0x80);
-    Serial.print("\tZ: ");
+    Serial.print(" Z: ");
     PrintHex<uint8_t > (evt->Z, 0x80);
-    Serial.print("\tRx: ");
+    Serial.print(" Rx: ");
     PrintHex<uint8_t > (evt->Rx, 0x80);
-    Serial.print("\tRy: ");
+    Serial.print(" Ry: ");
     PrintHex<uint8_t > (evt->Ry, 0x80);
-    Serial.print("\tRz: ");
+    Serial.print(" Rz: ");
     PrintHex<uint16_t > (evt->Rz, 0x80);
-    Serial.print("\tSlider: ");
+    Serial.print(" S: ");
     PrintHex<uint8_t > (evt->Slider, 0x80);
     Serial.println("");
+#endif
+
+    GamePadEventData newData = lastData;
+    uint8_t updated = 0;
+
+    if ((evt->X > (lastData.X + deadZone.X))
+            || (evt->X < (lastData.X - deadZone.X))) {
+        newData.X = evt->X;
+        updated = 1;
+    }
+
+    if ((evt->Y > (lastData.Y + deadZone.Y))
+            || (evt->Y < (lastData.Y - deadZone.Y))) {
+        newData.Y = evt->Y;
+        updated = 1;
+    }
+
+    if ((evt->Z > (lastData.Z + deadZone.Z))
+            || (evt->Z < (lastData.Z - deadZone.Z))) {
+        newData.Z = evt->Z;
+        updated = 1;
+    }
+
+    if ((evt->Rx > (lastData.Rx + deadZone.Rx))
+            || (evt->Rx < (lastData.Rx - deadZone.Rx))) {
+        newData.Rx = evt->Rx;
+        updated = 1;
+    }
+
+    if ((evt->Ry > (lastData.Ry + deadZone.Ry))
+            || (evt->Ry < (lastData.Ry - deadZone.Ry))) {
+        newData.Ry = evt->Ry;
+        updated = 1;
+    }
+
+    if ((evt->Rz > (lastData.Rz + deadZone.Rz))
+            || (evt->Rz < (lastData.Rz - deadZone.Rz))) {
+        newData.Rz = evt->Rz;
+        updated = 1;
+    }
+
+    if ((evt->Slider > (lastData.Slider + deadZone.Slider))
+            || (evt->Slider < (lastData.Slider - deadZone.Slider))) {
+        newData.Slider = evt->Slider;
+        updated = 1;
+    }
+
+    if (updated) {
+#ifdef DEBUG_OUTPUT
+        Serial.print("X: ");
+        PrintHex<uint16_t > (newData.X, 0x80);
+        Serial.print(" Y: ");
+        PrintHex<uint16_t > (newData.Y, 0x80);
+        Serial.print(" Z: ");
+        PrintHex<uint8_t > (newData.Z, 0x80);
+        Serial.print(" Rx: ");
+        PrintHex<uint8_t > (newData.Rx, 0x80);
+        Serial.print(" Ry: ");
+        PrintHex<uint8_t > (newData.Ry, 0x80);
+        Serial.print(" Rz: ");
+        PrintHex<uint16_t > (newData.Rz, 0x80);
+        Serial.print(" S: ");
+        PrintHex<uint8_t > (newData.Slider, 0x80);
+        Serial.println("");
+#endif
+    }
+
+    lastData = *evt;
 }
 
 void JoystickEvents::OnHatSwitch(uint8_t hat) {
+#ifdef DEBUG_OUTPUT
     Serial.print("Hat Switch: ");
     PrintHex<uint8_t > (hat, 0x80);
     Serial.println("");
+#endif
 }
 
 void JoystickEvents::OnButtonUp(uint8_t but_id) {
+#ifdef DEBUG_OUTPUT
     Serial.print("Up: ");
     Serial.println(but_id, DEC);
+#endif
 }
 
 void JoystickEvents::OnButtonDn(uint8_t but_id) {
-    Serial.print("Dn: ");
+#ifdef DEBUG_OUTPUT
+    Serial.print("Down: ");
     Serial.println(but_id, DEC);
+#endif
 }
 
 void JoystickEvents::OnMouseMoved(uint8_t x, uint8_t y) {
+#ifdef DEBUG_OUTPUT_RAW
     Serial.print("Mouse X: ");
     PrintHex<uint8_t >(x, 0x80);
     Serial.print("\tY: ");
     PrintHex<uint8_t >(y, 0x80);
     Serial.println("");
+#endif
+
+    uint8_t newX = lastMouseX;
+    uint8_t newY = lastMouseY;
+    uint8_t updated = 0;
+    
+    if ((x > (lastMouseX + deadZoneMouseX))
+            || (x < (lastMouseX - deadZoneMouseX))) {
+        newX = x;
+        updated = 1;
+    }
+
+    if ((y > (lastMouseY + deadZoneMouseY))
+            || (y < (lastMouseY - deadZoneMouseY))) {
+        newY = y;
+        updated = 1;
+    }
+
+    if (updated) {
+#ifdef DEBUG_OUTPUT
+        Serial.print("Mouse X: ");
+        PrintHex<uint8_t >(newX, 0x80);
+        Serial.print("\tY: ");
+        PrintHex<uint8_t >(newY, 0x80);
+        Serial.println("");
+#endif
+    }
+
+    lastMouseX = x;
+    lastMouseY = y;
 }
 

joystick_events.h

@@ -14,17 +14,27 @@
 #define __JOYSTICK_EVENTS_H__
 
 struct GamePadEventData {
+    GamePadEventData(uint16_t v) : X(v), Y(v), Z(v), Rx(v), Ry(v), Rz(v) { }
+    
     uint16_t X, Y, Rz; // 11bit, 11bit, 10bit
     uint8_t Z, Rx, Ry, Slider;
 };
 
 class JoystickEvents {
   public:
+    JoystickEvents();
+
     virtual void OnGamePadChanged(const GamePadEventData *evt);
     virtual void OnHatSwitch(uint8_t hat);
     virtual void OnButtonUp(uint8_t but_id);
     virtual void OnButtonDn(uint8_t but_id);
     virtual void OnMouseMoved(uint8_t x, uint8_t y);
+
+  protected:
+    GamePadEventData lastData;
+    GamePadEventData deadZone;
+    uint8_t lastMouseX, lastMouseY;
+    uint8_t deadZoneMouseX, deadZoneMouseY;
 };
 
 #endif // __JOYSTICK_EVENTS_H__