Reorder some parameters.

Author: Mysticial

SerialPrograms/Source/Integrations/ProgramTracker.cpp

@@ -125,7 +125,7 @@ std::string ProgramTracker::nsw_press_button(uint64_t console_id, NintendoSwitch
     try{
         err = iter->second.first->controller().try_run<ProController>(
             [=](ProController& controller){
-                controller.issue_buttons(nullptr, button, duration, duration, 0ms);
+                controller.issue_buttons(nullptr, duration, duration, 0ms, button);
             }
         );
     }catch (Exception& e){
@@ -155,7 +155,7 @@ std::string ProgramTracker::nsw_press_dpad(uint64_t console_id, NintendoSwitch::
     try{
         err = iter->second.first->controller().try_run<ProController>(
             [=](ProController& controller){
-                controller.issue_dpad(nullptr, position, duration, duration, 0ms);
+                controller.issue_dpad(nullptr, duration, duration, 0ms, position);
             }
         );
     }catch (Exception& e){
@@ -185,7 +185,7 @@ std::string ProgramTracker::nsw_press_left_joystick(uint64_t console_id, uint8_t
     try{
         err = iter->second.first->controller().try_run<ProController>(
             [=](ProController& controller){
-                controller.issue_left_joystick(nullptr, x, y, duration, duration, 0ms);
+                controller.issue_left_joystick(nullptr, duration, duration, 0ms, x, y);
             }
         );
     }catch (Exception& e){
@@ -215,7 +215,7 @@ std::string ProgramTracker::nsw_press_right_joystick(uint64_t console_id, uint8_
     try{
         err = iter->second.first->controller().try_run<ProController>(
             [=](ProController& controller){
-                controller.issue_right_joystick(nullptr, x, y, duration, duration, 0ms);
+                controller.issue_right_joystick(nullptr, duration, duration, 0ms, x, y);
             }
         );
     }catch (Exception& e){

SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp

@@ -91,10 +91,10 @@ void pbf_controller_state(
 ){
     context->issue_full_controller_state(
         &context,
+        ticks*8ms,
         button, position,
         left_x, left_y,
-        right_x, right_y,
-        ticks*8ms
+        right_x, right_y
     );
 }
 void pbf_controller_state(
@@ -107,10 +107,10 @@ void pbf_controller_state(
 ){
     context->issue_full_controller_state(
         &context,
+        duration,
         button, position,
         left_x, left_y,
-        right_x, right_y,
-        duration
+        right_x, right_y
     );
 }
 

SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.cpp

@@ -30,16 +30,17 @@ void ssf_press_button(
     uint16_t delay, uint16_t hold, uint8_t cool
 ){
     context->issue_buttons(
-        &context, button,
-        delay*8ms, hold*8ms, cool*8ms
+        &context,
+        delay*8ms, hold*8ms, cool*8ms,
+        button
     );
 }
 void ssf_press_button(
     ProControllerContext& context,
     Button button,
     Milliseconds delay, Milliseconds hold, Milliseconds cool
 ){
-    context->issue_buttons(&context, button, delay, hold, cool);
+    context->issue_buttons(&context, delay, hold, cool, button);
 }
 
 void ssf_press_dpad(
@@ -48,16 +49,17 @@ void ssf_press_dpad(
     uint16_t delay, uint16_t hold, uint8_t cool
 ){
     context->issue_dpad(
-        &context, position,
-        delay*8ms, hold*8ms, cool*8ms
+        &context,
+        delay*8ms, hold*8ms, cool*8ms,
+        position
     );
 }
 void ssf_press_dpad(
     ProControllerContext& context,
     DpadPosition position,
     Milliseconds delay, Milliseconds hold, Milliseconds cool
 ){
-    context->issue_dpad(&context, position, delay, hold, cool);
+    context->issue_dpad(&context, delay, hold, cool, position);
 }
 
 void ssf_press_left_joystick(
@@ -66,48 +68,50 @@ void ssf_press_left_joystick(
     uint16_t delay, uint16_t hold, uint8_t cool
 ){
     context->issue_left_joystick(
-        &context, x, y,
-        delay*8ms, hold*8ms, cool*8ms
+        &context,
+        delay*8ms, hold*8ms, cool*8ms,
+        x, y
     );
 }
 void ssf_press_left_joystick(
     ProControllerContext& context,
     uint8_t x, uint8_t y,
     Milliseconds delay, Milliseconds hold, Milliseconds cool
 ){
-    context->issue_left_joystick(&context, x, y, delay, hold, cool);
+    context->issue_left_joystick(&context, delay, hold, cool, x, y);
 }
 void ssf_press_right_joystick(
     ProControllerContext& context,
     uint8_t x, uint8_t y,
     uint16_t delay, uint16_t hold, uint8_t cool
 ){
     context->issue_right_joystick(
-        &context, x, y,
-        delay*8ms, hold*8ms, cool*8ms
+        &context,
+        delay*8ms, hold*8ms, cool*8ms,
+        x, y
     );
 }
 void ssf_press_right_joystick(
     ProControllerContext& context,
     uint8_t x, uint8_t y,
     Milliseconds delay, Milliseconds hold, Milliseconds cool
 ){
-    context->issue_right_joystick(&context, x, y, delay, hold, cool);
+    context->issue_right_joystick(&context, delay, hold, cool, x, y);
 }
 
 
 
 void ssf_mash1_button(ProControllerContext& context, Button button, uint16_t ticks){
-    context->issue_mash_button(&context, button, ticks*8ms);
+    context->issue_mash_button(&context, ticks*8ms, button);
 }
 void ssf_mash1_button(ProControllerContext& context, Button button, Milliseconds duration){
-    context->issue_mash_button(&context, button, duration);
+    context->issue_mash_button(&context, duration, button);
 }
 void ssf_mash2_button(ProControllerContext& context, Button button0, Button button1, uint16_t ticks){
-    context->issue_mash_button(&context, button0, button1, ticks*8ms);
+    context->issue_mash_button(&context, ticks*8ms, button0, button1);
 }
 void ssf_mash2_button(ProControllerContext& context, Button button0, Button button1, Milliseconds duration){
-    context->issue_mash_button(&context, button0, button1, duration);
+    context->issue_mash_button(&context, duration, button0, button1);
 }
 void ssf_mash_AZs(ProControllerContext& context, uint16_t ticks){
     context->issue_mash_AZs(&context, ticks*8ms);
@@ -121,23 +125,24 @@ void ssf_issue_scroll(
     uint16_t delay, uint16_t hold, uint8_t cool
 ){
     context->issue_system_scroll(
-        &context, direction,
-        delay*8ms, hold*8ms, cool*8ms
+        &context,
+        delay*8ms, hold*8ms, cool*8ms,
+        direction
     );
 }
 void ssf_issue_scroll(
     ProControllerContext& context,
     DpadPosition direction,
     Milliseconds delay
 ){
-    context->issue_system_scroll(&context, direction, delay, 2*delay, delay);
+    context->issue_system_scroll(&context, delay, 2*delay, delay, direction);
 }
 void ssf_issue_scroll(
     ProControllerContext& context,
     DpadPosition direction,
     Milliseconds delay, Milliseconds hold, Milliseconds cool
 ){
-    context->issue_system_scroll(&context, direction, delay, hold, cool);
+    context->issue_system_scroll(&context, delay, hold, cool, direction);
 }
 
 

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerWithScheduler.cpp

@@ -52,8 +52,8 @@ void ControllerWithScheduler::issue_nop(const Cancellable* cancellable, Millisec
 }
 void ControllerWithScheduler::issue_buttons(
     const Cancellable* cancellable,
-    Button button,
-    Milliseconds delay, Milliseconds hold, Milliseconds cooldown
+    Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+    Button button
 ){
     std::lock_guard<std::mutex> lg0(m_issue_lock);
     std::lock_guard<std::mutex> lg1(m_state_lock);
@@ -90,8 +90,8 @@ void ControllerWithScheduler::issue_buttons(
 }
 void ControllerWithScheduler::issue_dpad(
     const Cancellable* cancellable,
-    DpadPosition position,
-    Milliseconds delay, Milliseconds hold, Milliseconds cooldown
+    Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+    DpadPosition position
 ){
     std::lock_guard<std::mutex> lg0(m_issue_lock);
     std::lock_guard<std::mutex> lg1(m_state_lock);
@@ -115,8 +115,8 @@ void ControllerWithScheduler::issue_dpad(
 }
 void ControllerWithScheduler::issue_left_joystick(
     const Cancellable* cancellable,
-    uint8_t x, uint8_t y,
-    Milliseconds delay, Milliseconds hold, Milliseconds cooldown
+    Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+    uint8_t x, uint8_t y
 ){
     std::lock_guard<std::mutex> lg0(m_issue_lock);
     std::lock_guard<std::mutex> lg1(m_state_lock);
@@ -142,8 +142,8 @@ void ControllerWithScheduler::issue_left_joystick(
 }
 void ControllerWithScheduler::issue_right_joystick(
     const Cancellable* cancellable,
-    uint8_t x, uint8_t y,
-    Milliseconds delay, Milliseconds hold, Milliseconds cooldown
+    Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+    uint8_t x, uint8_t y
 ){
     std::lock_guard<std::mutex> lg0(m_issue_lock);
     std::lock_guard<std::mutex> lg1(m_state_lock);
@@ -168,11 +168,11 @@ void ControllerWithScheduler::issue_right_joystick(
 }
 void ControllerWithScheduler::issue_full_controller_state(
     const Cancellable* cancellable,
+    Milliseconds hold,
     Button button,
     DpadPosition position,
     uint8_t left_x, uint8_t left_y,
-    uint8_t right_x, uint8_t right_y,
-    Milliseconds hold
+    uint8_t right_x, uint8_t right_y
 ){
     std::lock_guard<std::mutex> lg0(m_issue_lock);
     std::lock_guard<std::mutex> lg1(m_state_lock);
@@ -233,15 +233,16 @@ void ControllerWithScheduler::issue_full_controller_state(
 
 void ControllerWithScheduler::issue_mash_button(
     const Cancellable* cancellable,
-    Button button, Milliseconds duration
+    Milliseconds duration,
+    Button button
 ){
     if (cancellable){
         cancellable->throw_if_cancelled();
     }
     ThrottleScope scope(m_logging_throttler);
     bool log = true;
     while (duration > Milliseconds::zero()){
-        issue_buttons(cancellable, button, 8*8ms, 5*8ms, 3*8ms);
+        issue_buttons(cancellable, 8*8ms, 5*8ms, 3*8ms, 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
@@ -262,16 +263,17 @@ void ControllerWithScheduler::issue_mash_button(
 }
 void ControllerWithScheduler::issue_mash_button(
     const Cancellable* cancellable,
-    Button button0, Button button1, Milliseconds duration
+    Milliseconds duration,
+    Button button0, Button button1
 ){
     if (cancellable){
         cancellable->throw_if_cancelled();
     }
     ThrottleScope scope(m_logging_throttler);
     bool log = true;
     while (duration > Milliseconds::zero()){
-        issue_buttons(cancellable, button0, Milliseconds(4*8), 5*8ms, 3*8ms);
-        issue_buttons(cancellable, button1, Milliseconds(4*8), 5*8ms, 3*8ms);
+        issue_buttons(cancellable, 4*8ms, 5*8ms, 3*8ms, button0);
+        issue_buttons(cancellable, 4*8ms, 5*8ms, 3*8ms, button1);
 
         //  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
@@ -302,7 +304,7 @@ void ControllerWithScheduler::issue_mash_AZs(
         if (duration <= Milliseconds::zero()){
             break;
         }
-        issue_buttons(cancellable, BUTTON_A, 3*8ms, 6*8ms, 3*8ms);
+        issue_buttons(cancellable, 3*8ms, 6*8ms, 3*8ms, BUTTON_A);
 
         //  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
@@ -319,20 +321,20 @@ void ControllerWithScheduler::issue_mash_AZs(
         if (duration <= Milliseconds::zero()){
             break;
         }
-        issue_buttons(cancellable, BUTTON_ZL, 3*8ms, 6*8ms, 3*8ms);
+        issue_buttons(cancellable, 3*8ms, 6*8ms, 3*8ms, BUTTON_ZL);
         duration -= std::min(3*8ms, duration);
 
         if (duration <= Milliseconds::zero()){
             break;
         }
-        issue_buttons(cancellable, BUTTON_ZR, 3*8ms, 6*8ms, 3*8ms);
+        issue_buttons(cancellable, 3*8ms, 6*8ms, 3*8ms, BUTTON_ZR);
         duration -= std::min(3*8ms, duration);
     }
 }
 void ControllerWithScheduler::issue_system_scroll(
     const Cancellable* cancellable,
-    DpadPosition direction, //  Diagonals not allowed.
-    Milliseconds delay, Milliseconds hold, Milliseconds cooldown
+    Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+    DpadPosition direction  //  Diagonals not allowed.
 ){
     if (cancellable){
         cancellable->throw_if_cancelled();
@@ -347,8 +349,9 @@ void ControllerWithScheduler::issue_system_scroll(
     do{
         if (dpad <= left_joystick && dpad <= right_joystick){
             issue_dpad(
-                cancellable, direction,
-                delay, hold, cooldown
+                cancellable,
+                delay, hold, cooldown,
+                direction
             );
             break;
         }
@@ -397,9 +400,9 @@ void ControllerWithScheduler::issue_system_scroll(
         }
 
         if (left_joystick <= dpad && left_joystick <= right_joystick){
-            issue_left_joystick(cancellable, x, y, delay, hold, cooldown);
+            issue_left_joystick(cancellable, delay, hold, cooldown, x, y);
         }else{
-            issue_right_joystick(cancellable, x, y, delay, hold, cooldown);
+            issue_right_joystick(cancellable, delay, hold, cooldown, x, y);
         }
     }while (false);