Fix the FCE.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -325,6 +325,11 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     ProControllerContext context(scope, console.pro_controller());
     VideoOverlaySet overlays(overlay);
 
+
+    ssf_press_button(context, BUTTON_L, 0ms, 48ms, 24ms);
+    ssf_issue_scroll(context, DPAD_LEFT, 48ms, 48ms, 24ms);
+
+
 #if 0
     DateReader reader;
     reader.make_overlays(overlays);
@@ -357,7 +362,7 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 #endif
 
 
-#if 1
+#if 0
     DateReader reader(console);
     reader.make_overlays(overlays);
     DateTime date = reader.read_date(logger, feed.snapshot()).second;

SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.cpp

@@ -96,6 +96,10 @@ ConsoleSettings::ConsoleSettings()
         LockMode::LOCK_WHILE_RUNNING,
         false
     )
+    , SWITCH1_DIGIT_ENTRY(false)
+    , SWITCH1_KEYBOARD_ENTRY(false)
+    , SWITCH2_DIGIT_ENTRY(true)
+    , SWITCH2_KEYBOARD_ENTRY(true)
     , KEYBOARD_SECTION("<font size=4><b>Keyboard to Controller Mappings:</b></font>")
 {
     PA_ADD_OPTION(CONTROLLER_SETTINGS);
@@ -106,8 +110,10 @@ ConsoleSettings::ConsoleSettings()
     PA_ADD_OPTION(TOLERATE_SYSTEM_UPDATE_MENU_SLOW);
     PA_ADD_OPTION(TIMING_OPTIONS);
     if (PreloadSettings::instance().DEVELOPER_MODE){
-        PA_ADD_OPTION(DIGIT_ENTRY);
-        PA_ADD_OPTION(KEYBOARD_ENTRY);
+        PA_ADD_OPTION(SWITCH1_DIGIT_ENTRY);
+        PA_ADD_OPTION(SWITCH1_KEYBOARD_ENTRY);
+        PA_ADD_OPTION(SWITCH2_DIGIT_ENTRY);
+        PA_ADD_OPTION(SWITCH2_KEYBOARD_ENTRY);
     }
     PA_ADD_STATIC(KEYBOARD_SECTION);
     PA_ADD_OPTION(KEYBOARD_MAPPINGS);

SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.h

@@ -50,8 +50,10 @@ class ConsoleSettings : public BatchOption{
 
     TimingOptions TIMING_OPTIONS;
 
-    DigitEntryTimingsOption DIGIT_ENTRY;
-    KeyboardEntryTimingsOption KEYBOARD_ENTRY;
+    DigitEntryTimingsOption     SWITCH1_DIGIT_ENTRY;
+    KeyboardEntryTimingsOption  SWITCH1_KEYBOARD_ENTRY;
+    DigitEntryTimingsOption     SWITCH2_DIGIT_ENTRY;
+    KeyboardEntryTimingsOption  SWITCH2_KEYBOARD_ENTRY;
 
     SectionDividerOption KEYBOARD_SECTION;
     KeyboardMappingOption KEYBOARD_MAPPINGS;

SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.cpp

@@ -47,13 +47,15 @@ CodeEntrySkipPlusOption::CodeEntrySkipPlusOption()
 
 
 
-DigitEntryTimingsOption::DigitEntryTimingsOption()
+DigitEntryTimingsOption::DigitEntryTimingsOption(bool switch2)
     : GroupOption(
-        "Digit Entry Timings",
+        switch2
+            ? "Switch 2 Digit Entry Timings"
+            : "Switch 1 Digit Entry Timings",
         LockMode::UNLOCK_WHILE_RUNNING,
         GroupOption::EnableMode::ALWAYS_ENABLED, true
     )
-    , DIGIT_REORDERING(
+    , REORDERING(
         "<b>Digit Reordering:</b><br>Allow digits to be entered out of order.",
         LockMode::UNLOCK_WHILE_RUNNING,
         true
@@ -62,35 +64,69 @@ DigitEntryTimingsOption::DigitEntryTimingsOption()
         "<b>Time Unit:</b><br>Timesteps should increment in multiples of this unit.<br>"
         "<font color=\"red\">Controller timing variation will be added to this number.</font>",
         LockMode::UNLOCK_WHILE_RUNNING,
+        switch2
+            ? "48ms"
+            : PreloadSettings::instance().DEVELOPER_MODE ? "24 ms" : "40ms"
+    )
+    , HOLD(
+        "<b>Hold:</b><br>Duration to hold each button press down.<br>"
+        "<font color=\"red\">Controller timing variation will be added to this number.</font>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        PreloadSettings::instance().DEVELOPER_MODE ? "48 ms" : "80ms"
+    )
+    , COOLDOWN(
+        "<b>Hold:</b><br>Do not reuse a button until this long after it is reused.<br>"
+        "<font color=\"red\">Controller timing variation will be added to this number.</font>",
+        LockMode::UNLOCK_WHILE_RUNNING,
         PreloadSettings::instance().DEVELOPER_MODE ? "24 ms" : "40ms"
     )
 {
-    PA_ADD_OPTION(DIGIT_REORDERING);
+    PA_ADD_OPTION(REORDERING);
     PA_ADD_OPTION(TIME_UNIT);
+    PA_ADD_OPTION(HOLD);
+    PA_ADD_OPTION(COOLDOWN);
 }
 
 
 
-KeyboardEntryTimingsOption::KeyboardEntryTimingsOption()
+KeyboardEntryTimingsOption::KeyboardEntryTimingsOption(bool switch2)
     : GroupOption(
-        "Keyboard Entry Timings",
+        switch2
+            ? "Switch 2 Keyboard Entry Timings"
+            : "Switch 1 Keyboard Entry Timings",
         LockMode::UNLOCK_WHILE_RUNNING,
         GroupOption::EnableMode::ALWAYS_ENABLED, true
     )
-    , DIGIT_REORDERING(
-        "<b>Digit Reordering:</b><br>Allow digits to be entered out of order.",
+    , REORDERING(
+        "<b>Character Reordering:</b><br>Allow characters to be entered out of order.",
         LockMode::UNLOCK_WHILE_RUNNING,
         PreloadSettings::instance().DEVELOPER_MODE
     )
     , TIME_UNIT(
         "<b>Time Unit:</b><br>Timesteps should increment in multiples of this unit.<br>"
         "<font color=\"red\">Controller timing variation will be added to this number.</font>",
         LockMode::UNLOCK_WHILE_RUNNING,
+        switch2
+            ? "48ms"
+            : PreloadSettings::instance().DEVELOPER_MODE ? "24 ms" : "40ms"
+    )
+    , HOLD(
+        "<b>Hold:</b><br>Duration to hold each button press down.<br>"
+        "<font color=\"red\">Controller timing variation will be added to this number.</font>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        PreloadSettings::instance().DEVELOPER_MODE ? "48 ms" : "80ms"
+    )
+    , COOLDOWN(
+        "<b>Hold:</b><br>Do not reuse a button until this long after it is reused.<br>"
+        "<font color=\"red\">Controller timing variation will be added to this number.</font>",
+        LockMode::UNLOCK_WHILE_RUNNING,
         PreloadSettings::instance().DEVELOPER_MODE ? "24 ms" : "40ms"
     )
 {
-    PA_ADD_OPTION(DIGIT_REORDERING);
+    PA_ADD_OPTION(REORDERING);
     PA_ADD_OPTION(TIME_UNIT);
+    PA_ADD_OPTION(HOLD);
+    PA_ADD_OPTION(COOLDOWN);
 }
 
 

SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.h

@@ -38,20 +38,24 @@ class CodeEntrySkipPlusOption : public BooleanCheckBoxOption{
 
 class DigitEntryTimingsOption : public GroupOption{
 public:
-    DigitEntryTimingsOption();
+    DigitEntryTimingsOption(bool switch2);
 
 public:
-    BooleanCheckBoxOption DIGIT_REORDERING;
+    BooleanCheckBoxOption REORDERING;
     MillisecondsOption TIME_UNIT;
+    MillisecondsOption HOLD;
+    MillisecondsOption COOLDOWN;
 };
 
 class KeyboardEntryTimingsOption : public GroupOption{
 public:
-    KeyboardEntryTimingsOption();
+    KeyboardEntryTimingsOption(bool switch2);
 
 public:
-    BooleanCheckBoxOption DIGIT_REORDERING;
+    BooleanCheckBoxOption REORDERING;
     MillisecondsOption TIME_UNIT;
+    MillisecondsOption HOLD;
+    MillisecondsOption COOLDOWN;
 };
 
 

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.cpp

@@ -83,7 +83,7 @@ void FriendCodeAdder::program(SingleSwitchProgramEnvironment& env, ProController
         first = false;
 
         ssf_press_button_ptv(context, BUTTON_A, OPEN_CODE_PAD_DELAY0);
-        numberpad_enter_code(env.logger(), context, code, true);
+        numberpad_enter_code(env.console, context, code, true);
 
         pbf_wait(context, SEARCH_TIME0);
         ssf_press_button(context, BUTTON_A, TOGGLE_BEST_STATUS_DELAY0);

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_KeyboardCodeEntry.cpp

@@ -285,7 +285,7 @@ std::vector<std::vector<KeyboardEntryAction>> keyboard_get_all_paths(
 
 
 //  Given a path, optimize it and fully populate the delays.
-Milliseconds keyboard_populate_delays(
+void keyboard_populate_delays(
     std::vector<KeyboardEntryActionWithDelay>& path_with_delays,
     const std::vector<KeyboardEntryAction>& path,
     const KeyboardEntryDelays& delays,
@@ -313,32 +313,29 @@ Milliseconds keyboard_populate_delays(
     }
 
     //  Optimize
-    if (optimize){
-        for (size_t c = 1; c < path_with_delays.size(); c++){
-            //  Zero the delay for any L press.
-            KeyboardEntryActionWithDelay& current = path_with_delays[c];
-            if (current.action == KeyboardEntryAction::SCROLL_LEFT){
-                current.delay = 0ms;
-                continue;
-            }
 
-            //  Zero the delay for any scroll immediately preceding an A press.
-            KeyboardEntryActionWithDelay& previous = path_with_delays[c - 1];
-            if (current.action == KeyboardEntryAction::ENTER_CHAR &&
-                previous.action != KeyboardEntryAction::ENTER_CHAR &&
-                previous.action != KeyboardEntryAction::SCROLL_LEFT
-            ){
-                previous.delay = 0ms;
-            }
-        }
+    if (!optimize || path_with_delays.empty()){
+        return;
     }
 
-    Milliseconds total = 0ms;
-    for (KeyboardEntryActionWithDelay& action : path_with_delays){
-        total += action.delay;
-    }
+    //  These only work on the Switch 1.
+    for (size_t c = 1; c < path_with_delays.size(); c++){
+        //  Zero the delay for any L press.
+        KeyboardEntryActionWithDelay& current = path_with_delays[c];
+        if (current.action == KeyboardEntryAction::SCROLL_LEFT){
+            current.delay = 0ms;
+            continue;
+        }
 
-    return total;
+        //  Zero the delay for any scroll immediately preceding an A press.
+        KeyboardEntryActionWithDelay& previous = path_with_delays[c - 1];
+        if (current.action == KeyboardEntryAction::ENTER_CHAR &&
+            previous.action != KeyboardEntryAction::ENTER_CHAR &&
+            previous.action != KeyboardEntryAction::SCROLL_LEFT
+        ){
+            previous.delay = 0ms;
+        }
+    }
 }
 
 
@@ -353,7 +350,11 @@ std::vector<KeyboardEntryActionWithDelay> keyboard_get_best_path(
     Milliseconds best_time = Milliseconds::max();
     for (const std::vector<KeyboardEntryAction>& path : paths){
         std::vector<KeyboardEntryActionWithDelay> current_path;
-        Milliseconds current_time = keyboard_populate_delays(current_path, path, delays, optimize);
+        keyboard_populate_delays(current_path, path, delays, optimize);
+        Milliseconds current_time = 0ms;
+        for (KeyboardEntryActionWithDelay& action : current_path){
+            current_time += action.delay;
+        }
         if (best_time > current_time){
             best_time = current_time;
             best_path = std::move(current_path);
@@ -391,7 +392,7 @@ void keyboard_execute_path(
 
 
 void keyboard_enter_code(
-    Logger& logger, ProControllerContext& context,
+    ConsoleHandle& console, ProControllerContext& context,
     KeyboardLayout keyboard_layout, const std::string& code,
     bool include_plus
 ){
@@ -413,23 +414,52 @@ void keyboard_enter_code(
         auto iter = POSITION_MAP.find(ch);
         if (iter == POSITION_MAP.end()){
             throw_and_log<OperationFailedException>(
-                logger, ErrorReport::NO_ERROR_REPORT,
+                console, ErrorReport::NO_ERROR_REPORT,
                 "Invalid code character."
             );
         }
         positions.emplace_back(iter->second);
     }
 
 
+    ConsoleType console_type = console.state().console_type();
+    bool switch2;
+    if (console_type == ConsoleType::Switch1){
+        switch2 = false;
+    }else if (is_switch2(console_type)){
+        switch2 = true;
+    }else{
+        throw UserSetupError(
+            console,
+            "Please select a valid Switch console type."
+        );
+    }
+
+
     //  Compute the delays.
 
-    Milliseconds unit = ConsoleSettings::instance().KEYBOARD_ENTRY.TIME_UNIT;
+    Milliseconds unit;
+    Milliseconds hold;
+    Milliseconds cool;
+    bool reordering;
+    if (switch2){
+        unit        = ConsoleSettings::instance().SWITCH2_KEYBOARD_ENTRY.TIME_UNIT;
+        hold        = ConsoleSettings::instance().SWITCH2_KEYBOARD_ENTRY.HOLD;
+        cool        = ConsoleSettings::instance().SWITCH2_KEYBOARD_ENTRY.COOLDOWN;
+        reordering  = ConsoleSettings::instance().SWITCH2_KEYBOARD_ENTRY.REORDERING;
+    }else{
+        unit        = ConsoleSettings::instance().SWITCH1_KEYBOARD_ENTRY.TIME_UNIT;
+        hold        = ConsoleSettings::instance().SWITCH1_KEYBOARD_ENTRY.HOLD;
+        cool        = ConsoleSettings::instance().SWITCH1_KEYBOARD_ENTRY.COOLDOWN;
+        reordering  = ConsoleSettings::instance().SWITCH1_KEYBOARD_ENTRY.REORDERING;
+    }
+
     Milliseconds tv = context->timing_variation();
     unit += tv;
 
     KeyboardEntryDelays delays{
-        .hold = 2*unit,
-        .cool = unit,
+        .hold = hold,
+        .cool = cool,
         .press_delay = unit,
         .move_delay = unit,
         .wrap_delay = 2*unit,
@@ -439,14 +469,14 @@ void keyboard_enter_code(
     std::vector<std::vector<KeyboardEntryAction>> all_paths = keyboard_get_all_paths(
         {0, 0},
         positions.data(), positions.size(),
-        ConsoleSettings::instance().KEYBOARD_ENTRY.DIGIT_REORDERING
+        reordering
     );
 
     //  Pick the best path.
     std::vector<KeyboardEntryActionWithDelay> best_path = keyboard_get_best_path(
         all_paths,
         delays,
-        context->atomic_multibutton()
+        !switch2 && context->atomic_multibutton()
     );
 
     keyboard_execute_path(context, delays, best_path);

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_KeyboardCodeEntry.h

@@ -10,6 +10,7 @@
 #include <string>
 #include "NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.h"
 #include "NintendoSwitch/Controllers/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
 
 namespace PokemonAutomation{
     class Logger;
@@ -18,7 +19,7 @@ namespace NintendoSwitch{
 
 
 void keyboard_enter_code(
-    Logger& logger, ProControllerContext& context,
+    ConsoleHandle& console, ProControllerContext& context,
     KeyboardLayout keyboard_layout, const std::string& code,
     bool include_plus
 );