Rename to ButtonDown, added MFD button info, fixed deadzone.

Saitek-X52-PPM.ino

@@ -19,8 +19,8 @@
 #include "x52.h"
 #include "cppm.h"
 
-//#define ENABLE_SERIAL_PORT
-//#define DEBUG_OUTPUT
+#define ENABLE_SERIAL_PORT
+#define DEBUG_OUTPUT
 //#define DEBUG_INPUT
 
 USB usb;

events.h

@@ -24,7 +24,7 @@ class JoystickEvents {
     virtual void OnGamePadChanged(const GamePadEventData& evt) = 0;
     virtual void OnHatSwitch(uint8_t hat) = 0;
     virtual void OnButtonUp(uint8_t but_id) = 0;
-    virtual void OnButtonDn(uint8_t but_id) = 0;
+    virtual void OnButtonDown(uint8_t but_id) = 0;
     virtual void OnMouseMoved(uint8_t x, uint8_t y) = 0;
 
   protected:
@@ -37,7 +37,7 @@ class JoystickEventsDeadZone : 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 OnButtonDown(uint8_t but_id);
     virtual void OnMouseMoved(uint8_t x, uint8_t y);
 
   private:
@@ -54,7 +54,7 @@ class JoystickEventsCPPM : 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 OnButtonDown(uint8_t but_id);
     virtual void OnMouseMoved(uint8_t x, uint8_t y);
 
   private:
@@ -68,7 +68,7 @@ class JoystickEventsButtons : 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 OnButtonDown(uint8_t but_id);
     virtual void OnMouseMoved(uint8_t x, uint8_t y);
 
   private:

events_buttons.cpp

@@ -17,9 +17,8 @@
 
 #define DEBUG_BUTTON_MFD
 
-JoystickEventsButtons::JoystickEventsButtons(X52* x, JoystickEvents* client) : JoystickEvents(client), x52(x) {
-
-}
+JoystickEventsButtons::JoystickEventsButtons(X52* x, JoystickEvents* client)
+        : JoystickEvents(client), x52(x) { }
 
 void JoystickEventsButtons::OnGamePadChanged(const GamePadEventData& evt) {
     if (client) {
@@ -28,22 +27,28 @@ void JoystickEventsButtons::OnGamePadChanged(const GamePadEventData& evt) {
 }
 
 void JoystickEventsButtons::OnHatSwitch(uint8_t hat) {
+#ifdef DEBUG_BUTTON_MFD
+    String text = "Hat is " + String(hat);
+    x52->setMFDText(1, text.c_str());
+#endif
+
     if (client) {
         client->OnHatSwitch(hat);
     }
 }
 
 void JoystickEventsButtons::OnButtonUp(uint8_t but_id) {
+#ifdef DEBUG_BUTTON_MFD
+    String text = "Button " + String(but_id) + " up";
+    x52->setMFDText(1, text.c_str());
+#endif
+
     if (client) {
         client->OnButtonUp(but_id);
     }
 }
 
-void JoystickEventsButtons::OnButtonDn(uint8_t but_id) {
-    if (client) {
-        client->OnButtonDn(but_id);
-    }
-
+void JoystickEventsButtons::OnButtonDown(uint8_t but_id) {
 #ifdef DEBUG_BUTTON_MFD
     String text = "Button " + String(but_id) + " down";
     x52->setMFDText(1, text.c_str());
@@ -59,6 +64,10 @@ void JoystickEventsButtons::OnButtonDn(uint8_t but_id) {
         x52->setLEDBrightness(0);
         x52->setMFDBrightness(0);
     }
+
+    if (client) {
+        client->OnButtonDown(but_id);
+    }
 }
 
 void JoystickEventsButtons::OnMouseMoved(uint8_t x, uint8_t y) {

events_cppm.cpp

@@ -34,7 +34,7 @@ JoystickEventsCPPM::JoystickEventsCPPM(JoystickEvents* client) : JoystickEvents(
 }
 
 void JoystickEventsCPPM::OnGamePadChanged(const GamePadEventData& evt) {
-    values[CHANNEL_THROTTLE] = map(evt.Z, 0, 0xFF, 1000, 2000);
+    values[CHANNEL_THROTTLE] = map(evt.Z, 0, 0xFF, 2000, 1000);
     values[CHANNEL_PITCH] = map(evt.Y, 0, 0x7FF, 1000, 2000);
     values[CHANNEL_ROLL] = map(evt.X, 0, 0x7FF, 1000, 2000);
     values[CHANNEL_YAW] = map(evt.Rz, 0, 0x3FF, 1000, 2000);
@@ -60,9 +60,9 @@ void JoystickEventsCPPM::OnButtonUp(uint8_t but_id) {
     }
 }
 
-void JoystickEventsCPPM::OnButtonDn(uint8_t but_id) {
+void JoystickEventsCPPM::OnButtonDown(uint8_t but_id) {
     if (client) {
-        client->OnButtonDn(but_id);
+        client->OnButtonDown(but_id);
     }
 }
 

events_deadzone.cpp

@@ -19,10 +19,8 @@
 //#define DEBUG_OUTPUT
 
 // X, Y, Z, Rx, Ry, Rz, Slider
-// As you can see, my controller Rz axis is broken,
-// yours may be different, so change these values!
 const GamePadEventData JoystickEventsDeadZone::deadZone(
-    4, 20, 2, 2, 5, 200, 2
+    4, 4, 2, 2, 5, 25, 2
 );
 const uint8_t JoystickEventsDeadZone::deadZoneMouseX = 1;
 const uint8_t JoystickEventsDeadZone::deadZoneMouseY = 1;
@@ -170,14 +168,14 @@ void JoystickEventsDeadZone::OnButtonUp(uint8_t but_id) {
     }
 }
 
-void JoystickEventsDeadZone::OnButtonDn(uint8_t but_id) {
+void JoystickEventsDeadZone::OnButtonDown(uint8_t but_id) {
 #ifdef DEBUG_OUTPUT
     Serial.print("Down: ");
     Serial.println(but_id, DEC);
 #endif
 
     if (client) {
-        client->OnButtonDn(but_id);
+        client->OnButtonDown(but_id);
     }
 }
 

parser.cpp

@@ -99,7 +99,7 @@ void JoystickReportParser::Parse(HID* hid, bool is_rpt_id, uint8_t len, uint8_t*
             uint64_t mask = (1ull << i);
             if ((mask & changes) && joyEvents) {
                 if (buttons & mask) {
-                    joyEvents->OnButtonDn(i);
+                    joyEvents->OnButtonDown(i);
                 } else {
                     joyEvents->OnButtonUp(i);
                 }