detect console type from in game

Author: jw098

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.cpp

@@ -7,6 +7,9 @@
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
 #include "CommonFramework/ImageTools/ImageStats.h"
 #include "NintendoSwitch_ConsoleTypeDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
 
 //#include <iostream>
 //using std::cout;
@@ -83,6 +86,17 @@ void ConsoleTypeDetector_StartGameUserSelect::commit_to_cache(){
     m_console.state().set_console_type(m_console, m_last);
 }
 
+ConsoleType detect_console_type_from_in_game(ConsoleHandle& console, ProControllerContext& context){
+    go_home(console, context);
+    
+    ConsoleTypeDetector_Home detector(console);
+    ConsoleType console_type = detector.detect_only(console.video().snapshot());
+    detector.commit_to_cache();
+
+    resume_game_from_home(console, context);
+    
+    return console_type;
+}
 
 
 

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h

@@ -49,7 +49,7 @@ class ConsoleTypeDetector_StartGameUserSelect{
     ConsoleType m_last;
 };
 
-
+ConsoleType detect_console_type_from_in_game(ConsoleHandle& console, ProControllerContext& context);
 
 
 

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

@@ -10,6 +10,7 @@
 #include "NintendoSwitch/NintendoSwitch_Settings.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
 #include "NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h"
 #include "NintendoSwitch_CodeEntryTools.h"
 #include "NintendoSwitch_KeyboardCodeEntry.h"
 
@@ -285,6 +286,11 @@ void keyboard_enter_code(
 
 
     ConsoleType console_type = console.state().console_type();
+            
+    if (console_type == ConsoleType::Unknown){
+        console.log("Unknown Switch type. Try to detect.");
+        console_type = detect_console_type_from_in_game(console, context);
+    }
     bool switch2;
     if (is_switch1(console_type)){
         switch2 = false;

SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_ClaimMysteryGift.cpp

@@ -114,9 +114,11 @@ void ClaimMysteryGift::on_config_value_changed(void* object){
 }
 
 void ClaimMysteryGift::enter_mystery_gift_code(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    env.log("Enter mystery gift code.");
+
     std::string normalized_code;
     bool force_keyboard_mode = true;
-    bool connect_controller_press = true;
+    bool connect_controller_press = false;
     normalize_code(normalized_code, CODE, force_keyboard_mode);
 
     const FastCodeEntrySettings& settings = SETTINGS;
@@ -140,6 +142,7 @@ void ClaimMysteryGift::claim_mystery_gift(SingleSwitchProgramEnvironment& env, P
     pbf_press_button(context, BUTTON_A, 20, 4 * TICKS_PER_SECOND);
     pbf_press_button(context, BUTTON_A, 20, 10 * TICKS_PER_SECOND);
     clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 10);  
+
     enter_mystery_gift_code(env, context);
 }