Proper fix for console type logic.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.cpp

@@ -28,7 +28,7 @@ void ConsoleTypeDetector_Home::make_overlays(VideoOverlaySet& items) const{
     }
     items.add(m_color, m_bottom_line);
 }
-ConsoleType ConsoleTypeDetector_Home::detect(const ImageViewRGB32& screen){
+ConsoleType ConsoleTypeDetector_Home::detect_only(const ImageViewRGB32& screen){
     if (m_console.state().console_type_confirmed()){
         return m_console.state().console_type();
     }
@@ -41,10 +41,12 @@ ConsoleType ConsoleTypeDetector_Home::detect(const ImageViewRGB32& screen){
     }else{
         state = ConsoleType::Switch1;
     }
-
-    m_console.state().set_console_type(m_console, state);
+    m_last = state;
     return state;
 }
+void ConsoleTypeDetector_Home::commit_to_cache(){
+    m_console.state().set_console_type(m_console, m_last);
+}
 
 
 
@@ -56,7 +58,7 @@ ConsoleTypeDetector_StartGameUserSelect::ConsoleTypeDetector_StartGameUserSelect
 void ConsoleTypeDetector_StartGameUserSelect::make_overlays(VideoOverlaySet& items) const{
     items.add(m_color, m_bottom_line);
 }
-ConsoleType ConsoleTypeDetector_StartGameUserSelect::detect(const ImageViewRGB32& screen){
+ConsoleType ConsoleTypeDetector_StartGameUserSelect::detect_only(const ImageViewRGB32& screen){
     if (m_console.state().console_type_confirmed()){
         return m_console.state().console_type();
     }
@@ -69,9 +71,12 @@ ConsoleType ConsoleTypeDetector_StartGameUserSelect::detect(const ImageViewRGB32
     }else{
         state = ConsoleType::Switch1;
     }
-
+    m_last = state;
     return state;
 }
+void ConsoleTypeDetector_StartGameUserSelect::commit_to_cache(){
+    m_console.state().set_console_type(m_console, m_last);
+}
 
 
 

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h

@@ -24,25 +24,29 @@ class ConsoleTypeDetector_Home{
     ConsoleTypeDetector_Home(ConsoleHandle& console, Color color = COLOR_RED);
 
     void make_overlays(VideoOverlaySet& items) const;
-    ConsoleType detect(const ImageViewRGB32& screen);
+    ConsoleType detect_only(const ImageViewRGB32& screen);
+    void commit_to_cache();
 
 private:
     ConsoleHandle& m_console;
     Color m_color;
     ImageFloatBox m_bottom_line;
+    ConsoleType m_last;
 };
 
 class ConsoleTypeDetector_StartGameUserSelect{
 public:
     ConsoleTypeDetector_StartGameUserSelect(ConsoleHandle& console, Color color = COLOR_RED);
 
     void make_overlays(VideoOverlaySet& items) const;
-    ConsoleType detect(const ImageViewRGB32& screen);
+    ConsoleType detect_only(const ImageViewRGB32& screen);
+    void commit_to_cache();
 
 private:
     ConsoleHandle& m_console;
     Color m_color;
     ImageFloatBox m_bottom_line;
+    ConsoleType m_last;
 };
 
 

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.cpp

@@ -38,6 +38,14 @@ void HomeMenuDetector::make_overlays(VideoOverlaySet& items) const{
 //  This miraculously works on both Switch 1 and Switch 2.
 //
 bool HomeMenuDetector::detect(const ImageViewRGB32& screen){
+    if (detect_only(screen)){
+        m_console_type.commit_to_cache();
+        return true;
+    }else{
+        return false;
+    }
+}
+bool HomeMenuDetector::detect_only(const ImageViewRGB32& screen){
     ImageStats stats_bottom_row = image_stats(extract_box_reference(screen, m_bottom_row));
 //    cout << stats_bottom_row.average << stats_bottom_row.stddev << endl;
     bool white;
@@ -102,7 +110,7 @@ bool HomeMenuDetector::detect(const ImageViewRGB32& screen){
     }
 
     //  Read the console type only when we have confirmed the home menu.
-    m_console_type.detect(screen);
+    m_console_type.detect_only(screen);
 
     return true;
 }

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.h

@@ -11,7 +11,6 @@
 #include "CommonFramework/ImageTools/ImageBoxes.h"
 #include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
 #include "CommonTools/VisualDetector.h"
-#include "NintendoSwitch/NintendoSwitch_ConsoleState.h"
 #include "NintendoSwitch_ConsoleTypeDetector.h"
 
 namespace PokemonAutomation{
@@ -25,6 +24,7 @@ class HomeMenuDetector : public StaticScreenDetector{
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
     virtual bool detect(const ImageViewRGB32& screen) override;
+    bool detect_only(const ImageViewRGB32& screen);
 
 private:
     Color m_color;

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_StartGameUserSelectDetector.cpp

@@ -30,8 +30,16 @@ void StartGameUserSelectDetector::make_overlays(VideoOverlaySet& items) const{
     m_switch1.make_overlays(items);
     m_switch2.make_overlays(items);
 }
+bool StartGameUserSelectDetector::detect(const ImageViewRGB32& screen){
+    if (detect_only(screen)){
+        m_console.state().set_console_type(m_console, m_console_type);
+        return true;
+    }else{
+        return false;
+    }
+}
 bool StartGameUserSelectDetector::detect_only(const ImageViewRGB32& screen){
-    ConsoleType type = m_type_detector.detect(screen);
+    ConsoleType type = m_type_detector.detect_only(screen);
 //    cout << "detection: " << (int)x << endl;
     m_console_type = type;
 
@@ -50,14 +58,6 @@ bool StartGameUserSelectDetector::detect_only(const ImageViewRGB32& screen){
         "Invalid ConsoleType: " + std::to_string((int)type)
     );
 }
-bool StartGameUserSelectDetector::detect(const ImageViewRGB32& screen){
-    if (detect_only(screen)){
-        m_console.state().set_console_type(m_console, m_console_type);
-        return true;
-    }else{
-        return false;
-    }
-}
 
 
 

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_StartGameUserSelectDetector.h

@@ -59,8 +59,8 @@ class StartGameUserSelectDetector : public StaticScreenDetector{
     StartGameUserSelectDetector(ConsoleHandle& console, Color color = COLOR_RED);
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
-    bool detect_only(const ImageViewRGB32& screen);
     virtual bool detect(const ImageViewRGB32& screen) override;
+    bool detect_only(const ImageViewRGB32& screen);
 
 private:
     ConsoleHandle& m_console;

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.cpp

@@ -29,7 +29,15 @@ void UpdatePopupDetector::make_overlays(VideoOverlaySet& items) const{
     m_switch2.make_overlays(items);
 }
 bool UpdatePopupDetector::detect(const ImageViewRGB32& screen){
-    ConsoleType type = m_type_detector.detect(screen);
+    if (detect_only(screen)){
+        m_type_detector.commit_to_cache();
+        return true;
+    }else{
+        return false;
+    }
+}
+bool UpdatePopupDetector::detect_only(const ImageViewRGB32& screen){
+    ConsoleType type = m_type_detector.detect_only(screen);
 
     if (type == ConsoleType::Unknown){
         return false;

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.h

@@ -62,6 +62,7 @@ class UpdatePopupDetector : public StaticScreenDetector{
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
     virtual bool detect(const ImageViewRGB32& screen) override;
+    bool detect_only(const ImageViewRGB32& screen);
 
 private:
     ConsoleTypeDetector_Home m_type_detector;

SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.cpp

@@ -476,7 +476,7 @@ bool home_to_date_time_with_feedback(ConsoleHandle& console, ProControllerContex
     }
 
     ConsoleTypeDetector_Home detector(console);
-    ConsoleType console_type = detector.detect(console.video().snapshot());
+    ConsoleType console_type = detector.detect_only(console.video().snapshot());
     switch (console_type){
     case ConsoleType::Switch1:
         return home_to_date_time_switch1_feedback(console, context, to_date_change);