fix build

Author: jw098

SerialPrograms/Source/Controllers/Controller.h

@@ -207,8 +207,8 @@ class AbstractController{
     virtual void keyboard_press(const QKeyEvent& event){}
     virtual void keyboard_release(const QKeyEvent& event){}
 
-    virtual void add_keyboard_listener(KeyboardEventHandler::KeyboardListener& keyboard_listener) = 0;
-    virtual void remove_keyboard_listener(KeyboardEventHandler::KeyboardListener& keyboard_listener) = 0;
+    virtual void add_keyboard_listener(KeyboardEventHandler::KeyboardListener& keyboard_listener){};
+    virtual void remove_keyboard_listener(KeyboardEventHandler::KeyboardListener& keyboard_listener){};
 };
 
 

SerialPrograms/Source/Controllers/ControllerTypes.h

@@ -49,6 +49,7 @@ enum class ControllerCategory{
     LEFT_JOYCON,
     RIGHT_JOYCON,
     PRO_CONTROLLER,
+    KEYBOARD,
 };
 
 

SerialPrograms/Source/Controllers/KeyboardInput/KeyboardInput.h

@@ -39,7 +39,7 @@ class ControllerState{
 
     virtual bool is_neutral() const = 0;
 
-    virtual JsonObject serialize_state() const = 0;
+    virtual JsonObject serialize_state() const {return JsonObject();};
 };
 
 

SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard_SerialPABotBase.h

@@ -53,6 +53,9 @@ class SerialPABotBase_Keyboard final :
     virtual ControllerType controller_type() const override{
         return ControllerType::HID_Keyboard;
     }
+    virtual ControllerCategory controller_category() const override{
+        return ControllerCategory::KEYBOARD;
+    }
     virtual ControllerPerformanceClass performance_class() const override{
         return ControllerPerformanceClass::SerialPABotBase_Wired;
     }

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.cpp

@@ -7,7 +7,6 @@
 #include "NintendoSwitch_ControllerButtons.h"
 #include "Common/Cpp/EnumStringMap.h"
 #include "Common/Cpp/StringTools.h"
-#include "NintendoSwitch_ControllerState.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_Joycon.h

@@ -9,7 +9,6 @@
 
 #include "Common/Cpp/Containers/Pimpl.h"
 #include "NintendoSwitch_ControllerButtons.h"
-#include "NintendoSwitch_ControllerState.h"
 #include "Controllers/ControllerTypes.h"
 #include "Controllers/Controller.h"
 

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ProController.h

@@ -10,7 +10,6 @@
 #define PokemonAutomation_NintendoSwitch_Controller_H
 
 #include "Common/Cpp/Containers/Pimpl.h"
-#include "NintendoSwitch_ControllerState.h"
 #include "Controllers/ControllerTypes.h"
 #include "Controllers/Controller.h"
 #include "NintendoSwitch_ControllerButtons.h"