Console state refactor.

Author: Mysticial

SerialPrograms/CMakeLists.txt

@@ -969,6 +969,7 @@ file(GLOB MAIN_SOURCES
     Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.h
     Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.cpp
     Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.h
+    Source/NintendoSwitch/NintendoSwitch_ConsoleState.h
     Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp
     Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h
     Source/NintendoSwitch/NintendoSwitch_Panels.cpp

SerialPrograms/Source/CommonTools/VisualDetector.h

@@ -19,7 +19,7 @@ class StaticScreenDetector{
 public:
     virtual ~StaticScreenDetector() = default;
     virtual void make_overlays(VideoOverlaySet& items) const = 0;
-    virtual bool detect(const ImageViewRGB32& screen) const = 0;
+    virtual bool detect(const ImageViewRGB32& screen) = 0;
 };
 
 

SerialPrograms/Source/CommonTools/VisualDetectors/BlackBorderDetector.cpp

@@ -31,7 +31,7 @@ void BlackBorderDetector::make_overlays(VideoOverlaySet& items) const{
     items.add(COLOR_RED, m_right);
 //        items.add(COLOR_RED, m_body);
 }
-bool BlackBorderDetector::detect(const ImageViewRGB32& screen) const{
+bool BlackBorderDetector::detect(const ImageViewRGB32& screen){
     const double MAX_SUM = 50;
     const double MAX_STDDEV = 20;
 

SerialPrograms/Source/CommonTools/VisualDetectors/BlackBorderDetector.h

@@ -18,7 +18,7 @@ class BlackBorderDetector : public StaticScreenDetector{
     BlackBorderDetector();
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
 
 private:
     ImageFloatBox m_top;

SerialPrograms/Source/CommonTools/VisualDetectors/BlackScreenDetector.cpp

@@ -32,7 +32,7 @@ BlackScreenDetector::BlackScreenDetector(
 void BlackScreenDetector::make_overlays(VideoOverlaySet& items) const{
     items.add(m_color, m_box);
 }
-bool BlackScreenDetector::detect(const ImageViewRGB32& screen) const{
+bool BlackScreenDetector::detect(const ImageViewRGB32& screen){
     return is_black(extract_box_reference(screen, m_box), m_max_rgb_sum, m_max_stddev_sum);
 }
 
@@ -51,7 +51,7 @@ WhiteScreenDetector::WhiteScreenDetector(
 void WhiteScreenDetector::make_overlays(VideoOverlaySet& items) const{
     items.add(m_color, m_box);
 }
-bool WhiteScreenDetector::detect(const ImageViewRGB32& screen) const{
+bool WhiteScreenDetector::detect(const ImageViewRGB32& screen){
     return is_white(extract_box_reference(screen, m_box), m_min_rgb_sum, m_max_stddev_sum);
 }
 

SerialPrograms/Source/CommonTools/VisualDetectors/BlackScreenDetector.h

@@ -30,7 +30,7 @@ class BlackScreenDetector : public StaticScreenDetector{
     );
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
 
 private:
     Color m_color;
@@ -48,7 +48,7 @@ class WhiteScreenDetector : public StaticScreenDetector{
     );
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
 
 private:
     Color m_color;

SerialPrograms/Source/CommonTools/VisualDetectors/ImageMatchDetector.cpp

@@ -67,7 +67,7 @@ double ImageMatchDetector::rmsd(const ImageViewRGB32& frame) const{
 void ImageMatchDetector::make_overlays(VideoOverlaySet& items) const{
     items.add(m_color, m_box);
 }
-bool ImageMatchDetector::detect(const ImageViewRGB32& screen) const{
+bool ImageMatchDetector::detect(const ImageViewRGB32& screen){
     return rmsd(screen) <= m_max_rmsd;
 }
 

SerialPrograms/Source/CommonTools/VisualDetectors/ImageMatchDetector.h

@@ -27,7 +27,7 @@ class ImageMatchDetector : public StaticScreenDetector{
     double rmsd(const ImageViewRGB32& frame) const;
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
 
 private:
     std::shared_ptr<const ImageRGB32> m_reference_image;

SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.cpp

@@ -23,7 +23,7 @@ namespace PokemonAutomation{
 namespace NintendoSwitch{
 
 
-void close_game(VideoStream& stream, ProControllerContext& context){
+void close_game(ConsoleHandle& console, ProControllerContext& context){
     //  Use mashing to ensure that the X press succeeds. If it fails, the SR
     //  will fail and can kill a den for the autohosts.
 
@@ -43,16 +43,16 @@ void close_game(VideoStream& stream, ProControllerContext& context){
 //    context.wait_for(10s);
 
     // send a second Home button press, if the first one is dropped
-    bool video_available = (bool)stream.video().snapshot();
+    bool video_available = (bool)console.video().snapshot();
     if (video_available){
         HomeMenuWatcher detector;
         int ret = wait_until(
-            stream, context,
+            console, context,
             std::chrono::milliseconds(5000),
             { detector }
         );
         if (ret == 0){
-            stream.log("Detected Home screen.");
+            console.log("Detected Home screen.");
         }else{  // if game initially open.  |  if game initially closed
             // initial Home button press was dropped
             // - Does nothing.          |  - goes back to home screen, from opened app
@@ -72,7 +72,7 @@ void close_game(VideoStream& stream, ProControllerContext& context){
     pbf_mash_button(context, BUTTON_B, 350);
 }
 
-void close_game(VideoStream& stream, JoyconContext& context){
+void close_game(ConsoleHandle& console, JoyconContext& context){
     //  Use mashing to ensure that the X press succeeds. If it fails, the SR
     //  will fail and can kill a den for the autohosts.
 
@@ -90,12 +90,12 @@ void close_game(VideoStream& stream, JoyconContext& context){
 
     HomeMenuWatcher detector;
     int ret = wait_until(
-        stream, context,
+        console, context,
         std::chrono::milliseconds(5000),
         { detector }
     );
     if (ret == 0){
-        stream.log("Detected Home screen.");
+        console.log("Detected Home screen.");
     }else{  // if game initially open.  |  if game initially closed
         // initial Home button press was dropped
         // - Does nothing.          |  - goes back to home screen, from opened app

SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.h

@@ -10,14 +10,15 @@
 #include "CommonFramework/Tools/VideoStream.h"
 #include "NintendoSwitch/Controllers/NintendoSwitch_ProController.h"
 #include "NintendoSwitch/Controllers/NintendoSwitch_Joycon.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 
 
-void close_game(VideoStream& stream, ProControllerContext& device);
+void close_game(ConsoleHandle& console, ProControllerContext& device);
 
-void close_game(VideoStream& stream, JoyconContext& device);
+void close_game(ConsoleHandle& console, JoyconContext& device);