Fix date spam routines not detecting console type.

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

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -131,6 +131,8 @@
 #include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_24h.h"
 #include "CommonTools/Images/BinaryImage_FilterRgb32.h"
 #include "NintendoSwitch/Inference/NintendoSwitch2_BinarySliderDetector.h"
+#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "PokemonSwSh/PokemonSwSh_Settings.h"
 
 #include <QPixmap>
 #include <QVideoFrame>
@@ -289,6 +291,16 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 //    ImageRGB32 image1("menu-dark.png");
 //    ImageRGB32 image2("menu-jpn.png");
 
+
+    env.log("Touching date to prevent rollover.");
+    pbf_press_button(context, BUTTON_HOME, 160ms, PokemonSwSh::GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+    touch_date_from_home(console, context, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+    resume_game_no_interact(console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
+
+
+
+
+#if 0
     auto screenshot = feed.snapshot();
 
 
@@ -298,7 +310,7 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     for (auto& item : sliders){
         cout << item.first << " : " << item.second.min_y << endl;
     }
-
+#endif
 
 #if 0
     ImageFloatBox box(0.842007, 0.626446, 0.050186, 0.049587);

SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.cpp

@@ -5,16 +5,17 @@
  */
 
 #include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
+//#include "CommonFramework/Exceptions/OperationFailedException.h"
 //#include "CommonFramework/ImageTools/ImageStats.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
 //#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonTools/Async/InferenceRoutines.h"
+//#include "CommonTools/Async/InferenceRoutines.h"
 #include "Controllers/ControllerTypes.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
 #include "NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h"
-#include "NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+//#include "NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.h"
 //#include "NintendoSwitch/Inference/NintendoSwitch_SelectedSettingDetector.h"
 #include "NintendoSwitch_HomeToDateTime.h"
 
@@ -53,23 +54,7 @@ bool home_to_date_time_Switch1_feedback(ConsoleHandle& console, ProControllerCon
 
 //  Returns true if success. False if not supported.
 bool home_to_date_time_with_feedback(ConsoleHandle& console, ProControllerContext& context, bool to_date_change){
-    for (size_t attempts = 0;; attempts++){
-        HomeMenuWatcher home_menu(console, 100ms);
-        int ret = wait_until(
-            console, context, 5000ms,
-            {home_menu}
-        );
-        if (ret == 0){
-            break;
-        }
-        if (attempts == 2){
-            OperationFailedException::fire(
-                ErrorReport::SEND_ERROR_REPORT,
-                "Unable to find Switch Home",
-                console
-            );
-        }
-    }
+    wait_for_home(console, context);
 
     ConsoleTypeDetector_Home detector(console);
     ConsoleType console_type = detector.detect_only(console.video().snapshot());

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.cpp

@@ -31,6 +31,42 @@ namespace NintendoSwitch{
 
 
 
+
+
+
+void wait_for_home(ConsoleHandle& console, ProControllerContext& context){
+    //  Feedback not available. Just assume we're already on Home.
+    if (!console.video().snapshot()){
+        return;
+    }
+
+    for (size_t attempts = 0;; attempts++){
+        HomeMenuWatcher home_menu(console, 100ms);
+        int ret = wait_until(
+            console, context, 5000ms,
+            {home_menu}
+        );
+        if (ret == 0){
+            break;
+        }
+        if (attempts == 2){
+            OperationFailedException::fire(
+                ErrorReport::SEND_ERROR_REPORT,
+                "Unable to find Switch Home",
+                console
+            );
+        }
+    }
+}
+
+
+
+
+
+
+
+
+
 void resume_game_from_home(
     ConsoleHandle& console, ProControllerContext& context,
     bool skip_home_press

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.h

@@ -16,6 +16,10 @@ namespace PokemonAutomation{
 namespace NintendoSwitch{
 
 
+void wait_for_home(ConsoleHandle& console, ProControllerContext& context);
+
+
+
 void resume_game_from_home(
     ConsoleHandle& console, ProControllerContext& context,
     bool skip_home_press = false

SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.cpp

@@ -5,8 +5,10 @@
  */
 
 #include "ClientSource/Libraries/MessageConverter.h"
-#include "Controllers/ControllerTypes.h"
+//#include "CommonFramework/VideoPipeline/VideoFeed.h"
+//#include "Controllers/ControllerTypes.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+//#include "NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.h"
 #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h"
 #include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.h"
@@ -142,6 +144,8 @@ void touch_date_from_home(
     ConsoleHandle& console, ProControllerContext& context,
     Milliseconds settings_to_home_delay
 ){
+    wait_for_home(console, context);
+
     ConsoleType type = console.state().console_type();
 
     if (is_switch1(type)){
@@ -211,6 +215,8 @@ void rollback_hours_from_home(
     uint8_t hours,
     Milliseconds settings_to_home_delay
 ){
+    wait_for_home(console, context);
+
     ConsoleType type = console.state().console_type();
 
     if (is_switch1(type)){