Add option to toggle ESP32 reconnect support.

Author: Mysticial

SerialPrograms/Source/Controllers/ControllerSelectorWidget.cpp

@@ -10,6 +10,7 @@
 //#include "CommonFramework/GlobalSettingsPanel.h"
 #include "Controllers/ControllerTypeStrings.h"
 #include "ControllerSelectorWidget.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
 
 #include "SerialPABotBase/SerialPABotBase_SelectorWidget.h"
 #include "NintendoSwitch/Controllers/SysbotBase/SysbotBase_SelectorWidget.h"
@@ -71,10 +72,13 @@ ControllerSelectorWidget::ControllerSelectorWidget(QWidget& parent, ControllerSe
     m_status_text->setText(QString::fromStdString(session.status_text()));
 
     m_reset_button = new QPushButton("Reset Ctrl.", this);
+#if 1
     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."
+        "<b>Shift+Click:</b> Reset and clear the controller of any state. "
+        "For controllers save pairing state, this will unpair it with any hosts it may be connected to."
     );
+#endif
     serial_row->addWidget(m_reset_button, 1);
 
     bool options_locked = session.options_locked();
@@ -120,7 +124,6 @@ ControllerSelectorWidget::ControllerSelectorWidget(QWidget& parent, ControllerSe
         m_reset_button, &QPushButton::clicked,
         this, [this](bool){
             bool shift_held = QGuiApplication::keyboardModifiers() & Qt::ShiftModifier;
-//            cout << "shift = " << shift_held << endl;
             m_session.reset(shift_held);
         }
     );

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_PostConnectActions.cpp

@@ -175,6 +175,10 @@ void run_post_connect_actions_ESP32(
     default:;
     }
 
+    if (!NintendoSwitch::ConsoleSettings::instance().ENABLE_ESP32_RECONNECT){
+        clear_settings = true;
+    }
+
     uint32_t native_controller_id = controller_type_to_id(desired_controller);
     if (clear_settings){
         botbase.issue_request_and_wait(

SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.cpp

@@ -104,6 +104,17 @@ ConsoleSettings::ConsoleSettings()
         LockMode::LOCK_WHILE_RUNNING,
         false
     )
+    , ENABLE_ESP32_RECONNECT(
+        "<b>Enable ESP32 Wireless Reconnect:</b><br>"
+        "<font color=\"orange\">This is a buggy feature that when enabled will:</font><br>"
+        " 1. Allow an ESP32 controller to reconnect to the previously paired Switch when switching to it from another controller.<br>"
+        " 2. Clicking \"Reset Ctrl.\" will soft-reset the controller and attempt to reconnect to the same Switch it is already paired with.<br>"
+        " 3. SHIFT-clicking \"Reset Ctrl.\" will clear the pairing state and begin pairing again. "
+        "This will allow it to pair with a different Switch as well as clearing any MAC address bans on the current Switch.<br>"
+        "<font color=\"red\">As of this writing, this feature works perfectly on the Switch 2, but is broken on the Switch 1.</font>",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
     , ENABLE_SBB3_PINGS(
         "<b>Enable sys-botbase 3 Pings:</b><br>"
         "Use sys-botbase's ping command for latency measurement instead of \"getVersion\".",
@@ -129,6 +140,7 @@ ConsoleSettings::ConsoleSettings()
     PA_ADD_OPTION(START_GAME_INTERNET_CHECK_DELAY0);
     PA_ADD_OPTION(TOLERATE_SYSTEM_UPDATE_MENU_FAST);
     PA_ADD_OPTION(TOLERATE_SYSTEM_UPDATE_MENU_SLOW);
+    PA_ADD_OPTION(ENABLE_ESP32_RECONNECT);
     PA_ADD_OPTION(ENABLE_SBB3_PINGS);
     PA_ADD_OPTION(ENABLE_SBB3_LOGGING);
     PA_ADD_OPTION(TIMING_OPTIONS);

SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.h

@@ -49,6 +49,7 @@ class ConsoleSettings : public BatchOption{
     BooleanCheckBoxOption TOLERATE_SYSTEM_UPDATE_MENU_FAST;
     BooleanCheckBoxOption TOLERATE_SYSTEM_UPDATE_MENU_SLOW;
 
+    BooleanCheckBoxOption ENABLE_ESP32_RECONNECT;
     BooleanCheckBoxOption ENABLE_SBB3_PINGS;
     BooleanCheckBoxOption ENABLE_SBB3_LOGGING;