Move controller states out of keyboard controls.

Author: Mysticial

SerialPrograms/Source/CommonFramework/Globals.cpp

@@ -26,7 +26,7 @@ namespace PokemonAutomation{
 const bool IS_BETA_VERSION = true;
 const int PROGRAM_VERSION_MAJOR = 0;
 const int PROGRAM_VERSION_MINOR = 60;
-const int PROGRAM_VERSION_PATCH = 1;
+const int PROGRAM_VERSION_PATCH = 2;
 
 const std::string PROGRAM_VERSION_BASE =
     "v" + std::to_string(PROGRAM_VERSION_MAJOR) +

SerialPrograms/Source/Controllers/Controller.h

@@ -24,13 +24,14 @@ enum class ControllerClass;
 
 
 
+#if 0
 inline Milliseconds round_up_to_ticksize(Milliseconds ticksize, Milliseconds duration){
     if (ticksize == Milliseconds::zero()){
         return duration;
     }
     return (duration + ticksize - Milliseconds(1)) / ticksize * ticksize;
 }
-
+#endif
 
 
 
@@ -302,7 +303,7 @@ class ControllerContext final : public CancellableScope{
 
 using AbstractControllerContext = ControllerContext<AbstractController>;
 
-using AbstractControllerContext = ControllerContext<AbstractController>;
+
 
 
 

SerialPrograms/Source/Controllers/ControllerState.cpp

@@ -0,0 +1,48 @@
+/*  Controller State
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Json/JsonValue.h"
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "ControllerState.h"
+
+namespace PokemonAutomation{
+
+
+
+
+void ControllerState::load_json(const JsonValue& json){
+    throw OperationFailedException(
+        ErrorReport::NO_ERROR_REPORT,
+        "This controller does not support serialization."
+    );
+}
+JsonValue ControllerState::to_json() const{
+    throw OperationFailedException(
+        ErrorReport::NO_ERROR_REPORT,
+        "This controller does not support serialization."
+    );
+}
+void ControllerState::execute(
+    CancellableScope& scope,
+    AbstractController& controller,
+    Milliseconds duration
+) const{
+    throw OperationFailedException(
+        ErrorReport::NO_ERROR_REPORT,
+        "This controller does not support execution."
+    );
+}
+std::string ControllerState::to_cpp(Milliseconds hold, Milliseconds release) const{
+    throw OperationFailedException(
+        ErrorReport::NO_ERROR_REPORT,
+        "This controller does not support cpp conversion."
+    );
+}
+
+
+
+
+}

SerialPrograms/Source/Controllers/ControllerState.h

@@ -0,0 +1,57 @@
+/*  Controller State
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_ControllerState_H
+#define PokemonAutomation_Controllers_ControllerState_H
+
+#include "Common/Cpp/Time.h"
+
+namespace PokemonAutomation{
+
+class JsonValue;
+class CancellableScope;
+class AbstractController;
+
+
+
+
+
+
+class ControllerState{
+public:
+    virtual ~ControllerState() = default;
+
+    virtual void clear() = 0;
+
+    virtual bool operator==(const ControllerState& x) const = 0;
+    virtual bool operator!=(const ControllerState& x) const{ return !(*this == x); }
+
+    virtual bool is_neutral() const = 0;
+
+public:
+    //  Serialization
+    virtual void load_json(const JsonValue& json);
+    virtual JsonValue to_json() const;
+
+public:
+    //  Execution
+    virtual void execute(
+        CancellableScope& scope,
+        AbstractController& controller,
+        Milliseconds duration
+    ) const;
+    virtual std::string to_cpp(Milliseconds hold, Milliseconds release) const;
+};
+
+
+
+
+
+
+
+
+}
+#endif

SerialPrograms/Source/Controllers/KeyboardInput/KeyboardInput.cpp

@@ -9,6 +9,7 @@
 #include "CommonFramework/GlobalSettingsPanel.h"
 #include "CommonFramework/Logging/Logger.h"
 #include "CommonFramework/Options/Environment/PerformanceOptions.h"
+#include "Controllers/ControllerState.h"
 #include "Controllers/KeyboardInput/GlobalQtKeyMap.h"
 #include "KeyboardInput.h"
 

SerialPrograms/Source/Controllers/KeyboardInput/KeyboardInput.h

@@ -10,7 +10,7 @@
 #include <map>
 #include <condition_variable>
 #include <Qt>
-#include "Common/Cpp/Json/JsonValue.h"
+//#include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Concurrency/SpinLock.h"
 #include "Common/Cpp/Concurrency/Thread.h"
 #include "Controllers/Controller.h"
@@ -23,31 +23,6 @@ class QKeyEvent;
 namespace PokemonAutomation{
 
 
-class ControllerSession;
-
-
-
-
-class ControllerState{
-public:
-    virtual ~ControllerState() = default;
-
-    virtual void clear() = 0;
-
-    virtual bool operator==(const ControllerState& x) const = 0;
-    virtual bool operator!=(const ControllerState& x) const{ return !(*this == x); }
-
-    virtual bool is_neutral() const = 0;
-
-public:
-    //  Serialization
-    virtual void load_json(const JsonValue& json){};
-    virtual JsonValue to_json() const{ return JsonValue(); };
-    virtual std::string to_cpp(Milliseconds hold, Milliseconds release) const{ return ""; }
-    virtual void execute(AbstractControllerContext& context, Milliseconds duration) const{}
-};
-
-
 
 
 class KeyboardInputController{

SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.cpp

@@ -9,6 +9,7 @@
 #include "CommonFramework/GlobalSettingsPanel.h"
 #include "CommonTools/Async/InterruptableCommands.tpp"
 #include "CommonTools/Async/SuperControlSession.tpp"
+#include "Controllers/ControllerState.h"
 #include "Controllers/KeyboardInput/KeyboardInput.h"
 #include "StandardHid_Keyboard_KeyMappings.h"
 #include "StandardHid_Keyboard.h"

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_Joycon.cpp

@@ -11,6 +11,7 @@
 #include "Controllers/KeyboardInput/KeyboardInput.h"
 #include "NintendoSwitch/NintendoSwitch_Settings.h"
 #include "NintendoSwitch_VirtualControllerState.h"
+#include "NintendoSwitch_JoyconState.h"
 #include "NintendoSwitch_Joycon.h"
 
 namespace PokemonAutomation{
@@ -122,5 +123,17 @@ void JoyconController::remove_keyboard_listener(KeyboardEventHandler::KeyboardLi
 
 
 
+
+ControllerClass LeftJoycon::controller_class() const{
+    return ControllerClass::NintendoSwitch_LeftJoycon;
+}
+ControllerClass RightJoycon::controller_class() const{
+    return ControllerClass::NintendoSwitch_RightJoycon;
+}
+
+
+
+
+
 }
 }

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_Joycon.h

@@ -21,7 +21,7 @@ using JoyconContext = ControllerContext<JoyconController>;
 
 
 
-constexpr Button VALID_LEFT_JOYCON_BUTTONS =
+static constexpr Button VALID_LEFT_JOYCON_BUTTONS =
     BUTTON_DOWN |
     BUTTON_UP |
     BUTTON_RIGHT |
@@ -34,7 +34,7 @@ constexpr Button VALID_LEFT_JOYCON_BUTTONS =
     BUTTON_LCLICK |
     BUTTON_CAPTURE;
 
-constexpr Button VALID_RIGHT_JOYCON_BUTTONS =
+static constexpr Button VALID_RIGHT_JOYCON_BUTTONS =
     BUTTON_Y |
     BUTTON_X |
     BUTTON_B |
@@ -50,6 +50,8 @@ constexpr Button VALID_RIGHT_JOYCON_BUTTONS =
 
 
 
+
+
 class JoyconController : public AbstractController{
 public:
     using ContextType = JoyconContext;
@@ -192,9 +194,7 @@ class LeftJoycon : public JoyconController{
     virtual const char* name() override{
         return NAME;
     };
-    virtual ControllerClass controller_class() const override{
-        return ControllerClass::NintendoSwitch_LeftJoycon;
-    }    
+    virtual ControllerClass controller_class() const override;
 };
 class RightJoycon : public JoyconController{
 public:
@@ -204,9 +204,7 @@ class RightJoycon : public JoyconController{
     virtual const char* name() override{
         return NAME;
     };
-    virtual ControllerClass controller_class() const override{
-        return ControllerClass::NintendoSwitch_RightJoycon;
-    } 
+    virtual ControllerClass controller_class() const override;
 };