Update FCEs to check console type early.

Author: Mysticial

Common/PokemonSwSh/PokemonSwSh_Protocol_DaySkippers.h

@@ -231,7 +231,6 @@ file(GLOB MAIN_SOURCES
     ../Common/PokemonSwSh/PokemonSwSh_FossilTable.h
     ../Common/PokemonSwSh/PokemonSwSh_MultiHostTable.cpp
     ../Common/PokemonSwSh/PokemonSwSh_MultiHostTable.h
-    ../Common/PokemonSwSh/PokemonSwSh_Protocol_DaySkippers.h
     ../Common/Qt/AutoHeightTable.cpp
     ../Common/Qt/AutoHeightTable.h
     ../Common/Qt/AutoWidthLineEdit.cpp

SerialPrograms/CMakeLists.txt

@@ -26,7 +26,7 @@ namespace PokemonAutomation{
 const bool IS_BETA_VERSION = true;
 const int PROGRAM_VERSION_MAJOR = 0;
 const int PROGRAM_VERSION_MINOR = 56;
-const int PROGRAM_VERSION_PATCH = 5;
+const int PROGRAM_VERSION_PATCH = 6;
 
 const std::string PROGRAM_VERSION_BASE =
     "v" + std::to_string(PROGRAM_VERSION_MAJOR) +

SerialPrograms/Source/CommonFramework/Globals.cpp

@@ -142,6 +142,7 @@
 #include "PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.h"
 #include "PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.h"
 #include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Async/InterruptableCommands.h"
 
 
 #include <QPixmap>
@@ -241,6 +242,9 @@ void TestProgram::on_press(){
 
 
 
+
+
+
 void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
     using namespace Kernels;
     using namespace Kernels::Waterfill;
@@ -260,16 +264,55 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     ProControllerContext context(scope, console.pro_controller());
     VideoOverlaySet overlays(overlay);
 
+    AsyncCommandSession<ProController> session(
+        scope, logger, env.realtime_dispatcher(),
+        console.pro_controller()
+    );
+
+    Milliseconds delay = 500ms;
+
+    for (int c = 0; c < 100; c++){
+        session.dispatch([](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_A, 360000ms);
+        });
+
+        delay = 552ms;
+
+        cout << "delay = " << delay.count() << endl;
+
+        context.wait_for(delay);
+
+        session.stop_command();
+
+        pbf_press_button(context, BUTTON_B, 5000ms, 800ms);
+        context.wait_for_all_requests();
+
+        delay += 1ms;
+    }
+
 
 
+
+
+#if 0
     auto screenshot = feed.snapshot();
 
+
+
+    PokemonSV::OverworldDetector detector;
+    detector.make_overlays(overlays);
+    cout << detector.detect(screenshot) << endl;
+#endif
+
+
+
+#if 0
     TeraCardReader detector;
     detector.make_overlays(overlays);
 
     cout << detector.detect(screenshot) << endl;
     detector.pokemon_slug(logger, env.program_info(), screenshot);
-
+#endif
 
 #if 0
     NewsDetector detector;

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -87,6 +87,10 @@ void ConsoleTypeDetector_StartGameUserSelect::commit_to_cache(){
 }
 
 ConsoleType detect_console_type_from_in_game(ConsoleHandle& console, ProControllerContext& context){
+    if (console.state().console_type_confirmed()){
+        return console.state().console_type();
+    }
+    console.log("Unknown Switch type. Try to detect.", COLOR_ORANGE);
     go_home(console, context);  //  Automatically detects console type as well.
     resume_game_from_home(console, context);
     return console.state().console_type();

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.cpp

@@ -88,7 +88,7 @@ bool HomeMenuDetector::detect_only(const ImageViewRGB32& screen){
 
     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){
+    if (stats_bottom_icons.stddev.sum() < 10){
         return false;
     }
 

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.cpp

@@ -287,11 +287,7 @@ void keyboard_enter_code(
     }
 
 
-    ConsoleType console_type = console.state().console_type();
-    if (console_type == ConsoleType::Unknown){
-        console.log("Unknown Switch type. Try to detect.", COLOR_ORANGE);
-        console_type = detect_console_type_from_in_game(console, context);
-    }
+    ConsoleType console_type = detect_console_type_from_in_game(console, context);
     bool switch2;
     if (is_switch1(console_type)){
         switch2 = false;

SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardCodeEntry.cpp

@@ -195,11 +195,7 @@ void numberpad_enter_code(
     }
 
 
-    ConsoleType console_type = console.state().console_type();
-    if (console_type == ConsoleType::Unknown){
-        console.log("Unknown Switch type. Try to detect.", COLOR_ORANGE);
-        console_type = detect_console_type_from_in_game(console, context);
-    }
+    ConsoleType console_type = detect_console_type_from_in_game(console, context);
     bool switch2;
     if (is_switch1(console_type)){
         switch2 = false;

SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.cpp

@@ -9,10 +9,15 @@
 //#include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/CancellableScope.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "PokemonSV_CodeEntry.h"
 #include "PokemonSV_ClipboardFastCodeEntry.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonSV{
@@ -46,8 +51,10 @@ void ClipboardFastCodeEntry::program(MultiSwitchProgramEnvironment& env, Cancell
     //  Connect the controller.
     env.run_in_parallel(scope, [&](ConsoleHandle& console, ProControllerContext& context){
         pbf_press_button(context, BUTTON_R | BUTTON_L, 5, 3);
+        detect_console_type_from_in_game(console, context);
     });
 
+
     QClipboard* clipboard = QApplication::clipboard();
 #if 0
     std::atomic<bool> cleared(false);
@@ -66,6 +73,7 @@ void ClipboardFastCodeEntry::program(MultiSwitchProgramEnvironment& env, Cancell
 
     while (true){
         std::string code = clipboard->text().toStdString();
+//        cout << code << endl;
         if (code != start_text && !code.empty()){
             const char* error = enter_code(env, scope, SETTINGS, code, false, false);
             if (error == nullptr){

SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.cpp

@@ -4,12 +4,12 @@
  *
  */
 
-#include <map>
 #include <mutex>
 #include <condition_variable>
 #include "Common/Cpp/Exceptions.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+//#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "PokemonSV_CodeEntry.h"
 #include "PokemonSV_FastCodeEntry.h"
@@ -143,6 +143,7 @@ void FastCodeEntry::program(MultiSwitchProgramEnvironment& env, CancellableScope
     //  Connect the controller.
     env.run_in_parallel(scope, [&](ConsoleHandle& console, ProControllerContext& context){
         ssf_press_button_ptv(context, BUTTON_R | BUTTON_L);
+        detect_console_type_from_in_game(console, context);
     });
 
     FceCodeListener listener(CODE);