Update menu detector false positives on checking for internet box.

Author: Mysticial

SerialPrograms/Source/CommonFramework/Globals.cpp

@@ -25,8 +25,8 @@ namespace PokemonAutomation{
 
 const bool IS_BETA_VERSION = true;
 const int PROGRAM_VERSION_MAJOR = 0;
-const int PROGRAM_VERSION_MINOR = 61;
-const int PROGRAM_VERSION_PATCH = 9;
+const int PROGRAM_VERSION_MINOR = 62;
+const int PROGRAM_VERSION_PATCH = 1;
 
 const std::string PROGRAM_VERSION_BASE =
     "v" + std::to_string(PROGRAM_VERSION_MAJOR) +

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -517,6 +517,14 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 
 
 
+    UpdateMenuWatcher update_menu(console, COLOR_PURPLE);
+    CheckOnlineWatcher check_online(COLOR_CYAN);
+    update_menu.make_overlays(overlays);
+    check_online.make_overlays(overlays);
+
+
+
+
 #if 0
     {
         MockDevice device;

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.cpp

@@ -77,6 +77,7 @@ UpdatePopupDetector_Switch1::UpdatePopupDetector_Switch1(Color color)
     , 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)
+    , m_option_divider(0.49, 0.66, 0.02, 0.01)
 {}
 void UpdatePopupDetector_Switch1::make_overlays(VideoOverlaySet& items) const{
     items.add(m_color, m_box_top);
@@ -85,8 +86,14 @@ void UpdatePopupDetector_Switch1::make_overlays(VideoOverlaySet& items) const{
     items.add(m_color, m_left);
     items.add(m_color, m_bottom_solid);
     items.add(m_color, m_bottom_buttons);
+    items.add(m_color, m_option_divider);
 }
 bool UpdatePopupDetector_Switch1::detect(const ImageViewRGB32& screen){
+    ImageStats option_divider = image_stats(extract_box_reference(screen, m_option_divider));
+    if (option_divider.stddev.sum() < 10){
+        return false;
+    }
+
     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;
@@ -161,6 +168,7 @@ UpdatePopupDetector_Switch2::UpdatePopupDetector_Switch2(Color color)
     , m_left(0.08, 0.25, 0.10, 0.38)
     , m_bottom_solid(0.10, 0.86, 0.80, 0.04)
     , m_bottom_buttons(0.70, 0.92, 0.28, 0.05)
+    , m_option_divider(0.49, 0.60, 0.02, 0.01)
 {}
 
 void UpdatePopupDetector_Switch2::make_overlays(VideoOverlaySet& items) const{
@@ -170,8 +178,14 @@ void UpdatePopupDetector_Switch2::make_overlays(VideoOverlaySet& items) const{
     items.add(m_color, m_left);
     items.add(m_color, m_bottom_solid);
     items.add(m_color, m_bottom_buttons);
+    items.add(m_color, m_option_divider);
 }
 bool UpdatePopupDetector_Switch2::detect(const ImageViewRGB32& screen){
+    ImageStats option_divider = image_stats(extract_box_reference(screen, m_option_divider));
+    if (option_divider.stddev.sum() < 10){
+        return false;
+    }
+
     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;

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.h

@@ -33,6 +33,7 @@ class UpdatePopupDetector_Switch1 : public StaticScreenDetector{
     ImageFloatBox m_left;
     ImageFloatBox m_bottom_solid;
     ImageFloatBox m_bottom_buttons;
+    ImageFloatBox m_option_divider;
 };
 class UpdatePopupDetector_Switch2 : public StaticScreenDetector{
 public:
@@ -49,6 +50,7 @@ class UpdatePopupDetector_Switch2 : public StaticScreenDetector{
     ImageFloatBox m_left;
     ImageFloatBox m_bottom_solid;
     ImageFloatBox m_bottom_buttons;
+    ImageFloatBox m_option_divider;
 };