Refactor start-game related detectors with support Switch 2.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.cpp

@@ -12,7 +12,7 @@
 #include "NintendoSwitch_Commands_Routines.h"
 #include "NintendoSwitch_Commands_PushButtons.h"
 #include "NintendoSwitch_Commands_Superscalar.h"
-#include "NintendoSwitch/Inference/NintendoSwitch_DetectHome.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.h"
 //#include "NintendoSwitch_Messages_Routines.h"
 
 //#include <iostream>
@@ -45,7 +45,7 @@ void close_game(VideoStream& stream, ProControllerContext& context){
     // send a second Home button press, if the first one is dropped
     bool video_available = (bool)stream.video().snapshot();
     if (video_available){
-        HomeWatcher detector;
+        HomeMenuWatcher detector;
         int ret = wait_until(
             stream, context,
             std::chrono::milliseconds(5000),
@@ -88,7 +88,7 @@ void close_game(VideoStream& stream, JoyconContext& context){
     pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
     context.wait_for_all_requests();
 
-    HomeWatcher detector;
+    HomeMenuWatcher detector;
     int ret = wait_until(
         stream, context,
         std::chrono::milliseconds(5000),

SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Connection.cpp

@@ -107,6 +107,7 @@ ControllerModeStatus TcpSysbotBase_Connection::controller_mode_status() const{
 
 void TcpSysbotBase_Connection::write_data(const std::string& data){
     WriteSpinLock lg(m_send_lock);
+    cout << "Sending: " << data << endl;    //  REMOVE
     m_socket.blocking_send(data.data(), data.size());
 }
 

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp

@@ -650,7 +650,7 @@ void TestProgramComputer::program(ProgramEnvironment& env, CancellableScope& sco
 
 //    ImageRGB32 image("20230427-200550386826-OperationFailedException.png");
 
-//    NintendoSwitch::HomeDetector detector;
+//    NintendoSwitch::HomeMenuDetector detector;
 //    cout << detector.detect(image) << endl;
 
 

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -124,7 +124,9 @@
 #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 "NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_StartGameUserSelectDetector.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.h"
 
 #include <QPixmap>
 #include <QVideoFrame>
@@ -320,6 +322,17 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     VideoOverlaySet overlays(overlay);
 
 
+
+    HomeMenuDetector detector0;
+    StartGameUserSelectDetector detector1;
+    UpdatePopupDetector detector2;
+    detector0.make_overlays(overlays);
+    detector1.make_overlays(overlays);
+    detector2.make_overlays(overlays);
+    cout << detector1.detect(feed.snapshot()) << endl;
+
+
+
 #if 0
     ConsoleTypeDetector_Home detector;
     detector.make_overlays(overlays);
@@ -329,8 +342,8 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 
 
 
-#if 1
-    UpdateMenuDetector detector;
+#if 0
+    UpdatePopupDetector detector;
     detector.make_overlays(overlays);
 
     cout << detector.detect(feed.snapshot()) << endl;
@@ -2269,7 +2282,7 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 
 
 //    YCommMenuDetector detector(true);
-//    HomeDetector detector;
+//    HomeMenuDetector detector;
 //    cout << detector.detect(image) << endl;
 //    cout << detector.detect(feed.snapshot()) << endl;
 
@@ -2336,8 +2349,8 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 #if 0
     ImageRGB32 image("screenshot-20221107-210754107968.png");
 //    auto image = feed.snapshot();
-    HomeDetector detector;
-//    UpdateMenuDetector detector;
+    HomeMenuDetector detector;
+//    UpdatePopupDetector detector;
     VideoOverlaySet overlays(overlay);
     detector.make_overlays(overlays);
     cout << detector.detect(image) << endl;
@@ -2346,7 +2359,7 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 //    ImageRGB32 image("ExclamationFalsePositive.png");
 //    find_exclamation_marks(image);
 
-//    HomeDetector detector;
+//    HomeMenuDetector detector;
 //    cout << detector.detect(image) << endl;
 
 

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.cpp

@@ -20,13 +20,31 @@ 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;
+//    cout << "ConsoleTypeDetector: " << stats.stddev.sum() << endl;
+    if (stats.stddev.sum() < 10){
+        return ConsoleTypeDetection::Switch2_Unknown;
+    }else{
+        return ConsoleTypeDetection::Switch1;
+    }
+}
+
+
+
+ConsoleTypeDetector_StartGameUserSelect::ConsoleTypeDetector_StartGameUserSelect(Color color)
+    : m_color(color)
+    , m_bottom_line(0.02, 0.53, 0.96, 0.03)
+{}
+void ConsoleTypeDetector_StartGameUserSelect::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_bottom_line);
+}
+ConsoleTypeDetection ConsoleTypeDetector_StartGameUserSelect::detect(const ImageViewRGB32& screen) const{
+    ImageStats stats = image_stats(extract_box_reference(screen, m_bottom_line));
+//    cout << "ConsoleTypeDetector: " << stats.stddev.sum() << endl;
     if (stats.stddev.sum() < 10){
         return ConsoleTypeDetection::Switch2_Unknown;
     }else{

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h

@@ -45,6 +45,18 @@ class ConsoleTypeDetector_Home{
     ImageFloatBox m_bottom_line;
 };
 
+class ConsoleTypeDetector_StartGameUserSelect{
+public:
+    ConsoleTypeDetector_StartGameUserSelect(Color color = COLOR_RED);
+
+    void make_overlays(VideoOverlaySet& items) const;
+    ConsoleTypeDetection detect(const ImageViewRGB32& screen) const;
+
+private:
+    Color m_color;
+    ImageFloatBox m_bottom_line;
+};
+
 
 
 

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.cpp

@@ -22,7 +22,7 @@
 #include "NintendoSwitch_DateReader.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
-#include "NintendoSwitch/Inference/NintendoSwitch_DetectHome.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.h"
 #include "NintendoSwitch/Programs/NintendoSwitch_Navigation.h"
 
 //#include <iostream>
@@ -556,7 +556,7 @@ void change_date(
     while (true){
         context.wait_for_all_requests();
 
-        HomeWatcher home;
+        HomeMenuWatcher home;
         DateChangeWatcher date_reader;
         int ret = wait_until(
             env.console, context, std::chrono::seconds(10),

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DetectHome.cpp

@@ -15,163 +15,13 @@
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 
-HomeDetector::HomeDetector()
-    : 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)
-    , m_bottom_right(0.83, 0.70, 0.15, 0.15)
-    , m_user_icons(0.05, 0.05, 0.2, 0.08)
-    , m_game_slot(0.08, 0.25, 0.10, 0.38)
-{}
-void HomeDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, m_bottom_row);
-    items.add(COLOR_RED, m_bottom_icons);
-    items.add(COLOR_RED, m_bottom_left);
-    items.add(COLOR_RED, m_bottom_right);
-    items.add(COLOR_RED, m_user_icons);
-    items.add(COLOR_RED, m_game_slot);
-}
-bool HomeDetector::detect(const ImageViewRGB32& screen) const{
-    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;
-//    cout << "stats_bottom_row.average.sum() = " << stats_bottom_row.average.sum() << endl;
-    if (stats_bottom_row.average.sum() < 200){
-        white = false;
-    }else if (stats_bottom_row.average.sum() > 500){
-        white = true;
-    }else{
-        return false;
-    }
-
-//    cout << "white: " << white << endl;
-
-    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){
-        return false;
-    }
-
-    ImageStats stats_bottom_left = image_stats(extract_box_reference(screen, m_bottom_left));
-    ImageStats stats_bottom_right = image_stats(extract_box_reference(screen, m_bottom_right));
-//    cout << stats_bottom_left.average << stats_bottom_left.stddev << endl;
-//    cout << stats_bottom_right.average << stats_bottom_right.stddev << endl;
-    if (white){
-        if (!is_white(stats_bottom_left) || !is_white(stats_bottom_right)){
-//            cout << "asdf" << endl;
-            return false;
-        }
-    }else{
-        if (!is_grey(stats_bottom_left, 0, 200) || !is_grey(stats_bottom_right, 0, 200)){
-//            cout << "qwer" << endl;
-            return false;
-        }
-    }
-
-//    cout << euclidean_distance(stats_bottom_row.average, stats_bottom_left.average) << endl;
-    if (euclidean_distance(stats_bottom_row.average, stats_bottom_left.average) > 20){
-//        cout << "qwer = " << euclidean_distance(stats_bottom_row.average, stats_bottom_left.average) << endl;
-        return false;
-    }
-//    cout << euclidean_distance(stats_bottom_row.average, stats_bottom_right.average) << endl;
-    if (euclidean_distance(stats_bottom_row.average, stats_bottom_right.average) > 20){
-//        cout << "asdf" << endl;
-        return false;
-    }
-//    cout << euclidean_distance(stats_bottom_left.average, stats_bottom_left.average) << endl;
-    if (euclidean_distance(stats_bottom_left.average, stats_bottom_right.average) > 20){
-//        cout << "zxcv" << endl;
-        return false;
-    }
-
-    ImageStats stats_user_icons = image_stats(extract_box_reference(screen, m_user_icons));
-//    cout << stats_user_icons.stddev << endl;
-    if (stats_user_icons.stddev.sum() < 40){
-        return false;
-    }
-    ImageStats stats_game_slot = image_stats(extract_box_reference(screen, m_game_slot));
-//    cout << stats_game_slot.stddev << endl;
-    if (stats_game_slot.stddev.sum() < 50){
-        return false;
-    }
-
-    return true;
-}
 
 
 
 
 
 
 
-StartGameUserSelectDetector::StartGameUserSelectDetector(Color color)
-    : m_color(color)
-    , m_bottom_row(0.10, 0.92, 0.10, 0.05)
-    , m_bottom_icons(0.70, 0.92, 0.28, 0.05)
-    , m_top_row(0.50, 0.47, 0.45, 0.05)
-    , m_mid_row(0.10, 0.55, 0.80, 0.02)
-    , m_user_slot(0.45, 0.55, 0.10, 0.35)
-{}
-void StartGameUserSelectDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_bottom_row);
-    items.add(m_color, m_bottom_icons);
-    items.add(m_color, m_top_row);
-    items.add(m_color, m_mid_row);
-    items.add(m_color, m_user_slot);
-}
-bool StartGameUserSelectDetector::detect(const ImageViewRGB32& screen) const{
-    ImageStats stats_bottom_row = image_stats(extract_box_reference(screen, m_bottom_row));
-//    cout << stats_bottom_row.average << stats_bottom_row.stddev << endl;
-    if (stats_bottom_row.stddev.sum() > 10){
-        return false;
-    }
-    bool white;
-    if (is_grey(stats_bottom_row, 50, 300)){
-        white = false;
-    }else if (stats_bottom_row.average.sum() > 500){
-        white = true;
-    }else{
-        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){
-        return false;
-    }
-
-    ImageStats stats_top_row = image_stats(extract_box_reference(screen, m_top_row));
-    ImageStats stats_mid_row = image_stats(extract_box_reference(screen, m_mid_row));
-//    cout << stats_top_row.average << stats_top_row.stddev << endl;
-    if (stats_top_row.stddev.sum() > 10 || stats_mid_row.stddev.sum() > 10){
-        return false;
-    }
-    if (white){
-        if (!is_white(stats_top_row) || !is_white(stats_mid_row)){
-            return false;
-        }
-    }else{
-        if (!is_grey(stats_top_row, 50, 300) || !is_grey(stats_mid_row, 50, 300)){
-            return false;
-        }
-    }
-
-    if (euclidean_distance(stats_bottom_row.average, stats_top_row.average) > 20){
-        return false;
-    }
-
-    ImageStats stats_user_slot = image_stats(extract_box_reference(screen, m_user_slot));
-//    cout << stats_user_slot.average << stats_user_slot.stddev << endl;
-    if (stats_user_slot.stddev.sum() < 50){
-        return false;
-    }
-
-    return true;
-}
-
-
-
-