Skip to content

Commit 033aafc

Browse files
MysticialMysticial
committed
Remove the remaining ssf API with 40ms hold default.
1 parent 24ff362 commit 033aafc

33 files changed

+191
-216
lines changed

‎SerialPrograms/Source/CommonFramework/Globals.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace PokemonAutomation{
2626
const bool IS_BETA_VERSION = true;
2727
const int PROGRAM_VERSION_MAJOR = 0;
2828
const int PROGRAM_VERSION_MINOR = 54;
29-
const int PROGRAM_VERSION_PATCH = 8;
29+
const int PROGRAM_VERSION_PATCH = 9;
3030

3131
const std::string PROGRAM_VERSION_BASE =
3232
"v" + std::to_string(PROGRAM_VERSION_MAJOR) +

‎SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,13 @@ void pbf_wait(ProControllerContext& context, Milliseconds duration){
2020
ssf_do_nothing(context, duration);
2121
}
2222
void pbf_press_button(ProControllerContext& context, Button button, uint16_t hold_ticks, uint16_t release_ticks){
23-
uint32_t delay = (uint32_t)hold_ticks + release_ticks;
24-
if ((uint16_t)delay == delay){
25-
ssf_press_button(context, button, (uint16_t)delay, hold_ticks, 0);
26-
}else{
27-
ssf_press_button(context, button, hold_ticks, hold_ticks, 0);
28-
ssf_do_nothing(context, release_ticks);
29-
}
23+
ssf_press_button(context, button, (hold_ticks + release_ticks) * 8ms, hold_ticks * 8ms, 0ms);
3024
}
3125
void pbf_press_button(ProControllerContext& context, Button button, Milliseconds hold, Milliseconds release){
3226
ssf_press_button(context, button, hold + release, hold, 0ms);
3327
}
3428
void pbf_press_dpad(ProControllerContext& context, DpadPosition position, uint16_t hold_ticks, uint16_t release_ticks){
35-
uint32_t delay = (uint32_t)hold_ticks + release_ticks;
36-
if ((uint16_t)delay == delay){
37-
ssf_press_dpad(context, position, (uint16_t)delay, hold_ticks, 0);
38-
}else{
39-
ssf_press_dpad(context, position, hold_ticks, hold_ticks, 0);
40-
ssf_do_nothing(context, release_ticks);
41-
}
29+
ssf_press_dpad(context, position, (hold_ticks + release_ticks) * 8ms, hold_ticks * 8ms, 0ms);
4230
}
4331
void pbf_press_dpad(ProControllerContext& context, DpadPosition position, Milliseconds hold, Milliseconds release){
4432
ssf_press_dpad(context, position, hold + release, hold, 0ms);

‎SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,11 @@ void ssf_do_nothing (ProControllerContext& context, uint16_t ticks);
2929
void ssf_do_nothing (ProControllerContext& context, Milliseconds duration);
3030

3131

32-
#if 1
33-
void ssf_press_button(
34-
ProControllerContext& context,
35-
Button button,
36-
uint16_t delay, uint16_t hold = 5, uint8_t cool = 3
37-
);
38-
#endif
3932
void ssf_press_button(
4033
ProControllerContext& context,
4134
Button button,
4235
Milliseconds delay = 24ms, Milliseconds hold = 48ms, Milliseconds cool = 24ms
4336
);
44-
45-
void ssf_press_dpad(
46-
ProControllerContext& context,
47-
DpadPosition position,
48-
uint16_t delay, uint16_t hold = 5, uint8_t cool = 3
49-
);
5037
void ssf_press_dpad(
5138
ProControllerContext& context,
5239
DpadPosition position,

‎SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch1_HomeToDateTime.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void home_to_date_time_Switch1_wired_blind(
6262
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
6363
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
6464
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 80ms, 40ms, 24ms);
65-
ssf_press_dpad(context, DPAD_DOWN, 45, 40);
65+
ssf_press_dpad(context, DPAD_DOWN, 360ms, 320ms);
6666
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
6767
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
6868

@@ -277,7 +277,7 @@ void home_to_date_time_Switch1_wired_feedback(
277277
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
278278
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
279279
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 80ms, 40ms, 24ms);
280-
ssf_press_dpad(context, DPAD_DOWN, 45, 40);
280+
ssf_press_dpad(context, DPAD_DOWN, 360ms, 320ms);
281281
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
282282
// if (i > 1){ // intentionally create a failure, for testing
283283
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);

‎SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch2_HomeToDateTime.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void home_to_settings_Switch2_wired_blind(
4545
// Scroll left and press A to exit the sleep menu if we happened to
4646
// land there.
4747
ssf_issue_scroll(context, SSF_SCROLL_LEFT, delay, hold, cool);
48-
ssf_press_button(context, BUTTON_A, 3);
48+
ssf_press_button(context, BUTTON_A, delay, hold, cool);
4949

5050
for (size_t c = 0; c < 2; c++){
5151
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay, hold, cool);

‎SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ namespace NintendoSwitch{
1515

1616

1717
void neutral_date_skip_switch1_wired(ProControllerContext& context){
18-
ssf_press_button(context, BUTTON_A, 20, 10);
18+
ssf_press_button(context, BUTTON_A, 160ms, 80ms);
1919
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms);
2020
ssf_issue_scroll(context, SSF_SCROLL_UP, 0ms, 40ms, 24ms);
21-
ssf_press_button(context, BUTTON_A, 2);
21+
ssf_press_button(context, BUTTON_A, 16ms);
2222
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
2323
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
2424
// ssf_press_button(context, BUTTON_A, 2);
2525
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
2626
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 0ms, 48ms, 24ms);
27-
ssf_press_button(context, BUTTON_A, 20, 10);
28-
ssf_press_button(context, BUTTON_A, 20, 10);
27+
ssf_press_button(context, BUTTON_A, 160ms, 80ms);
28+
ssf_press_button(context, BUTTON_A, 160ms, 80ms);
2929
for (uint8_t c = 0; c < 6; c++){
3030
ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
3131
}
@@ -36,7 +36,7 @@ void neutral_date_skip_switch1_wireless(ProControllerContext& context){
3636
Milliseconds tv = context->timing_variation();
3737
Milliseconds unit = 24ms + tv;
3838

39-
ssf_press_button(context, BUTTON_A, 20, 10);
39+
ssf_press_button(context, BUTTON_A, 160ms, 80ms);
4040
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
4141
ssf_issue_scroll(context, SSF_SCROLL_UP, 0ms, 2*unit, unit);
4242
ssf_press_button(context, BUTTON_A, unit);
@@ -45,8 +45,8 @@ void neutral_date_skip_switch1_wireless(ProControllerContext& context){
4545
// ssf_press_button(context, BUTTON_A, unit);
4646
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
4747
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
48-
ssf_press_button(context, BUTTON_A, 20, 10);
49-
ssf_press_button(context, BUTTON_A, 20, 10);
48+
ssf_press_button(context, BUTTON_A, 160ms, 80ms);
49+
ssf_press_button(context, BUTTON_A, 160ms, 80ms);
5050
for (uint8_t c = 0; c < 6; c++){
5151
ssf_issue_scroll(context, SSF_SCROLL_LEFT, unit);
5252
}

‎SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ namespace NintendoSwitch{
1616
void roll_date_forward_1_Switch1_wired(ProControllerContext& context, bool fast){
1717
Milliseconds delay = 24ms;
1818

19-
ssf_press_button(context, BUTTON_A, 20, 10);
19+
ssf_press_button(context, BUTTON_A, 160ms, 80ms);
2020
ssf_issue_scroll(context, SSF_SCROLL_UP, 0ms, 2*delay, delay);
2121
ssf_press_button(context, BUTTON_A, delay);
2222
// ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
2323
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
2424
ssf_issue_scroll(context, SSF_SCROLL_UP, delay);
2525
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
26-
ssf_press_button(context, BUTTON_A, 0);
26+
ssf_press_button(context, BUTTON_A, 0ms);
2727
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
2828
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
2929
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 0ms, 2*delay, delay);
30-
ssf_press_button(context, BUTTON_A, 20, 10);
30+
ssf_press_button(context, BUTTON_A, 160ms, 80ms);
3131
}
3232
void roll_date_forward_1_Switch1_wireless(ProControllerContext& context){
3333
Milliseconds tv = context->timing_variation();

‎SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggRoutines.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ void egg_spin(ProControllerContext& context, Milliseconds duration){
2929
}
3030
void egg_spin_with_A(ProControllerContext& context, Milliseconds duration){
3131
for (Milliseconds c = 0ms; c < duration; c += 42*8ms){
32-
ssf_press_button(context, BUTTON_ZL, 0, 10);
32+
ssf_press_button(context, BUTTON_ZL, 0ms, 80ms);
3333
pbf_move_left_joystick(context, 0, 0, 5, 0);
3434
pbf_move_left_joystick(context, 128, 0, 5, 0);
3535
pbf_move_left_joystick(context, 255, 0, 5, 0);

0 commit comments

Comments
 (0)