diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp index a51ad874a..8a083efef 100644 --- a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp @@ -22,9 +22,6 @@ void pbf_press_button(ProControllerContext& context, Button button, Milliseconds void pbf_press_dpad(ProControllerContext& context, DpadPosition position, Milliseconds hold, Milliseconds release){ ssf_press_dpad(context, position, hold + release, hold, 0ms); } -void pbf_move_left_joystick_old(ProControllerContext& context, uint8_t x, uint8_t y, Milliseconds hold, Milliseconds release){ - ssf_press_left_joystick_old(context, x, y, hold + release, hold, 0ms); -} void pbf_move_left_joystick(ProControllerContext& context, const JoystickPosition& position, Milliseconds hold, Milliseconds release){ ssf_press_left_joystick(context, position, hold + release, hold, 0ms); } diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h index 4d18c40ae..5fdd5ad8a 100644 --- a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h +++ b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h @@ -50,7 +50,6 @@ void pbf_press_dpad (ProControllerContext& context, DpadPosition position, M // y = 255 : down // Example: move the joystick fully left: (x, y) = (0, 128) // move the joystick upper-right: (x, y) = (255, 0) -void pbf_move_left_joystick_old (ProControllerContext& context, uint8_t x, uint8_t y, Milliseconds hold, Milliseconds release); void pbf_move_left_joystick (ProControllerContext& context, const JoystickPosition& position, Milliseconds hold, Milliseconds release); // Move right joystick towards a 2D direction. Hold the direction for `hold_ticks`, then release it for `release_ticks`. diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.cpp b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.cpp index 2deb80c20..b09913aec 100644 --- a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.cpp @@ -36,33 +36,6 @@ void ssf_press_dpad( context->issue_dpad(&context, delay, hold, cool, position); } -void ssf_press_left_joystick_old( - ProControllerContext& context, - uint8_t x, uint8_t y, - uint16_t delay, uint16_t hold, uint8_t cool -){ - context->issue_left_joystick( - &context, - delay*8ms, hold*8ms, cool*8ms, - { - JoystickTools::linear_u8_to_float(x), - -JoystickTools::linear_u8_to_float(y) - } - ); -} -void ssf_press_left_joystick_old( - ProControllerContext& context, - uint8_t x, uint8_t y, - Milliseconds delay, Milliseconds hold, Milliseconds cool -){ - context->issue_left_joystick( - &context, delay, hold, cool, - { - JoystickTools::linear_u8_to_float(x), - -JoystickTools::linear_u8_to_float(y) - } - ); -} void ssf_press_left_joystick( ProControllerContext& context, const JoystickPosition& position, diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h index 384dd072e..f0fe64119 100644 --- a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h +++ b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h @@ -40,16 +40,6 @@ void ssf_press_dpad( ); -void ssf_press_left_joystick_old( - ProControllerContext& context, - uint8_t x, uint8_t y, - uint16_t delay, uint16_t hold, uint8_t cool = 0 -); -void ssf_press_left_joystick_old( - ProControllerContext& context, - uint8_t x, uint8_t y, - Milliseconds delay, Milliseconds hold, Milliseconds cool = 0ms -); void ssf_press_left_joystick( ProControllerContext& context, const JoystickPosition& position,