Allow mashing timing parameters to be specified.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h

@@ -160,7 +160,11 @@ class JoyconController : public AbstractController{
     //  Mash a button as quickly as possible.
     virtual void issue_mash_button(
         Cancellable* cancellable,
-        Button button, Milliseconds duration
+        Button button,
+        Milliseconds duration,
+        Milliseconds delay = Milliseconds(64),
+        Milliseconds hold = Milliseconds(40),
+        Milliseconds cooldown = Milliseconds(24)
     ) = 0;
 
 

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerWithScheduler.cpp

@@ -268,15 +268,18 @@ void ControllerWithScheduler::issue_full_controller_state(
 void ControllerWithScheduler::issue_mash_button(
     Cancellable* cancellable,
     Milliseconds duration,
-    Button button
+    Button button,
+    Milliseconds delay,
+    Milliseconds hold,
+    Milliseconds cooldown
 ){
     if (cancellable){
         cancellable->throw_if_cancelled();
     }
     ThrottleScope scope(m_logging_throttler);
     bool log = true;
     while (duration > Milliseconds::zero()){
-        issue_buttons(cancellable, 8*8ms, 5*8ms, 3*8ms, button);
+        issue_buttons(cancellable, delay, hold, cooldown, button);
 
         //  We never log before the first issue to avoid delaying the critical path.
         //  But we do want to log before the mash spam. So we log after the first
@@ -290,8 +293,9 @@ void ControllerWithScheduler::issue_mash_button(
         }
         log = false;
 
-        duration = duration >= 8*8ms
-            ? duration - 8*8ms
+        Milliseconds elapsed = std::max(delay, hold + cooldown);
+        duration = duration >= elapsed
+            ? duration - elapsed
             : Milliseconds::zero();
     }
 }

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerWithScheduler.h

@@ -264,7 +264,10 @@ class ControllerWithScheduler : public PokemonAutomation::ControllerWithSchedule
     void issue_mash_button(
         Cancellable* cancellable,
         Milliseconds duration,
-        Button button
+        Button button,
+        Milliseconds delay,
+        Milliseconds hold,
+        Milliseconds cooldown
     );
     void issue_mash_button(
         Cancellable* cancellable,

SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h

@@ -182,7 +182,10 @@ class ProController : public AbstractController{
     virtual void issue_mash_button(
         Cancellable* cancellable,
         Milliseconds duration,
-        Button button
+        Button button,
+        Milliseconds delay = Milliseconds(64),
+        Milliseconds hold = Milliseconds(40),
+        Milliseconds cooldown = Milliseconds(24)
     ) = 0;
 
     //  Alternate pressing "button0" and "button1" as quickly as possible.

SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_Joycon.cpp

@@ -147,10 +147,13 @@ void SerialPABotBase_Joycon<JoyconType>::issue_full_controller_state(
 template <typename JoyconType>
 void SerialPABotBase_Joycon<JoyconType>::issue_mash_button(
     Cancellable* cancellable,
-    Button button, Milliseconds duration
+    Button button, Milliseconds duration,
+    Milliseconds delay,
+    Milliseconds hold,
+    Milliseconds cooldown
 ){
     button &= m_valid_buttons;
-    ControllerWithScheduler::issue_mash_button(cancellable, duration, button);
+    ControllerWithScheduler::issue_mash_button(cancellable, duration, button, delay, hold, cooldown);
 }
 
 

SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_Joycon.h

@@ -154,7 +154,10 @@ class SerialPABotBase_Joycon :
 
     virtual void issue_mash_button(
         Cancellable* cancellable,
-        Button button, Milliseconds duration
+        Button button, Milliseconds duration,
+        Milliseconds delay,
+        Milliseconds hold,
+        Milliseconds cooldown
     ) override;
 
 

SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_ProController.h

@@ -182,9 +182,10 @@ class SerialPABotBase_ProController final :
     virtual void issue_mash_button(
         Cancellable* cancellable,
         Milliseconds duration,
-        Button button
+        Button button,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown
     ) override{
-        ControllerWithScheduler::issue_mash_button(cancellable, duration, button);
+        ControllerWithScheduler::issue_mash_button(cancellable, duration, button, delay, hold, cooldown);
     }
     virtual void issue_mash_button(
         Cancellable* cancellable,

SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WiredController.h

@@ -188,10 +188,11 @@ class SerialPABotBase_WiredController final :
     virtual void issue_mash_button(
         Cancellable* cancellable,
         Milliseconds duration,
-        Button button
+        Button button,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown
     ) override{
         button &= VALID_PRO_CONTROLLER_BUTTONS;
-        ControllerWithScheduler::issue_mash_button(cancellable, duration, button);
+        ControllerWithScheduler::issue_mash_button(cancellable, duration, button, delay, hold, cooldown);
     }
     virtual void issue_mash_button(
         Cancellable* cancellable,

SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase3_ProController.h

@@ -176,9 +176,10 @@ class ProController_SysbotBase3 final :
     virtual void issue_mash_button(
         Cancellable* cancellable,
         Milliseconds duration,
-        Button button
+        Button button,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown
     ) override{
-        ControllerWithScheduler::issue_mash_button(cancellable, duration, button);
+        ControllerWithScheduler::issue_mash_button(cancellable, duration, button, delay, hold, cooldown);
     }
     virtual void issue_mash_button(
         Cancellable* cancellable,

SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_ProController.h

@@ -192,9 +192,10 @@ class ProController_SysbotBase final :
     virtual void issue_mash_button(
         Cancellable* cancellable,
         Milliseconds duration,
-        Button button
+        Button button,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown
     ) override{
-        ControllerWithScheduler::issue_mash_button(cancellable, duration, button);
+        ControllerWithScheduler::issue_mash_button(cancellable, duration, button, delay, hold, cooldown);
     }
     virtual void issue_mash_button(
         Cancellable* cancellable,