Throw error if user console type selection conflicts with the detected value.

Author: Mysticial

SerialPrograms/CMakeLists.txt

@@ -969,6 +969,7 @@ file(GLOB MAIN_SOURCES
     Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.h
     Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.cpp
     Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.h
+    Source/NintendoSwitch/NintendoSwitch_ConsoleState.cpp
     Source/NintendoSwitch/NintendoSwitch_ConsoleState.h
     Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp
     Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h
@@ -2449,7 +2450,7 @@ if (MSVC)
         PA_DPP
     )
 
-    target_compile_options(SerialPrograms PRIVATE /FAs /FaAssembly/ /MP /W4 /WX /utf-8)
+    target_compile_options(SerialPrograms PRIVATE /FAs /FaAssembly/ /MP /W4 /WX /external:anglebrackets /external:W0 /utf-8)
     target_compile_options(SerialPrograms PRIVATE /wd5054)  # Deprecated enum arithemtic
     target_compile_options(SerialPrograms PRIVATE /wd4505)  # unreferenced local function has been removed
 

SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.cpp

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

SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.cpp

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

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.cpp

@@ -16,66 +16,62 @@ namespace PokemonAutomation{
 namespace NintendoSwitch{
 
 
-ConsoleTypeDetector_Home::ConsoleTypeDetector_Home(ConsoleState& state, Color color)
-    : m_state(state)
+ConsoleTypeDetector_Home::ConsoleTypeDetector_Home(ConsoleHandle& console, Color color)
+    : m_console(console)
     , m_color(color)
     , m_bottom_line(0.10, 0.88, 0.80, 0.03)
 {}
 void ConsoleTypeDetector_Home::make_overlays(VideoOverlaySet& items) const{
-    ConsoleType known_state = m_state.console_type();
+    ConsoleType known_state = m_console.state().console_type();
     if (known_state != ConsoleType::Unknown){
         return;
     }
     items.add(m_color, m_bottom_line);
 }
 ConsoleType ConsoleTypeDetector_Home::detect(const ImageViewRGB32& screen){
-    ConsoleType known_state = m_state.console_type();
-    if (known_state != ConsoleType::Unknown){
-        return known_state;
+    if (m_console.state().console_type_confirmed()){
+        return m_console.state().console_type();
     }
 
     ImageStats stats = image_stats(extract_box_reference(screen, m_bottom_line));
 //    cout << "ConsoleTypeDetector: " << stats.stddev.sum() << endl;
+    ConsoleType state;
     if (stats.stddev.sum() < 10){
-        known_state = ConsoleType::Switch2_Unknown;
+        state = ConsoleType::Switch2_Unknown;
     }else{
-        known_state = ConsoleType::Switch1;
+        state = ConsoleType::Switch1;
     }
 
-    m_state.set_console_type(known_state);
-    return known_state;
+    m_console.state().set_console_type(m_console, state);
+    return state;
 }
 
 
 
-ConsoleTypeDetector_StartGameUserSelect::ConsoleTypeDetector_StartGameUserSelect(ConsoleState& state, Color color)
-    : m_state(state)
+ConsoleTypeDetector_StartGameUserSelect::ConsoleTypeDetector_StartGameUserSelect(ConsoleHandle& console, Color color)
+    : m_console(console)
     , m_color(color)
     , m_bottom_line(0.02, 0.53, 0.96, 0.03)
 {}
 void ConsoleTypeDetector_StartGameUserSelect::make_overlays(VideoOverlaySet& items) const{
-    ConsoleType known_state = m_state.console_type();
-    if (known_state != ConsoleType::Unknown){
-        return;
-    }
     items.add(m_color, m_bottom_line);
 }
 ConsoleType ConsoleTypeDetector_StartGameUserSelect::detect(const ImageViewRGB32& screen){
-    ConsoleType known_state = m_state.console_type();
-    if (known_state != ConsoleType::Unknown){
-        return known_state;
+    if (m_console.state().console_type_confirmed()){
+        return m_console.state().console_type();
     }
 
     ImageStats stats = image_stats(extract_box_reference(screen, m_bottom_line));
 //    cout << "ConsoleTypeDetector: " << stats.stddev.sum() << endl;
+    ConsoleType state;
     if (stats.stddev.sum() < 10){
-        known_state = ConsoleType::Switch2_Unknown;
+        state = ConsoleType::Switch2_Unknown;
     }else{
-        known_state = ConsoleType::Switch1;
+        state = ConsoleType::Switch1;
     }
 
-    m_state.set_console_type(known_state);
-    return known_state;
+    m_console.state().set_console_type(m_console, state);
+    return state;
 }
 
 

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h

@@ -11,7 +11,7 @@
 #include "CommonFramework/ImageTools/ImageBoxes.h"
 #include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
 #include "CommonTools/VisualDetector.h"
-#include "NintendoSwitch/NintendoSwitch_ConsoleState.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -21,26 +21,26 @@ namespace NintendoSwitch{
 
 class ConsoleTypeDetector_Home{
 public:
-    ConsoleTypeDetector_Home(ConsoleState& state, Color color = COLOR_RED);
+    ConsoleTypeDetector_Home(ConsoleHandle& console, Color color = COLOR_RED);
 
     void make_overlays(VideoOverlaySet& items) const;
     ConsoleType detect(const ImageViewRGB32& screen);
 
 private:
-    ConsoleState& m_state;
+    ConsoleHandle& m_console;
     Color m_color;
     ImageFloatBox m_bottom_line;
 };
 
 class ConsoleTypeDetector_StartGameUserSelect{
 public:
-    ConsoleTypeDetector_StartGameUserSelect(ConsoleState& state, Color color = COLOR_RED);
+    ConsoleTypeDetector_StartGameUserSelect(ConsoleHandle& console, Color color = COLOR_RED);
 
     void make_overlays(VideoOverlaySet& items) const;
     ConsoleType detect(const ImageViewRGB32& screen);
 
 private:
-    ConsoleState& m_state;
+    ConsoleHandle& m_console;
     Color m_color;
     ImageFloatBox m_bottom_line;
 };

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.cpp

@@ -14,9 +14,9 @@ namespace NintendoSwitch{
 
 
 
-HomeMenuDetector::HomeMenuDetector(ConsoleState& state, Color color)
+HomeMenuDetector::HomeMenuDetector(ConsoleHandle& console, Color color)
     : m_color(color)
-    , m_console_type(state, color)
+    , m_console_type(console, color)
     , m_bottom_row(0.10, 0.92, 0.10, 0.05)
     , m_bottom_icons(0.70, 0.92, 0.28, 0.05)
     , m_bottom_left(0.02, 0.70, 0.15, 0.15)

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.h

@@ -21,7 +21,7 @@ namespace NintendoSwitch{
 
 class HomeMenuDetector : public StaticScreenDetector{
 public:
-    HomeMenuDetector(ConsoleState& state, Color color = COLOR_RED);
+    HomeMenuDetector(ConsoleHandle& console, Color color = COLOR_RED);
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
     virtual bool detect(const ImageViewRGB32& screen) override;
@@ -39,10 +39,10 @@ class HomeMenuDetector : public StaticScreenDetector{
 class HomeMenuWatcher : public DetectorToFinder<HomeMenuDetector>{
 public:
     HomeMenuWatcher(
-        ConsoleState& state,
+        ConsoleHandle& console,
         std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
     )
-         : DetectorToFinder("HomeMenuWatcher", hold_duration, state)
+         : DetectorToFinder("HomeMenuWatcher", hold_duration, console)
     {}
 };
 

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_StartGameUserSelectDetector.cpp

@@ -19,8 +19,8 @@ namespace NintendoSwitch{
 
 
 
-StartGameUserSelectDetector::StartGameUserSelectDetector(ConsoleState& state, Color color)
-    : m_type_detector(state, color)
+StartGameUserSelectDetector::StartGameUserSelectDetector(ConsoleHandle& console, Color color)
+    : m_type_detector(console, color)
     , m_switch1(color)
     , m_switch2(color)
 {}
@@ -36,7 +36,7 @@ bool StartGameUserSelectDetector::detect(const ImageViewRGB32& screen){
     if (type == ConsoleType::Unknown){
         return false;
     }
-    if (type == ConsoleType::Switch1){
+    if (is_switch1(type)){
         return m_switch1.detect(screen);
     }
     if (is_switch2(type)){

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_StartGameUserSelectDetector.h

@@ -56,7 +56,7 @@ class StartGameUserSelectDetector_Switch2 : public StaticScreenDetector{
 
 class StartGameUserSelectDetector : public StaticScreenDetector{
 public:
-    StartGameUserSelectDetector(ConsoleState& state, Color color = COLOR_RED);
+    StartGameUserSelectDetector(ConsoleHandle& console, Color color = COLOR_RED);
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
     virtual bool detect(const ImageViewRGB32& screen) override;
@@ -68,8 +68,8 @@ class StartGameUserSelectDetector : public StaticScreenDetector{
 };
 class StartGameUserSelectWatcher : public DetectorToFinder<StartGameUserSelectDetector>{
 public:
-    StartGameUserSelectWatcher(ConsoleState& state, Color color = COLOR_RED)
-         : DetectorToFinder("StartGameUserSelectWatcher", std::chrono::milliseconds(250), state, color)
+    StartGameUserSelectWatcher(ConsoleHandle& console, Color color = COLOR_RED)
+         : DetectorToFinder("StartGameUserSelectWatcher", std::chrono::milliseconds(250), console, color)
     {}
 };
 

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.cpp

@@ -18,8 +18,8 @@ namespace NintendoSwitch{
 
 
 
-UpdatePopupDetector::UpdatePopupDetector(ConsoleState& state, Color color)
-    : m_type_detector(state, color)
+UpdatePopupDetector::UpdatePopupDetector(ConsoleHandle& console, Color color)
+    : m_type_detector(console, color)
     , m_switch1(color)
     , m_switch2(color)
 {}
@@ -34,7 +34,7 @@ bool UpdatePopupDetector::detect(const ImageViewRGB32& screen){
     if (type == ConsoleType::Unknown){
         return false;
     }
-    if (type == ConsoleType::Switch1){
+    if (is_switch1(type)){
         return m_switch1.detect(screen);
     }
     if (is_switch2(type)){