Add option to specify Switch model.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -266,7 +266,7 @@ TestProgram::TestProgram()
     PA_ADD_OPTION(BUTTON0);
     PA_ADD_OPTION(BUTTON1);
     PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(CONSOLE_MODEL);
+//    PA_ADD_OPTION(CONSOLE_MODEL);
     PA_ADD_OPTION(IMAGE_PATH);
     PA_ADD_OPTION(STATIC_TEXT);
     PA_ADD_OPTION(SELECT);
@@ -321,7 +321,7 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     ProControllerContext context(scope, console.pro_controller());
     VideoOverlaySet overlays(overlay);
 
-    console.state().set_console_type(CONSOLE_MODEL);
+//    console.state().set_console_type(CONSOLE_MODEL);
 
     while (true){
         home_to_date_time(console, context, true);

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.h

@@ -78,7 +78,7 @@ class TestProgram : public MultiSwitchProgramInstance, public ButtonListener{
 //    PokemonSV::PlayerListTable PLAYER_LIST;
     DateTimeOption DATE0;
     DateTimeOption DATE1;
-    ConsoleModelOption CONSOLE_MODEL;
+//    ConsoleModelOption CONSOLE_MODEL;
 
     MillisecondsOption DURATION;
     ColorCell COLOR;

SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.cpp

@@ -174,6 +174,7 @@ void MultiSwitchProgramSession::internal_run_program(){
             session.audio(),
             session.stream_history()
         );
+        handles.back().state().set_console_type(session.console_type());
     }
 
 

SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.cpp

@@ -143,6 +143,7 @@ void SingleSwitchProgramSession::internal_run_program(){
         m_system.audio(),
         m_system.stream_history()
     );
+    env.console.state().set_console_type(m_system.console_type());
 
     try{
         logger().log("<b>Starting Program: " + identifier() + "</b>");

SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemOption.cpp

@@ -57,11 +57,12 @@ Color pick_color(
 }
 
 
-const std::string SwitchSystemOption::JSON_CONTROLLER  = "Controller";
-const std::string SwitchSystemOption::JSON_CAMERA  = "Camera";
-const std::string SwitchSystemOption::JSON_VIDEO   = "Video";
-const std::string SwitchSystemOption::JSON_AUDIO   = "Audio";
-const std::string SwitchSystemOption::JSON_OVERLAY = "Overlay";
+const std::string SwitchSystemOption::JSON_CONTROLLER   = "Controller";
+const std::string SwitchSystemOption::JSON_CAMERA       = "Camera";
+const std::string SwitchSystemOption::JSON_VIDEO        = "Video";
+const std::string SwitchSystemOption::JSON_AUDIO        = "Audio";
+const std::string SwitchSystemOption::JSON_OVERLAY      = "Overlay";
+const std::string SwitchSystemOption::JSON_CONSOLE_TYPE = "ConsoleType";
 
 
 SwitchSystemOption::SwitchSystemOption(
@@ -103,6 +104,10 @@ void SwitchSystemOption::load_json(const JsonValue& json){
     if (value){
         m_overlay.load_json(*value);
     }
+    value = obj->get_value(JSON_CONSOLE_TYPE);
+    if (value){
+        m_console_type.load_json(*value);
+    }
 }
 JsonValue SwitchSystemOption::to_json() const{
     JsonObject root;
@@ -111,6 +116,8 @@ JsonValue SwitchSystemOption::to_json() const{
     root[JSON_VIDEO] = m_video.to_json();
     root[JSON_AUDIO] = m_audio.to_json();
     root[JSON_OVERLAY] = m_overlay.to_json();
+    root[JSON_CONSOLE_TYPE] = m_console_type.to_json();
+
     return root;
 }
 

SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemOption.h

@@ -21,6 +21,7 @@
 #include "CommonFramework/VideoPipeline/VideoOverlayOption.h"
 #include "Controllers/ControllerCapability.h"
 #include "Controllers/ControllerDescriptor.h"
+#include "NintendoSwitch/Options/NintendoSwitch_ModelType.h"
 
 namespace PokemonAutomation{
     class ControllerRequirements;
@@ -43,6 +44,7 @@ class SwitchSystemOption{
     static const std::string JSON_VIDEO;
     static const std::string JSON_AUDIO;
     static const std::string JSON_OVERLAY;
+    static const std::string JSON_CONSOLE_TYPE;
 
 public:
     SwitchSystemOption(
@@ -67,6 +69,7 @@ class SwitchSystemOption{
     VideoSourceOption m_video;
     AudioOption m_audio;
     VideoOverlayOption m_overlay;
+    ConsoleModelCell m_console_type;
 };
 
 

SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemSession.h

@@ -59,6 +59,7 @@ class SwitchSystemSession final : public TrackableConsole{
     virtual ControllerSession& controller() override{ return m_controller; };
     VideoOverlay& overlay(){ return m_overlay; }
     const StreamHistorySession& stream_history() const{ return m_history; }
+    ConsoleModelCell& console_type(){ return m_option.m_console_type; }
 
 public:
     void get(SwitchSystemOption& option);

SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_CommandRow.cpp

@@ -5,6 +5,7 @@
  */
 
 #include <QHBoxLayout>
+#include "Common/Qt/Options/ConfigWidget.h"
 #include "CommonFramework/GlobalSettingsPanel.h"
 #include "CommonFramework/Options/Environment/ThemeSelectorOption.h"
 #include "CommonFramework/Recording/StreamHistoryOption.h"
@@ -26,6 +27,7 @@ CommandRow::CommandRow(
     QWidget& parent,
     ControllerSession& controller,
     VideoOverlaySession& session,
+    ConsoleModelCell& console_type,
     bool allow_commands_while_running
 )
     : QWidget(&parent)
@@ -38,52 +40,68 @@ CommandRow::CommandRow(
     QHBoxLayout* command_row = new QHBoxLayout(this);
     command_row->setContentsMargins(0, 0, 0, 0);
 
-    command_row->addWidget(new QLabel("<b>Keyboard Input:</b>", this), 2);
+    command_row->addWidget(new QLabel("<b>Console Type:</b>", this), 2);
     command_row->addSpacing(5);
 
-    m_status = new QLabel(this);
-    command_row->addWidget(m_status, 12);
+    ConfigWidget* console_type_box = console_type.make_QtWidget(*this);
+    command_row->addWidget(&console_type_box->widget(), 4);
     command_row->addSpacing(5);
 
-    command_row->addWidget(new QLabel("<b>Overlays:<b>", this));
+    QHBoxLayout* row = new QHBoxLayout();
+    command_row->addLayout(row, 12);
+
+
+#if 0
+    row->addWidget(new QLabel("<b>Keyboard Input:</b>", this), 2);
+    row->addSpacing(5);
+#endif
+
+    row->addStretch(100);
+
+    m_status = new QLabel(this);
+    m_status->setVisible(false);
+//    row->addWidget(m_status, 12);
+//    row->addSpacing(5);
+
+//    row->addWidget(new QLabel("<b>Overlays:<b>", this));
 
     m_overlay_boxes = new QCheckBox("Boxes", this);
     m_overlay_boxes->setChecked(session.enabled_boxes());
-    command_row->addWidget(m_overlay_boxes);
+    row->addWidget(m_overlay_boxes);
 
     m_overlay_text = new QCheckBox("Text", this);
     m_overlay_text->setHidden(true);    //  Nothing uses text overlay yet.
     m_overlay_text->setChecked(session.enabled_text());
-    command_row->addWidget(m_overlay_text);
+    row->addWidget(m_overlay_text);
 
-    m_overlay_images = new QCheckBox("Images/Masks", this);
+    m_overlay_images = new QCheckBox("Masks", this);
     m_overlay_images->setChecked(session.enabled_images());
-    command_row->addWidget(m_overlay_images);
+    row->addWidget(m_overlay_images);
 
 
     m_overlay_log = new QCheckBox("Log", this);
     m_overlay_log->setChecked(session.enabled_log());
-    command_row->addWidget(m_overlay_log);
+    row->addWidget(m_overlay_log);
 
     m_overlay_stats = new QCheckBox("Stats", this);
     m_overlay_stats->setChecked(session.enabled_stats());
-    command_row->addWidget(m_overlay_stats);
+    row->addWidget(m_overlay_stats);
 
-    command_row->addSpacing(5);
+    row->addSpacing(5);
 
     m_load_profile_button = new QPushButton("Load Profile", this);
-    command_row->addWidget(m_load_profile_button, 2);
+    row->addWidget(m_load_profile_button, 2);
 
     m_save_profile_button = new QPushButton("Save Profile", this);
-    command_row->addWidget(m_save_profile_button, 2);
+    row->addWidget(m_save_profile_button, 2);
 
     m_screenshot_button = new QPushButton("Screenshot", this);
 //    m_screenshot_button->setToolTip("Take a screenshot of the console and save to disk.");
-    command_row->addWidget(m_screenshot_button, 2);
+    row->addWidget(m_screenshot_button, 2);
 
 
 //    m_test_button = new QPushButton("Test Button", this);
-//    command_row->addWidget(m_test_button, 3);
+//    row->addWidget(m_test_button, 3);
 
     update_ui();
 

SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_CommandRow.h

@@ -14,6 +14,7 @@
 #include "CommonFramework/Globals.h"
 #include "CommonFramework/VideoPipeline/VideoOverlaySession.h"
 #include "Controllers/ControllerSession.h"
+#include "NintendoSwitch/Options/NintendoSwitch_ModelType.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -34,6 +35,7 @@ class CommandRow :
         QWidget& parent,
         ControllerSession& controller,
         VideoOverlaySession& session,
+        ConsoleModelCell& console_type,
         bool allow_commands_while_running
     );
 

SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_SwitchSystemWidget.cpp

@@ -105,6 +105,7 @@ SwitchSystemWidget::SwitchSystemWidget(
             *widget,
             m_session.controller_session(),
             m_session.overlay_session(),
+            m_session.console_type(),
             m_session.allow_commands_while_running()
         );
         group_layout->addWidget(m_command);