Add support for clearing reset.

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 = 56;
-const int PROGRAM_VERSION_PATCH = 2;
+const int PROGRAM_VERSION_PATCH = 3;
 
 const std::string PROGRAM_VERSION_BASE =
     "v" + std::to_string(PROGRAM_VERSION_MAJOR) +

SerialPrograms/Source/Controllers/ControllerDescriptor.h

@@ -105,7 +105,8 @@ class ControllerDescriptor{
 public:
     virtual std::unique_ptr<ControllerConnection> open_connection(
         Logger& logger,
-        std::optional<ControllerType> change_controller
+        std::optional<ControllerType> change_controller,
+        bool clear_settings
     ) const = 0;
     virtual std::unique_ptr<AbstractController> make_controller(
         Logger& logger,

SerialPrograms/Source/Controllers/ControllerSelectorWidget.cpp

@@ -4,9 +4,10 @@
  *
  */
 
+#include <QKeyEvent>
 #include <QHBoxLayout>
 #include "Common/Qt/NoWheelComboBox.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
+//#include "CommonFramework/GlobalSettingsPanel.h"
 #include "Controllers/ControllerTypeStrings.h"
 #include "ControllerSelectorWidget.h"
 
@@ -70,6 +71,10 @@ ControllerSelectorWidget::ControllerSelectorWidget(QWidget& parent, ControllerSe
     m_status_text->setText(QString::fromStdString(session.status_text()));
 
     m_reset_button = new QPushButton("Reset Ctrl.", this);
+    m_reset_button->setToolTip(
+        "<b>Click:</b> Reset the controller.<br><br>"
+        "<b>Shift+Click:</b> Reset and clear the controller of any state. This will unpair it with any hosts it may be connected to."
+    );
     serial_row->addWidget(m_reset_button, 1);
 
     bool options_locked = session.options_locked();
@@ -78,6 +83,8 @@ ControllerSelectorWidget::ControllerSelectorWidget(QWidget& parent, ControllerSe
     }
     m_reset_button->setEnabled(!options_locked);
 
+    setFocusPolicy(Qt::StrongFocus);
+
     connect(
         interface_dropdown, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),
         this, [this](int index){
@@ -112,7 +119,9 @@ ControllerSelectorWidget::ControllerSelectorWidget(QWidget& parent, ControllerSe
     connect(
         m_reset_button, &QPushButton::clicked,
         this, [this](bool){
-            m_session.reset();
+            bool shift_held = QGuiApplication::keyboardModifiers() & Qt::ShiftModifier;
+//            cout << "shift = " << shift_held << endl;
+            m_session.reset(shift_held);
         }
     );
 
@@ -210,6 +219,43 @@ void ControllerSelectorWidget::options_locked(bool locked){
 }
 
 
+#if 0
+void ControllerSelectorWidget::update_buttons(){
+    if (m_shift_held){
+        m_reset_button->setText("Clear Ctrl.");
+    }else{
+        m_reset_button->setText("Reset Ctrl.");
+    }
+}
+
+
+void ControllerSelectorWidget::keyPressEvent(QKeyEvent* event){
+//    cout << "ControllerSelectorWidget::keyPressEvent()" << endl;
+    if (event->key() == Qt::Key_Shift){
+        m_shift_held = true;
+    }
+    update_buttons();
+//    QWidget::keyPressEvent(event);
+}
+void ControllerSelectorWidget::keyReleaseEvent(QKeyEvent* event){
+//    cout << "ControllerSelectorWidget::keyReleaseEvent()" << endl;
+    if (event->key() == Qt::Key_Shift){
+        m_shift_held = false;
+    }
+    update_buttons();
+//    QWidget::keyReleaseEvent(event);
+}
+void ControllerSelectorWidget::focusInEvent(QFocusEvent* event){
+//    cout << "ControllerSelectorWidget::focusInEvent()" << endl;
+    QWidget::focusInEvent(event);
+}
+void ControllerSelectorWidget::focusOutEvent(QFocusEvent* event){
+//    cout << "ControllerSelectorWidget::focusOutEvent()" << endl;
+    m_shift_held = false;
+    update_buttons();
+    QWidget::focusOutEvent(event);
+}
+#endif
 
 
 

SerialPrograms/Source/Controllers/ControllerSelectorWidget.h

@@ -46,6 +46,16 @@ class ControllerSelectorWidget : public QWidget, private ControllerSession::List
         const std::vector<ControllerType>& available_controllers
     );
 
+private:
+    void update_buttons();
+
+#if 0
+    virtual void keyPressEvent(QKeyEvent* event) override;
+    virtual void keyReleaseEvent(QKeyEvent* event) override;
+    virtual void focusInEvent(QFocusEvent* event) override;
+    virtual void focusOutEvent(QFocusEvent* event) override;
+#endif
+
 private:
     ControllerSession& m_session;
 
@@ -56,6 +66,8 @@ class ControllerSelectorWidget : public QWidget, private ControllerSession::List
     QLabel* m_status_text = nullptr;
     QPushButton* m_reset_button = nullptr;
 
+//    bool m_shift_held = false;
+
     std::vector<std::shared_ptr<const ControllerDescriptor>> m_device_list;
 };
 

SerialPrograms/Source/Controllers/ControllerSession.cpp

@@ -50,7 +50,7 @@ ControllerSession::ControllerSession(
     , m_controller_type(ControllerType::None)
     , m_options_locked(false)
     , m_descriptor(option.descriptor())
-    , m_connection(m_descriptor->open_connection(logger, {}))
+    , m_connection(m_descriptor->open_connection(logger, {}, false))
 {
     if (!m_connection){
         return;
@@ -159,13 +159,14 @@ void ControllerSession::set_options_locked(bool locked){
 }
 
 
-void ControllerSession::make_controller(std::optional<ControllerType> change_controller){
+void ControllerSession::make_controller(std::optional<ControllerType> change_controller, bool clear_settings){
     //  Must be called under "m_reset_lock".
 
     bool ready = false;
     {
         std::lock_guard<std::mutex> lg(m_state_lock);
-        m_connection = m_descriptor->open_connection(m_logger, change_controller);
+//        cout << "clear_settings = " << clear_settings << endl;
+        m_connection = m_descriptor->open_connection(m_logger, change_controller, clear_settings);
         if (m_connection){
             m_connection->add_status_listener(*this);
             ready = m_connection->is_ready();
@@ -217,7 +218,7 @@ bool ControllerSession::set_device(const std::shared_ptr<const ControllerDescrip
         controller.reset();
         connection.reset();
 
-        make_controller({});
+        make_controller({}, false);
     }
     signal_descriptor_changed(device);
     signal_status_text_changed(status_text());
@@ -254,7 +255,7 @@ bool ControllerSession::set_controller(ControllerType controller_type){
         controller.reset();
         connection.reset();
 
-        make_controller(controller_type);
+        make_controller(controller_type, false);
         device = m_descriptor;
     }
     signal_descriptor_changed(device);
@@ -264,7 +265,7 @@ bool ControllerSession::set_controller(ControllerType controller_type){
 
 
 
-std::string ControllerSession::reset(){
+std::string ControllerSession::reset(bool clear_settings){
 //    cout << "ControllerSession::reset()" << endl;
 
     {
@@ -294,7 +295,7 @@ std::string ControllerSession::reset(){
         controller.reset();
         connection.reset();
 
-        make_controller(m_controller_type);
+        make_controller(m_controller_type, clear_settings);
     }
     signal_status_text_changed(status_text());
     return "";

SerialPrograms/Source/Controllers/ControllerSession.h

@@ -87,7 +87,7 @@ class ControllerSession : private ControllerConnection::StatusListener{
 
 public:
     //  Returns empty string on success. Otherwise returns error message.
-    std::string reset();
+    std::string reset(bool clear_settings);
 
     //  Try to run the following lambda on the underlying controller type.
     //  Returns empty string if successful. Otherwise returns error message.
@@ -118,7 +118,7 @@ class ControllerSession : private ControllerConnection::StatusListener{
 
 
 private:
-    void make_controller(std::optional<ControllerType> change_controller);
+    void make_controller(std::optional<ControllerType> change_controller, bool clear_settings);
 
 //    virtual void pre_connection_not_ready(ControllerConnection& connection) override;
     virtual void post_connection_ready(

SerialPrograms/Source/Controllers/NullController.cpp

@@ -30,7 +30,8 @@ JsonValue NullControllerDescriptor::to_json() const{
 }
 std::unique_ptr<ControllerConnection> NullControllerDescriptor::open_connection(
     Logger& logger,
-    std::optional<ControllerType> change_controller
+    std::optional<ControllerType> change_controller,
+    bool clear_settings
 ) const{
     return nullptr;
 }

SerialPrograms/Source/Controllers/NullController.h

@@ -28,7 +28,8 @@ class NullControllerDescriptor : public ControllerDescriptor{
 
     virtual std::unique_ptr<ControllerConnection> open_connection(
         Logger& logger,
-        std::optional<ControllerType> change_controller
+        std::optional<ControllerType> change_controller,
+        bool clear_settings
     ) const override;
     virtual std::unique_ptr<AbstractController> make_controller(
         Logger& logger,

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase.cpp

@@ -158,6 +158,8 @@ const std::map<
                 ControllerFeature::NintendoSwitch_DateSkip,
             }},
         }},
+    }},
+    {2025081700, {
         {PABB_PID_PABOTBASE_ESP32S3, {
             {ControllerType::NintendoSwitch_WiredController, {
                 ControllerFeature::TickPrecise,
@@ -170,8 +172,6 @@ const std::map<
                 ControllerFeature::NintendoSwitch_DateSkip,
             }},
         }},
-    }},
-    {2025081600, {
         {PABB_PID_PABOTBASE_ESP32, {
             {ControllerType::NintendoSwitch_WirelessProController, {
                 ControllerFeature::TickPrecise,

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.cpp

@@ -34,7 +34,8 @@ namespace SerialPABotBase{
 SerialPABotBase_Connection::SerialPABotBase_Connection(
     Logger& logger,
     const QSerialPortInfo* port,
-    std::optional<ControllerType> change_controller
+    std::optional<ControllerType> change_controller,
+    bool clear_settings
 )
     : m_logger(logger, GlobalSettings::instance().LOG_EVERYTHING)
 {
@@ -82,7 +83,7 @@ SerialPABotBase_Connection::SerialPABotBase_Connection(
     m_status_thread = std::thread(
         run_with_catch,
         "SerialPABotBase_Connection::thread_body()",
-        [=, this]{ thread_body(change_controller); }
+        [=, this]{ thread_body(change_controller, clear_settings); }
     );
 }
 SerialPABotBase_Connection::~SerialPABotBase_Connection(){
@@ -190,8 +191,9 @@ ControllerType SerialPABotBase_Connection::get_controller_type(
 
 
 
-ControllerModeStatus SerialPABotBase_Connection::read_device_specs(
-    std::optional<ControllerType> change_controller
+ControllerModeStatus SerialPABotBase_Connection::process_device(
+    std::optional<ControllerType> change_controller,
+    bool clear_settings
 ){
     //  Protocol
     {
@@ -231,15 +233,17 @@ ControllerModeStatus SerialPABotBase_Connection::read_device_specs(
         ret,
         m_program_id, m_device_name,
         *m_botbase,
-        change_controller
+        change_controller,
+        clear_settings
     );
     return ret;
 }
 
 
 
 void SerialPABotBase_Connection::thread_body(
-    std::optional<ControllerType> change_controller
+    std::optional<ControllerType> change_controller,
+    bool clear_settings
 ){
     using namespace PokemonAutomation;
 
@@ -271,7 +275,7 @@ void SerialPABotBase_Connection::thread_body(
         ControllerModeStatus mode_status;
         std::string error;
         try{
-            mode_status = read_device_specs(change_controller);
+            mode_status = process_device(change_controller, clear_settings);
             std::lock_guard<std::mutex> lg(m_lock);
             m_mode_status = mode_status;