Improve reliability of Y-COMM detector.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -335,7 +335,11 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 
 
     auto snapshot = feed.snapshot();
+    YCommMenuDetector detector(true);
+    detector.make_overlays(overlays);
+    cout << detector.detect(snapshot) << endl;
 
+#if 0
     SelectionArrowFinder arrow(overlay, {0.462377, 0.332039, 0.388222, 0.640777});
 
     cout << arrow.detect(snapshot) << endl;
@@ -344,6 +348,7 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     if (!arrows.empty()){
         cout << arrows[0].y << endl;
     }
+#endif
 
 //    WhiteDialogBoxDetector detector;
 //    detector.make_overlays(overlays);

SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.cpp

@@ -23,8 +23,7 @@ namespace PokemonSwSh{
 
 
 YCommMenuDetector::YCommMenuDetector(bool is_on)
-    : VisualInferenceCallback("YCommMenuDetector")
-    , m_is_on(is_on)
+    : m_is_on(is_on)
     , m_top(0.600, 0.020, 0.100, 0.040)
     , m_bottom(0.100, 0.970, 0.400, 0.020)
 {}
@@ -37,20 +36,16 @@ bool YCommMenuDetector::detect(const ImageViewRGB32& screen){
     ImageStats bottom = image_stats(extract_box_reference(screen, m_bottom));
 //    cout << bottom.average << bottom.stddev << endl;
     if (!is_black(bottom)){
-        return false;
+        return !m_is_on;
     }
 
     ImageStats top = image_stats(extract_box_reference(screen, m_top));
 //    cout << top.average << top.stddev << endl;
-    if (!is_solid(top, {0.0819777, 0.124031, 0.793991}, 0.25)){
-        return false;
+    if (!is_solid(top, {0.0819777, 0.124031, 0.793991}, 0.30)){
+        return !m_is_on;
     }
 
-    return true;
-}
-
-bool YCommMenuDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    return m_is_on ? detect(frame) : !detect(frame);
+    return m_is_on;
 }
 
 

SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h

@@ -20,20 +20,24 @@ namespace NintendoSwitch{
 namespace PokemonSwSh{
 
 
-class YCommMenuDetector : public VisualInferenceCallback{
+class YCommMenuDetector : public StaticScreenDetector{
 public:
     YCommMenuDetector(bool is_on);
 
-    bool detect(const ImageViewRGB32& screen);
-
     virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override final;
+    virtual bool detect(const ImageViewRGB32& screen) override;
 
 private:
     bool m_is_on;
     ImageFloatBox m_top;
     ImageFloatBox m_bottom;
 };
+class YCommMenuWatcher : public DetectorToFinder<YCommMenuDetector>{
+public:
+    YCommMenuWatcher(bool is_on)
+         : DetectorToFinder("YCommMenuWatcher", std::chrono::milliseconds(250), is_on)
+    {}
+};
 
 // Detect the blue Y letter as the Y Comm symbol in the lower left corner of the screen on the
 // overworld, when Y Comm is active.

SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_Internet.cpp

@@ -28,7 +28,7 @@ bool connect_to_internet_with_inference(
     bool ok = true;
 //    cout << "Waiting for Y-COMM to open..." << endl;
     for (size_t attempts = 0;;){
-        YCommMenuDetector detector(true);
+        YCommMenuWatcher detector(true);
         if (detector.detect(stream.video().snapshot())){
             stream.log("Y-COMM detected.");
             break;
@@ -69,7 +69,7 @@ bool connect_to_internet_with_inference(
 //    cout << "Waiting for Y-COMM to close..." << endl;
     //  Mash B until you leave Y-COMM.
     {
-        YCommMenuDetector detector(false);
+        YCommMenuWatcher detector(false);
         int result = run_until<ProControllerContext>(
             stream, context,
             [&](ProControllerContext& context){

SerialPrograms/Source/Tests/PokemonSwSh_Tests.cpp

@@ -39,7 +39,7 @@ std::vector<ImagePixelBox> find_selection_arrows(const ImageViewRGB32& image, si
 using namespace NintendoSwitch::PokemonSwSh;
 
 int test_pokemonSwSh_YCommMenuDetector(const ImageViewRGB32& image, bool target){
-    YCommMenuDetector detector(true);
+    YCommMenuWatcher detector(true);
 
     bool result = detector.process_frame(image, current_time());
     TEST_RESULT_EQUAL(result, target);