Migrate Switch options to TimeDurationOption.

Author: Mysticial

SerialPrograms/Source/CommonFramework/Globals.cpp

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

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FastCodeEntry.cpp

@@ -51,28 +51,24 @@ FastCodeEntrySettingsOption::FastCodeEntrySettingsOption(LockMode lock_while_pro
         LockMode::UNLOCK_WHILE_RUNNING,
         PreloadSettings::instance().DEVELOPER_MODE
     )
-    , SCROLL_DELAY(
+    , SCROLL_DELAY0(
         "<b>Scroll Delay:</b><br>Delay to scroll between adjacent keys.",
         LockMode::UNLOCK_WHILE_RUNNING,
-        TICKS_PER_SECOND,
-        3, 15,
-        PreloadSettings::instance().DEVELOPER_MODE ? "5" : "6"
+        PreloadSettings::instance().DEVELOPER_MODE ? "40 ms" : "48 ms"
     )
-    , WRAP_DELAY(
+    , WRAP_DELAY0(
         "<b>Wrap Delay:</b><br>Delay to wrap between left/right edges.",
         LockMode::UNLOCK_WHILE_RUNNING,
-        TICKS_PER_SECOND,
-        3, 15,
-        "6"
+        "48 ms"
     )
 {
     PA_ADD_OPTION(KEYBOARD_LAYOUT);
     PA_ADD_OPTION(SKIP_PLUS);
     if (PreloadSettings::instance().DEVELOPER_MODE){
         PA_ADD_OPTION(m_advanced_options);
         PA_ADD_OPTION(DIGIT_REORDERING);
-        PA_ADD_OPTION(SCROLL_DELAY);
-        PA_ADD_OPTION(WRAP_DELAY);
+        PA_ADD_OPTION(SCROLL_DELAY0);
+        PA_ADD_OPTION(WRAP_DELAY0);
     }
 }
 
@@ -168,7 +164,8 @@ const std::map<char, CodeboardPosition>& CODEBOARD_POSITIONS_AZERTY(){
 
 DigitPath get_codeboard_digit_path(
     CodeboardPosition source, CodeboardPosition destination,
-    uint8_t scroll_delay, uint8_t wrap_delay
+    Milliseconds scroll_delay,
+    Milliseconds wrap_delay
 ){
 //    cout << (size_t)scroll_delay << ", " << (size_t)wrap_delay << endl;
     DigitPath path;
@@ -215,7 +212,7 @@ DigitPath get_codeboard_digit_path(
             }
         }
 
-        uint8_t delay = scroll_delay;
+        Milliseconds delay = scroll_delay;
         if (col == (uint8_t)-1){
             col = 11;
             delay = wrap_delay;
@@ -236,21 +233,21 @@ DigitPath get_codeboard_digit_path(
 
     return path;
 }
-size_t get_codeboard_path_cost(const DigitPath& path){
-    size_t total_cost = 0;
+Milliseconds get_codeboard_path_cost(const DigitPath& path){
+    Milliseconds total_cost = 0ms;
     for (uint8_t c = 0; c < path.length; c++){
         total_cost += path.path[c].delay;
     }
     return total_cost;
 }
-size_t get_codeboard_path_cost(const std::vector<DigitPath>& path){
-    size_t total_cost = 0;
+Milliseconds get_codeboard_path_cost(const std::vector<DigitPath>& path){
+    Milliseconds total_cost = 0ms;
     for (const DigitPath& digit : path){
-        size_t cost = get_codeboard_path_cost(digit);
+        Milliseconds cost = get_codeboard_path_cost(digit);
         if (digit.left_cursor){
             cost++;
         }
-        cost = std::max<size_t>(cost, 8);
+        cost = std::max<Milliseconds>(cost, 64ms);
         total_cost += cost;
     }
     return total_cost;
@@ -260,7 +257,9 @@ std::vector<DigitPath> get_codeboard_path(
     KeyboardLayout keyboard_layout,
     const std::vector<CodeboardPosition>& positions, size_t s, size_t e,
     CodeboardPosition start,
-    uint8_t scroll_delay, uint8_t wrap_delay, bool reordering
+    Milliseconds scroll_delay,
+    Milliseconds wrap_delay,
+    bool reordering
 ){
     if (e - s == 1){
         return {get_codeboard_digit_path(start, positions[s], scroll_delay, wrap_delay)};
@@ -305,7 +304,9 @@ std::vector<DigitPath> get_codeboard_path(
 std::vector<DigitPath> get_codeboard_path(
     Logger& logger,
     KeyboardLayout keyboard_layout, const std::string& code,
-    uint8_t scroll_delay, uint8_t wrap_delay, bool reordering,
+    Milliseconds scroll_delay,
+    Milliseconds wrap_delay,
+    bool reordering,
     CodeboardPosition start = {0, 0}
 ){
     auto get_keyboard_layout = [](KeyboardLayout keyboard_layout){
@@ -334,28 +335,30 @@ std::vector<DigitPath> get_codeboard_path(
         keyboard_layout,
         positions, 0, positions.size(),
         start,
-        scroll_delay, wrap_delay, reordering
+        scroll_delay,
+        wrap_delay,
+        reordering
     );
 }
 
 
 void move_codeboard(SwitchControllerContext& context, const DigitPath& path){
-    uint16_t delay = 3;
+    Milliseconds delay = 24ms;
     if (path.length > 0){
         size_t last = (size_t)path.length - 1;
         for (size_t c = 0; c < last; c++){
             ssf_issue_scroll(
                 context,
                 path.path[c].direction,
                 path.path[c].delay,
-                6
+                48ms
             );
         }
         ssf_issue_scroll(
             context,
             path.path[last].direction,
-            0,
-            6
+            0ms,
+            48ms
         );
         delay = path.path[last].delay;
     }
@@ -376,8 +379,8 @@ void run_codeboard_path(SwitchControllerContext& context, const std::vector<Digi
 FastCodeEntrySettings::FastCodeEntrySettings(const FastCodeEntrySettingsOption& option)
     : keyboard_layout(option.KEYBOARD_LAYOUT)
     , include_plus(!option.SKIP_PLUS)
-    , scroll_delay(option.SCROLL_DELAY)
-    , wrap_delay(option.WRAP_DELAY)
+    , scroll_delay(option.SCROLL_DELAY0)
+    , wrap_delay(option.WRAP_DELAY0)
     , digit_reordering(option.DIGIT_REORDERING)
 {}
 

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FastCodeEntry.h

@@ -12,7 +12,7 @@
 #include "Common/Cpp/Options/GroupOption.h"
 #include "Common/Cpp/Options/StaticTextOption.h"
 #include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "Common/Cpp/Options/EnumDropdownOption.h"
 #include "NintendoSwitch/Controllers/NintendoSwitch_Controller.h"
 
@@ -21,6 +21,9 @@ namespace PokemonAutomation{
 namespace NintendoSwitch{
 
 
+using namespace std::chrono_literals;
+
+
 
 enum class KeyboardLayout{
     QWERTY,
@@ -37,8 +40,8 @@ class FastCodeEntrySettingsOption : public GroupOption{
 
     SectionDividerOption m_advanced_options;
     BooleanCheckBoxOption DIGIT_REORDERING;
-    TimeExpressionOption<uint8_t> SCROLL_DELAY;
-    TimeExpressionOption<uint8_t> WRAP_DELAY;
+    MillisecondsOption SCROLL_DELAY0;
+    MillisecondsOption WRAP_DELAY0;
 };
 
 
@@ -52,7 +55,7 @@ struct CodeboardPosition{
 };
 struct CodeboardScroll{
     DpadPosition direction;
-    uint8_t delay;
+    Milliseconds delay;
 };
 //static_assert(sizeof(CodeboardScroll) == sizeof(uint8_t));
 struct DigitPath{
@@ -73,8 +76,8 @@ void move_codeboard(SwitchControllerContext& context, const DigitPath& path);
 struct FastCodeEntrySettings{
     KeyboardLayout keyboard_layout = KeyboardLayout::QWERTY;
     bool include_plus = true;
-    uint8_t scroll_delay = 8;
-    uint8_t wrap_delay = 8;
+    Milliseconds scroll_delay = 64ms;
+    Milliseconds wrap_delay = 64ms;
     bool digit_reordering = false;
 
     FastCodeEntrySettings() = default;

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.cpp

@@ -44,31 +44,28 @@ FriendCodeAdder::FriendCodeAdder()
     , m_advanced_options(
         "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
     )
-    , OPEN_CODE_PAD_DELAY(
+    , OPEN_CODE_PAD_DELAY0(
         "<b>Open Code Pad Delay</b>",
         LockMode::LOCK_WHILE_RUNNING,
-        TICKS_PER_SECOND,
-        "1 * TICKS_PER_SECOND"
+        "1000 ms"
     )
-    , SEARCH_TIME(
+    , SEARCH_TIME0(
         "<b>Search Time:</b><br>Wait this long after initiating search.",
         LockMode::LOCK_WHILE_RUNNING,
-        TICKS_PER_SECOND,
-        "3 * TICKS_PER_SECOND"
+        "3000 ms"
     )
-    , TOGGLE_BEST_STATUS_DELAY(
+    , TOGGLE_BEST_STATUS_DELAY0(
         "<b>Toggle Best Delay:</b><br>Time needed to toggle the best friend status.",
         LockMode::LOCK_WHILE_RUNNING,
-        TICKS_PER_SECOND,
-        "1 * TICKS_PER_SECOND"
+        "1000 ms"
     )
 {
     PA_ADD_OPTION(USER_SLOT);
     PA_ADD_OPTION(FRIEND_CODES);
     PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(OPEN_CODE_PAD_DELAY);
-    PA_ADD_OPTION(SEARCH_TIME);
-    PA_ADD_OPTION(TOGGLE_BEST_STATUS_DELAY);
+    PA_ADD_OPTION(OPEN_CODE_PAD_DELAY0);
+    PA_ADD_OPTION(SEARCH_TIME0);
+    PA_ADD_OPTION(TOGGLE_BEST_STATUS_DELAY0);
 }
 
 void FriendCodeAdder::program(SingleSwitchProgramEnvironment& env, SwitchControllerContext& context){
@@ -84,12 +81,12 @@ void FriendCodeAdder::program(SingleSwitchProgramEnvironment& env, SwitchControl
         PokemonSwSh::home_to_add_friends(context, USER_SLOT - 1, 3, first);
         first = false;
 
-        ssf_press_button1(context, BUTTON_A, OPEN_CODE_PAD_DELAY);
+        ssf_press_button(context, BUTTON_A, OPEN_CODE_PAD_DELAY0);
         enter_digits(context, 12, &code[0]);
 
-        pbf_wait(context, SEARCH_TIME);
-        ssf_press_button1(context, BUTTON_A, TOGGLE_BEST_STATUS_DELAY);
-        ssf_press_button1(context, BUTTON_A, TOGGLE_BEST_STATUS_DELAY);
+        pbf_wait(context, SEARCH_TIME0);
+        ssf_press_button(context, BUTTON_A, TOGGLE_BEST_STATUS_DELAY0);
+        ssf_press_button(context, BUTTON_A, TOGGLE_BEST_STATUS_DELAY0);
         pbf_press_button(context, BUTTON_HOME, 80ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
     }
 }

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.h

@@ -9,7 +9,7 @@
 
 #include "Common/Cpp/Options/StaticTextOption.h"
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "NintendoSwitch/Options/NintendoSwitch_FriendCodeListOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 
@@ -33,9 +33,9 @@ class FriendCodeAdder : public SingleSwitchProgramInstance{
     SimpleIntegerOption<uint8_t> USER_SLOT;
     FriendCodeListOption FRIEND_CODES;
     SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> OPEN_CODE_PAD_DELAY;
-    TimeExpressionOption<uint16_t> SEARCH_TIME;
-    TimeExpressionOption<uint16_t> TOGGLE_BEST_STATUS_DELAY;
+    MillisecondsOption OPEN_CODE_PAD_DELAY0;
+    MillisecondsOption SEARCH_TIME0;
+    MillisecondsOption TOGGLE_BEST_STATUS_DELAY0;
 };
 
 

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendDelete.cpp

@@ -36,47 +36,44 @@ FriendDelete::FriendDelete()
         LockMode::LOCK_WHILE_RUNNING,
         false
     )
-    , VIEW_FRIEND_DELAY(
+    , VIEW_FRIEND_DELAY0(
         "<b>View Friend Delay:</b><br>Delay from opening a friend to when you can press buttons.",
         LockMode::LOCK_WHILE_RUNNING,
-        TICKS_PER_SECOND,
-        "2 * TICKS_PER_SECOND"
+        "2000 ms"
     )
-    , DELETE_FRIEND_DELAY(
+    , DELETE_FRIEND_DELAY0(
         "<b>Delete Friend Delay:</b><br>Delay to delete the friend.",
         LockMode::LOCK_WHILE_RUNNING,
-        TICKS_PER_SECOND,
-        "8 * TICKS_PER_SECOND"
+        "8000 ms"
     )
-    , FINISH_DELETE_DELAY(
+    , FINISH_DELETE_DELAY0(
         "<b>Finish Delete Delay:</b><br>Delay after deleting a friend.",
         LockMode::LOCK_WHILE_RUNNING,
-        TICKS_PER_SECOND,
-        "2 * TICKS_PER_SECOND"
+        "2000 ms"
     )
 {
     PA_ADD_OPTION(FRIENDS_TO_DELETE);
     PA_ADD_OPTION(BLOCK_FRIENDS);
-    PA_ADD_OPTION(VIEW_FRIEND_DELAY);
-    PA_ADD_OPTION(DELETE_FRIEND_DELAY);
-    PA_ADD_OPTION(FINISH_DELETE_DELAY);
+    PA_ADD_OPTION(VIEW_FRIEND_DELAY0);
+    PA_ADD_OPTION(DELETE_FRIEND_DELAY0);
+    PA_ADD_OPTION(FINISH_DELETE_DELAY0);
 }
 void FriendDelete::program(SingleSwitchProgramEnvironment& env, SwitchControllerContext& context){
     pbf_press_button(context, BUTTON_A, 5, 5);
 
     for (uint16_t c = 0; c < FRIENDS_TO_DELETE; c++){
-        pbf_press_button(context, BUTTON_A, 5, VIEW_FRIEND_DELAY);      //  View friend
+        pbf_press_button(context, BUTTON_A, 40ms, VIEW_FRIEND_DELAY0);      //  View friend
         pbf_press_dpad(context, DPAD_DOWN, 5, 5);
-        pbf_press_button(context, BUTTON_A, 10, 90);                    //  Click on Options
+        pbf_press_button(context, BUTTON_A, 10, 90);                        //  Click on Options
         if (BLOCK_FRIENDS){
             pbf_press_dpad(context, DPAD_DOWN, 5, 5);
         }
-        pbf_press_button(context, BUTTON_A, 10, 90);                    //  Click on Remove/Block Friend
+        pbf_press_button(context, BUTTON_A, 10, 90);                        //  Click on Remove/Block Friend
         if (BLOCK_FRIENDS){
-            pbf_press_button(context, BUTTON_A, 5, VIEW_FRIEND_DELAY);  //  Confirm
+            pbf_press_button(context, BUTTON_A, 40ms, VIEW_FRIEND_DELAY0);  //  Confirm
         }
-        pbf_press_button(context, BUTTON_A, 5, DELETE_FRIEND_DELAY);    //  Confirm
-        pbf_press_button(context, BUTTON_A, 5, FINISH_DELETE_DELAY);    //  Finish delete friend.
+        pbf_press_button(context, BUTTON_A, 40ms, DELETE_FRIEND_DELAY0);    //  Confirm
+        pbf_press_button(context, BUTTON_A, 40ms, FINISH_DELETE_DELAY0);    //  Finish delete friend.
     }
 }
 

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendDelete.h

@@ -9,7 +9,7 @@
 
 #include "Common/Cpp/Options/BooleanCheckBoxOption.h"
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 
 namespace PokemonAutomation{
@@ -31,9 +31,9 @@ class FriendDelete : public SingleSwitchProgramInstance{
 private:
     SimpleIntegerOption<uint16_t> FRIENDS_TO_DELETE;
     BooleanCheckBoxOption BLOCK_FRIENDS;
-    TimeExpressionOption<uint16_t> VIEW_FRIEND_DELAY;
-    TimeExpressionOption<uint16_t> DELETE_FRIEND_DELAY;
-    TimeExpressionOption<uint16_t> FINISH_DELETE_DELAY;
+    MillisecondsOption VIEW_FRIEND_DELAY0;
+    MillisecondsOption DELETE_FRIEND_DELAY0;
+    MillisecondsOption FINISH_DELETE_DELAY0;
 };