Add option to trust user console type selection.

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

SerialPrograms/Source/CommonFramework/Startup/NewVersionCheck.cpp

@@ -144,7 +144,7 @@ void show_update_box(
 ){
     QMessageBox box;
     QPushButton* ok = box.addButton(QMessageBox::Ok);
-    QPushButton* skip = box.addButton("Skip this version.", QMessageBox::NoRole);
+    QPushButton* skip = box.addButton("Skip this Version", QMessageBox::NoRole);
 
     box.setTextFormat(Qt::RichText);
     std::string text = header + "<br>";

SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.cpp

@@ -13,6 +13,7 @@
 #include "CommonFramework/Notifications/ProgramNotifications.h"
 #include "CommonFramework/Options/Environment/SleepSuppressOption.h"
 #include "CommonFramework/Options/Environment/PerformanceOptions.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
 #include "NintendoSwitch/Controllers/NintendoSwitch_ProController.h"
 #include "NintendoSwitch_MultiSwitchProgramOption.h"
 #include "NintendoSwitch_MultiSwitchProgramSession.h"
@@ -174,7 +175,13 @@ void MultiSwitchProgramSession::internal_run_program(){
             session.audio(),
             session.stream_history()
         );
-        handles.back().state().set_console_type_user(session.console_type());
+
+        ConsoleState& state = handles.back().state();
+        if (ConsoleSettings::instance().TRUST_USER_CONSOLE_SELECTION){
+            state.set_console_type(handles.back().logger(), session.console_type());
+        }else{
+            state.set_console_type_user(session.console_type());
+        }
     }
 
 

SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.cpp

@@ -12,6 +12,7 @@
 #include "CommonFramework/Options/Environment/PerformanceOptions.h"
 #include "CommonFramework/Notifications/ProgramInfo.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
 #include "NintendoSwitch_SingleSwitchProgramOption.h"
 #include "NintendoSwitch_SingleSwitchProgramSession.h"
 
@@ -143,7 +144,13 @@ void SingleSwitchProgramSession::internal_run_program(){
         m_system.audio(),
         m_system.stream_history()
     );
-    env.console.state().set_console_type_user(m_system.console_type());
+
+    if (ConsoleSettings::instance().TRUST_USER_CONSOLE_SELECTION){
+        env.console.state().set_console_type(m_system.logger(), m_system.console_type());
+    }else{
+        env.console.state().set_console_type_user(m_system.console_type());
+    }
+
 
     try{
         logger().log("<b>Starting Program: " + identifier() + "</b>");

SerialPrograms/Source/NintendoSwitch/NintendoSwitch_ConsoleState.cpp

@@ -43,7 +43,8 @@ const std::string& ConsoleType_strings(ConsoleType type){
         logger,
         std::string("Conflicting Console Types:") +
         "\n    User Selected: " + ConsoleType_strings(user_type) +
-        "\n    Detected Type: " + ConsoleType_strings(detected_type)
+        "\n    Detected Type: " + ConsoleType_strings(detected_type) +
+        "\n\nIf you think this is a bug, please report it to either our Github or our Discord server!"
     );
 }
 

SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.cpp

@@ -65,6 +65,14 @@ ConsoleSettings& ConsoleSettings::instance(){
 }
 ConsoleSettings::ConsoleSettings()
     : BatchOption(LockMode::LOCK_WHILE_RUNNING)
+    , TRUST_USER_CONSOLE_SELECTION(
+        "<b>Trust User Console Selection:</b><br>"
+        "Trust that the user's selection for the console type (Switch 1 vs. Switch 2) is correct.<br>"
+        "Do not cross-check it. Do not stop the program if it disagrees with the user selection.<br>"
+        "Don't enable this option unless you are encountering issues.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
     , SETTINGS_TO_HOME_DELAY0(
         "<b>Settings to Home Delay:</b><br>Delay from pressing home anywhere in the settings to return to the home menu.",
         LockMode::LOCK_WHILE_RUNNING,
@@ -103,6 +111,7 @@ ConsoleSettings::ConsoleSettings()
     , KEYBOARD_SECTION("<font size=4><b>Keyboard to Controller Mappings:</b></font>")
 {
     PA_ADD_OPTION(CONTROLLER_SETTINGS);
+    PA_ADD_OPTION(TRUST_USER_CONSOLE_SELECTION);
     PA_ADD_OPTION(SETTINGS_TO_HOME_DELAY0);
     PA_ADD_OPTION(START_GAME_REQUIRES_INTERNET);
     PA_ADD_OPTION(START_GAME_INTERNET_CHECK_DELAY0);

SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.h

@@ -42,6 +42,7 @@ class ConsoleSettings : public BatchOption{
 
     ControllerSettingsTable CONTROLLER_SETTINGS;
 
+    BooleanCheckBoxOption TRUST_USER_CONSOLE_SELECTION;
     MillisecondsOption SETTINGS_TO_HOME_DELAY0;
     BooleanCheckBoxOption START_GAME_REQUIRES_INTERNET;
     MillisecondsOption START_GAME_INTERNET_CHECK_DELAY0;