Remove unused virtual methods

events.h

@@ -21,11 +21,11 @@ class X52;
 class JoystickEvents {
   public:
     JoystickEvents(JoystickEvents* _client = 0) : client(_client) { }
-    virtual void OnGamePadChanged(const GamePadEventData& evt) = 0;
-    virtual void OnHatSwitch(uint8_t hat) = 0;
-    virtual void OnButtonUp(uint8_t but_id) = 0;
-    virtual void OnButtonDown(uint8_t but_id) = 0;
-    virtual void OnMouseMoved(uint8_t x, uint8_t y) = 0;
+    virtual void OnGamePadChanged(const GamePadEventData& evt) { if (client) client->OnGamePadChanged(evt); }
+    virtual void OnHatSwitch(uint8_t hat) { if(client) client->OnHatSwitch(hat); }
+    virtual void OnButtonUp(uint8_t but_id) { if(client) client->OnButtonUp(but_id); }
+    virtual void OnButtonDown(uint8_t but_id) { if(client) client->OnButtonDown(but_id); }
+    virtual void OnMouseMoved(uint8_t x, uint8_t y) { if (client) client->OnMouseMoved(x, y); }
 
   protected:
     JoystickEvents* client;
@@ -35,9 +35,6 @@ class JoystickEventsDeadZone : public JoystickEvents {
   public:
     JoystickEventsDeadZone(JoystickEvents* client = 0) : JoystickEvents(client) { }
     virtual void OnGamePadChanged(const GamePadEventData& evt);
-    virtual void OnHatSwitch(uint8_t hat);
-    virtual void OnButtonUp(uint8_t but_id);
-    virtual void OnButtonDown(uint8_t but_id);
     virtual void OnMouseMoved(uint8_t x, uint8_t y);
 
   private:
@@ -52,10 +49,6 @@ class JoystickEventsCPPM : public JoystickEvents {
   public:
     JoystickEventsCPPM(JoystickEvents* client = 0);
     virtual void OnGamePadChanged(const GamePadEventData& evt);
-    virtual void OnHatSwitch(uint8_t hat);
-    virtual void OnButtonUp(uint8_t but_id);
-    virtual void OnButtonDown(uint8_t but_id);
-    virtual void OnMouseMoved(uint8_t x, uint8_t y);
 
   private:
     const static uint8_t channels = 12;
@@ -65,11 +58,7 @@ class JoystickEventsCPPM : public JoystickEvents {
 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 OnButtonDown(uint8_t but_id);
-    virtual void OnMouseMoved(uint8_t x, uint8_t y);
 
   private:
     enum MenuState {

events_buttons.cpp

@@ -16,7 +16,7 @@
 #include "cppm.h"
 #include "events.h"
 
-#define DEBUG_OUTPUT
+//#define DEBUG_OUTPUT
 //#define DEBUG_BUTTON_MFD
 
 #define MENU_BUTTON_ENTER_1 29
@@ -31,34 +31,6 @@
 JoystickEventsButtons::JoystickEventsButtons(X52* x, JoystickEvents* client)
         : JoystickEvents(client), x52(x), state(NONE), index(0), value(0) { }
 
-void JoystickEventsButtons::OnGamePadChanged(const GamePadEventData& evt) {
-    if (client) {
-        client->OnGamePadChanged(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::menuHelper(uint8_t count, const char** menu, const char* title) {
     if (index >= count) {
         index = count - 1;
@@ -214,9 +186,3 @@ void JoystickEventsButtons::OnButtonDown(uint8_t but_id) {
     }
 }
 
-void JoystickEventsButtons::OnMouseMoved(uint8_t x, uint8_t y) {
-    if (client) {
-        client->OnMouseMoved(x, y);
-    }
-}
-

events_cppm.cpp

@@ -48,27 +48,3 @@ void JoystickEventsCPPM::OnGamePadChanged(const GamePadEventData& 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::OnButtonDown(uint8_t but_id) {
-    if (client) {
-        client->OnButtonDown(but_id);
-    }
-}
-
-void JoystickEventsCPPM::OnMouseMoved(uint8_t x, uint8_t y) {
-    if (client) {
-        client->OnMouseMoved(x, y);
-    }
-}
-

events_deadzone.cpp

@@ -145,40 +145,6 @@ void JoystickEventsDeadZone::OnGamePadChanged(const GamePadEventData& evt) {
     }
 }
 
-void JoystickEventsDeadZone::OnHatSwitch(uint8_t hat) {
-#ifdef DEBUG_OUTPUT
-    Serial.print("Hat Switch: ");
-    PrintHex<uint8_t > (hat, 0x80);
-    Serial.println("");
-#endif
-
-    if (client) {
-        client->OnHatSwitch(hat);
-    }
-}
-
-void JoystickEventsDeadZone::OnButtonUp(uint8_t but_id) {
-#ifdef DEBUG_OUTPUT
-    Serial.print("Up: ");
-    Serial.println(but_id, DEC);
-#endif
-
-    if (client) {
-        client->OnButtonUp(but_id);
-    }
-}
-
-void JoystickEventsDeadZone::OnButtonDown(uint8_t but_id) {
-#ifdef DEBUG_OUTPUT
-    Serial.print("Down: ");
-    Serial.println(but_id, DEC);
-#endif
-
-    if (client) {
-        client->OnButtonDown(but_id);
-    }
-}
-
 void JoystickEventsDeadZone::OnMouseMoved(uint8_t x, uint8_t y) {
 #ifdef DEBUG_OUTPUT_RAW
     Serial.print("Mouse X: ");