Switch 2 update menu detector.

Author: Mysticial

SerialPrograms/CMakeLists.txt

@@ -953,12 +953,16 @@ file(GLOB MAIN_SOURCES
     Source/NintendoSwitch/Framework/UI/NintendoSwitch_SingleSwitchProgramWidget.h
     Source/NintendoSwitch/Framework/UI/NintendoSwitch_SwitchSystemWidget.cpp
     Source/NintendoSwitch/Framework/UI/NintendoSwitch_SwitchSystemWidget.h
+    Source/NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.cpp
+    Source/NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h
     Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.cpp
     Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.h
     Source/NintendoSwitch/Inference/NintendoSwitch_DetectHome.cpp
     Source/NintendoSwitch/Inference/NintendoSwitch_DetectHome.h
     Source/NintendoSwitch/Inference/NintendoSwitch_SelectedSettingDetector.cpp
     Source/NintendoSwitch/Inference/NintendoSwitch_SelectedSettingDetector.h
+    Source/NintendoSwitch/Inference/NintendoSwitch_UpdateMenuDetector.cpp
+    Source/NintendoSwitch/Inference/NintendoSwitch_UpdateMenuDetector.h
     Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.cpp
     Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.h
     Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp

SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_StillImage.h

@@ -38,7 +38,7 @@ class VideoSourceDescriptor_StillImage : public VideoSourceDescriptor{
 
     virtual bool operator==(const VideoSourceDescriptor& x) const override;
     virtual std::string display_name() const override{
-        return "Display a Still Image";
+        return "Display Image";
     }
 
     virtual void run_post_select() override;

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -123,6 +123,8 @@
 #include "CommonTools/Images/ImageFilter.h"
 #include "NintendoSwitch/Options/NintendoSwitch_ModelType.h"
 #include "NintendoSwitch/Programs/NintendoSwitch_Navigation.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_UpdateMenuDetector.h"
 
 #include <QPixmap>
 #include <QVideoFrame>
@@ -318,8 +320,21 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     VideoOverlaySet overlays(overlay);
 
 
+#if 0
+    ConsoleTypeDetector_Home detector;
+    detector.make_overlays(overlays);
+
+    cout << (int)detector.detect(feed.snapshot()) << endl;
+#endif
+
 
 
+#if 1
+    UpdateMenuDetector detector;
+    detector.make_overlays(overlays);
+
+    cout << detector.detect(feed.snapshot()) << endl;
+#endif
 
 
 

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.cpp

@@ -0,0 +1,41 @@
+/*  Console Type Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "NintendoSwitch_ConsoleTypeDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+ConsoleTypeDetector_Home::ConsoleTypeDetector_Home(Color color)
+    : m_color(color)
+    , m_bottom_line(0.10, 0.88, 0.80, 0.03)
+{}
+
+void ConsoleTypeDetector_Home::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_bottom_line);
+}
+ConsoleTypeDetection ConsoleTypeDetector_Home::detect(const ImageViewRGB32& screen) const{
+    ImageStats stats = image_stats(extract_box_reference(screen, m_bottom_line));
+//    cout << stats.stddev.sum() << endl;
+    if (stats.stddev.sum() < 10){
+        return ConsoleTypeDetection::Switch2_Unknown;
+    }else{
+        return ConsoleTypeDetection::Switch1;
+    }
+}
+
+
+
+
+}
+}

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h

@@ -0,0 +1,54 @@
+/*  Console Type Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_ConsoleTypeDetector_H
+#define PokemonAutomation_NintendoSwitch_ConsoleTypeDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+enum class ConsoleTypeDetection{
+    Unknown,
+    Switch1,
+    Switch2_Unknown,
+    Switch2_International,
+    Switch2_JapanLocked,
+};
+inline bool is_switch2(ConsoleTypeDetection detection){
+    return detection == ConsoleTypeDetection::Switch2_Unknown
+        || detection == ConsoleTypeDetection::Switch2_International
+        || detection == ConsoleTypeDetection::Switch2_JapanLocked;
+}
+
+
+
+
+class ConsoleTypeDetector_Home{
+public:
+    ConsoleTypeDetector_Home(Color color = COLOR_RED);
+
+    void make_overlays(VideoOverlaySet& items) const;
+    ConsoleTypeDetection detect(const ImageViewRGB32& screen) const;
+
+private:
+    Color m_color;
+    ImageFloatBox m_bottom_line;
+};
+
+
+
+
+
+}
+}
+#endif

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DetectHome.cpp

@@ -174,88 +174,6 @@ bool StartGameUserSelectDetector::detect(const ImageViewRGB32& screen) const{
 
 
 
-UpdateMenuDetector::UpdateMenuDetector(Color color, bool invert)
-    : m_color(color)
-    , m_invert(invert)
-    , m_box_top(0.25, 0.26, 0.50, 0.02)
-    , m_box_mid(0.25, 0.52, 0.50, 0.02)
-    , m_top(0.10, 0.15, 0.80, 0.03)
-    , m_left(0.08, 0.25, 0.10, 0.38)
-    , m_bottom_solid(0.10, 0.84, 0.80, 0.04)
-    , m_bottom_buttons(0.70, 0.92, 0.28, 0.05)
-{}
-void UpdateMenuDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_box_top);
-    items.add(m_color, m_box_mid);
-    items.add(m_color, m_top);
-    items.add(m_color, m_left);
-    items.add(m_color, m_bottom_solid);
-    items.add(m_color, m_bottom_buttons);
-}
-bool UpdateMenuDetector::detect(const ImageViewRGB32& screen) const{
-    ImageStats stats_box_top = image_stats(extract_box_reference(screen, m_box_top));
-//    cout << stats_box_top.average << stats_box_top.stddev << endl;
-    bool white;
-    if (stats_box_top.average.sum() < 300){
-        white = false;
-    }else if (stats_box_top.average.sum() > 500){
-        white = true;
-    }else{
-        return m_invert;
-    }
-    if (stats_box_top.stddev.sum() > 10){
-        return m_invert;
-    }
-
-//    cout << "white: " << white << endl;
-
-    ImageStats stats_box_mid = image_stats(extract_box_reference(screen, m_box_mid));
-    if (stats_box_mid.stddev.sum() > 10){
-        return m_invert;
-    }
-    if (euclidean_distance(stats_box_top.average, stats_box_mid.average) > 10){
-        return m_invert;
-    }
-
-    ImageStats stats_left = image_stats(extract_box_reference(screen, m_left));
-//    cout << stats_left.stddev << endl;
-    if (stats_left.stddev.sum() < 30){
-//        cout << "zxcv" << endl;
-        return m_invert;
-    }
-
-    ImageStats stats_top = image_stats(extract_box_reference(screen, m_top));
-//    cout << stats_top.average << stats_top.stddev << endl;
-
-    ImageStats bottom_solid = image_stats(extract_box_reference(screen, m_bottom_solid));
-//    cout << bottom_solid.average << bottom_solid.stddev << endl;
-
-    if (euclidean_distance(stats_top.average, bottom_solid.average) > 10){
-//        cout << "qwer" << endl;
-        return m_invert;
-    }
-
-    if (white){
-        if (!is_grey(stats_top, 100, 300) || !is_grey(bottom_solid, 100, 300)){
-//            cout << "asdf" << endl;
-            return m_invert;
-        }
-    }else{
-        if (!is_grey(stats_top, 0, 100) || !is_grey(bottom_solid, 0, 100)){
-//            cout << "zxcv" << endl;
-            return m_invert;
-        }
-    }
-
-    ImageStats stats_bottom_buttons = image_stats(extract_box_reference(screen, m_bottom_buttons));
-//    cout << stats_bottom_buttons.average << stats_bottom_buttons.stddev << endl;
-    if (stats_bottom_buttons.stddev.sum() < 30){
-        return m_invert;
-    }
-
-    return !m_invert;
-}
-
 
 
 

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DetectHome.h

@@ -63,31 +63,6 @@ class StartGameUserSelectWatcher : public DetectorToFinder<StartGameUserSelectDe
 };
 
 
-//  Detect the Switch system update screen when you are about to enter a game from Switch Home screen
-class UpdateMenuDetector : public StaticScreenDetector{
-public:
-    UpdateMenuDetector(Color color = COLOR_RED, bool invert = false);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    Color m_color;
-    bool m_invert;
-    ImageFloatBox m_box_top;
-    ImageFloatBox m_box_mid;
-    ImageFloatBox m_top;
-    ImageFloatBox m_left;
-    ImageFloatBox m_bottom_solid;
-    ImageFloatBox m_bottom_buttons;
-};
-class UpdateMenuWatcher : public DetectorToFinder<UpdateMenuDetector>{
-public:
-    UpdateMenuWatcher(Color color = COLOR_RED, bool invert = false)
-         : DetectorToFinder("UpdateMenuWatcher", std::chrono::milliseconds(250), color, invert)
-    {}
-};
-
 
 
 //  Detect the "Checking if the software can be played..." menu.