Switch2: Fix false positive Home menu detection on user select screen.

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

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -287,13 +287,16 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 
 
 
+
 #if 1
-//    HomeMenuDetector detector0(console);
-//    StartGameUserSelectDetector detector1(console);
+    HomeMenuDetector detector0(console);
+    StartGameUserSelectDetector detector1(console);
     UpdatePopupDetector detector2(console);
-//    detector0.make_overlays(overlays);
-//    detector1.make_overlays(overlays);
+    detector0.make_overlays(overlays);
+    detector1.make_overlays(overlays);
     detector2.make_overlays(overlays);
+    cout << detector0.detect(feed.snapshot()) << endl;
+    cout << detector1.detect(feed.snapshot()) << endl;
     cout << detector2.detect(feed.snapshot()) << endl;
 #endif
 

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.cpp

@@ -8,6 +8,10 @@
 #include "CommonTools/Images/SolidColorTest.h"
 #include "NintendoSwitch_HomeMenuDetector.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 
@@ -17,6 +21,7 @@ namespace NintendoSwitch{
 HomeMenuDetector::HomeMenuDetector(ConsoleHandle& console, Color color)
     : m_color(color)
     , m_console_type(console, color)
+    , m_top(0.510223, 0.019835, 0.441450, 0.034711)
     , 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)
@@ -26,6 +31,7 @@ HomeMenuDetector::HomeMenuDetector(ConsoleHandle& console, Color color)
 {}
 void HomeMenuDetector::make_overlays(VideoOverlaySet& items) const{
     m_console_type.make_overlays(items);
+    items.add(m_color, m_top);
     items.add(m_color, m_bottom_row);
     items.add(m_color, m_bottom_icons);
     items.add(m_color, m_bottom_left);
@@ -60,6 +66,12 @@ bool HomeMenuDetector::detect_only(const ImageViewRGB32& screen){
 
 //    cout << "white: " << white << endl;
 
+    ImageStats stats_top = image_stats(extract_box_reference(screen, m_top));
+//    cout << stats_top.average << stats_top.stddev << endl;
+    if (stats_top.stddev.sum() > 20){
+        return false;
+    }
+
     ImageStats stats_bottom_icons = image_stats(extract_box_reference(screen, m_bottom_icons));
 //    cout << stats_bottom_icons.average << stats_bottom_icons.stddev << endl;
     if (stats_bottom_icons.stddev.sum() < 50){
@@ -97,6 +109,11 @@ bool HomeMenuDetector::detect_only(const ImageViewRGB32& screen){
 //        cout << "zxcv" << endl;
         return false;
     }
+//    cout << euclidean_distance(stats_top.average, stats_bottom_left.average) << endl;
+    if (euclidean_distance(stats_top.average, stats_bottom_left.average) > 20){
+//        cout << "xcvb" << endl;
+        return false;
+    }
 
     ImageStats stats_user_icons = image_stats(extract_box_reference(screen, m_user_icons));
 //    cout << stats_user_icons.stddev << endl;

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.h

@@ -29,6 +29,7 @@ class HomeMenuDetector : public StaticScreenDetector{
 private:
     Color m_color;
     ConsoleTypeDetector_Home m_console_type;
+    ImageFloatBox m_top;
     ImageFloatBox m_bottom_row;
     ImageFloatBox m_bottom_icons;
     ImageFloatBox m_bottom_left;

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_StartGameUserSelectDetector.cpp

@@ -40,7 +40,6 @@ bool StartGameUserSelectDetector::detect(const ImageViewRGB32& screen){
 }
 bool StartGameUserSelectDetector::detect_only(const ImageViewRGB32& screen){
     ConsoleType type = m_type_detector.detect_only(screen);
-//    cout << "detection: " << (int)x << endl;
     m_console_type = type;
 
     if (type == ConsoleType::Unknown){

SerialPrograms/Source/NintendoSwitch/NintendoSwitch_ConsoleState.cpp

@@ -134,7 +134,10 @@ void ConsoleState::set_console_type(Logger& logger, ConsoleType type){
 
     }while (false);
 
-    logger.log(std::string("Setting console type to: ") + ConsoleType_strings(type));
+    logger.log(
+        std::string("Setting console type to: ") + ConsoleType_strings(type),
+        COLOR_BLUE
+    );
 
     m_data->m_console_type.store(type, std::memory_order_relaxed);
     m_data->m_console_type_confirmed.store(true, std::memory_order_relaxed);