Move post-connect controller actions into the controllers themselves.

Author: Mysticial

SerialPrograms/CMakeLists.txt

@@ -710,8 +710,6 @@ file(GLOB MAIN_SOURCES
     Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.h
     Source/Controllers/SerialPABotBase/SerialPABotBase_Descriptor.cpp
     Source/Controllers/SerialPABotBase/SerialPABotBase_Descriptor.h
-    Source/Controllers/SerialPABotBase/SerialPABotBase_PostConnectActions.cpp
-    Source/Controllers/SerialPABotBase/SerialPABotBase_PostConnectActions.h
     Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS1_WirelessControllers.cpp
     Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS1_WirelessControllers.h
     Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS2_WiredController.cpp

SerialPrograms/Source/Controllers/ControllerConnection.cpp

@@ -18,7 +18,7 @@ namespace PokemonAutomation{
 void ControllerConnection::add_status_listener(StatusListener& listener){
     m_status_listeners.add(listener);
     if (m_ready.load(std::memory_order_acquire)){
-        listener.post_connection_ready(*this, controller_mode_status());
+        listener.post_connection_ready(*this);
     }
 }
 void ControllerConnection::remove_status_listener(StatusListener& listener){
@@ -36,7 +36,6 @@ std::string ControllerConnection::status_text() const{
 }
 
 
-
 void ControllerConnection::set_status_line0(const std::string& text, Color color){
     {
         WriteSpinLock lg(m_status_text_lock);
@@ -51,17 +50,17 @@ void ControllerConnection::set_status_line1(const std::string& text, Color color
     }
     signal_status_text_changed(status_text());
 }
-void ControllerConnection::declare_ready(const ControllerModeStatus& mode_status){
+void ControllerConnection::declare_ready(){
     m_ready.store(true, std::memory_order_release);
-    signal_post_ready(mode_status);
+    signal_post_ready();
 }
 
 
 //void ControllerConnection::signal_pre_not_ready(){
 //    m_status_listeners.run_method_unique(&StatusListener::pre_connection_not_ready, *this);
 //}
-void ControllerConnection::signal_post_ready(const ControllerModeStatus& mode_status){
-    m_status_listeners.run_method_unique(&StatusListener::post_connection_ready, *this, mode_status);
+void ControllerConnection::signal_post_ready(){
+    m_status_listeners.run_method_unique(&StatusListener::post_connection_ready, *this);
 }
 void ControllerConnection::signal_status_text_changed(const std::string& text){
 //    cout << "m_status_listeners.size() = " << m_status_listeners.count_unique() << endl;

SerialPrograms/Source/Controllers/ControllerConnection.h

@@ -15,21 +15,11 @@ namespace PokemonAutomation{
 
 
 
-struct ControllerModeStatus{
-    ControllerType current_controller = ControllerType::None;
-    std::vector<ControllerType> supported_controllers;
-};
-
-
-
 class ControllerConnection{
 public:
     struct StatusListener{
 //        virtual void pre_connection_not_ready(ControllerConnection& connection){}
-        virtual void post_connection_ready(
-            ControllerConnection& connection,
-            const ControllerModeStatus& mode_status
-        ){}
+        virtual void post_connection_ready(ControllerConnection& connection){}
         virtual void status_text_changed(
             ControllerConnection& connection, const std::string& text
         ){}
@@ -43,15 +33,23 @@ class ControllerConnection{
 
 
 public:
+    ControllerConnection()
+        : m_current_controller(ControllerType::None)
+        , m_ready(false)
+    {}
     virtual ~ControllerConnection() = default;
 
+    ControllerType current_controller() const{
+        return m_current_controller.load(std::memory_order_acquire);
+    }
     bool is_ready() const{ return m_ready.load(std::memory_order_acquire); }
     std::string status_text() const;
 
-    //  Returns the current controller type and the list of supported controllers.
-    //  The current controller may be "None" if there is only one supported
-    //  controller since it is implied to be that.
-    virtual ControllerModeStatus controller_mode_status() const = 0;
+    //  It it not safe to call this until "is_ready()" is true.
+    const std::vector<ControllerType>& controller_list(){
+        return m_controller_list;
+    }
+
 
 
 public:
@@ -60,19 +58,24 @@ class ControllerConnection{
 
 
 protected:
-    void declare_ready(const ControllerModeStatus& mode_status);
+    void declare_ready();
 
 
 private:
 //    void signal_pre_not_ready();
-    void signal_post_ready(const ControllerModeStatus& mode_status);
+    void signal_post_ready();
     void signal_status_text_changed(const std::string& text);
     void signal_error(const std::string& text);
 
 
 protected:
+    //  This is written to once and never modified again.
+    std::vector<ControllerType> m_controller_list;
+
+    std::atomic<ControllerType> m_current_controller;
     std::atomic<bool> m_ready;
 
+
 private:
     mutable SpinLock m_status_text_lock;
     std::string m_status_line0;

SerialPrograms/Source/Controllers/ControllerDescriptor.h

@@ -27,6 +27,15 @@ class ControllerConnection;
 class ControllerSelectorWidget;
 
 
+
+enum class ControllerResetMode{
+    DO_NOT_RESET,
+    SIMPLE_RESET,
+    RESET_AND_CLEAR_STATE,
+};
+
+
+
 //
 //  Represents an entire controller interface.
 //
@@ -105,13 +114,13 @@ class ControllerDescriptor{
 public:
     virtual std::unique_ptr<ControllerConnection> open_connection(
         Logger& logger,
-        std::optional<ControllerType> change_controller,
-        bool clear_settings
+        bool set_to_null_controller
     ) const = 0;
     virtual std::unique_ptr<AbstractController> make_controller(
         Logger& logger,
         ControllerConnection& connection,
-        ControllerType controller_type
+        ControllerType controller_type,
+        ControllerResetMode reset_mode
     ) const = 0;
 
     virtual QWidget* make_selector_QtWidget(ControllerSelectorWidget& parent) const = 0;