React to button events

Saitek-X52-PPM.ino

@@ -28,7 +28,8 @@ USBHub hub(&usb);
 HIDUniversal hid(&usb);
 X52 x52(&usb, &hid);
 JoystickEventsCPPM joyCPPM;
-JoystickEventsDeadZone joyevents((JoystickEvents*)&joyCPPM);
+JoystickEventsButtons joyButtons(&x52, (JoystickEvents*)&joyCPPM);
+JoystickEventsDeadZone joyevents((JoystickEvents*)&joyButtons);
 JoystickReportParser joy(&joyevents);
 
 void setup() {
@@ -55,12 +56,9 @@ void setup() {
 
 void init_joystick() {
     x52.initialize();
-    x52.setLEDBrightness(2);
-    x52.setMFDBrightness(2);
-    x52.setShift(0);
-    x52.setBlink(0);
     x52.setMFDText(0, "Arduino X52 Host");
-    x52.setMFDText(1, "  initialized!");
+    x52.setMFDText(1, "  initialized!  ");
+    x52.setMFDText(2, "                ");
 }
 
 void loop() {

events.h

@@ -16,6 +16,7 @@
 #include <stdint.h>
 
 class GamePadEventData;
+class X52;
 
 class JoystickEvents {
   public:
@@ -61,5 +62,18 @@ class JoystickEventsCPPM : public JoystickEvents {
     uint16_t values[channels];
 };
 
+class JoystickEventsButtons : public JoystickEvents {
+  public:
+    JoystickEventsButtons(X52* x = 0, JoystickEvents* client = 0);
+    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);
+
+  private:
+    X52* x52;
+};
+
 #endif // __JOYSTICK_EVENTS_H__
 

events_buttons.cpp

@@ -0,0 +1,69 @@
+/*
+ * Saitek X52 Arduino USB Host Shield Library.
+ * Copyright 2016 by Thomas Buck <xythobuz@xythobuz.de>
+ *
+ * Based on the USB Host Library HID Joystick example
+ * https://www.circuitsathome.com/mcu/hid-joystick-code-sample
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2.
+ */
+
+#include <Arduino.h>
+#include "data.h"
+#include "x52.h"
+#include "events.h"
+
+#define DEBUG_BUTTON_MFD
+
+JoystickEventsButtons::JoystickEventsButtons(X52* x, JoystickEvents* client) : JoystickEvents(client), x52(x) {
+
+}
+
+void JoystickEventsButtons::OnGamePadChanged(const GamePadEventData& evt) {
+    if (client) {
+        client->OnGamePadChanged(evt);
+    }
+}
+
+void JoystickEventsButtons::OnHatSwitch(uint8_t hat) {
+    if (client) {
+        client->OnHatSwitch(hat);
+    }
+}
+
+void JoystickEventsButtons::OnButtonUp(uint8_t but_id) {
+    if (client) {
+        client->OnButtonUp(but_id);
+    }
+}
+
+void JoystickEventsButtons::OnButtonDn(uint8_t but_id) {
+    if (client) {
+        client->OnButtonDn(but_id);
+    }
+
+#ifdef DEBUG_BUTTON_MFD
+    String text = "Button " + String(but_id) + " down";
+    x52->setMFDText(1, text.c_str());
+#endif
+
+    if (but_id == 23) {
+        x52->setLEDBrightness(2);
+        x52->setMFDBrightness(2);
+    } else if (but_id == 24) {
+        x52->setLEDBrightness(1);
+        x52->setMFDBrightness(1);
+    } else if (but_id == 25) {
+        x52->setLEDBrightness(0);
+        x52->setMFDBrightness(0);
+    }
+}
+
+void JoystickEventsButtons::OnMouseMoved(uint8_t x, uint8_t y) {
+    if (client) {
+        client->OnMouseMoved(x, y);
+    }
+}
+

events_cppm.cpp

@@ -42,21 +42,33 @@ void JoystickEventsCPPM::OnGamePadChanged(const GamePadEventData& evt) {
     values[CHANNEL_AUX2] = map(evt.Slider, 0, 0xFF, 1000, 2000);
 
     cppmCopy(values);
+
+    if (client) {
+        client->OnGamePadChanged(evt);
+    }
 }
 
 void JoystickEventsCPPM::OnHatSwitch(uint8_t hat) {
-
+    if (client) {
+        client->OnHatSwitch(hat);
+    }
 }
 
 void JoystickEventsCPPM::OnButtonUp(uint8_t but_id) {
-
+    if (client) {
+        client->OnButtonUp(but_id);
+    }
 }
 
 void JoystickEventsCPPM::OnButtonDn(uint8_t but_id) {
-
+    if (client) {
+        client->OnButtonDn(but_id);
+    }
 }
 
 void JoystickEventsCPPM::OnMouseMoved(uint8_t x, uint8_t y) {
-
+    if (client) {
+        client->OnMouseMoved(x, y);
+    }
 }