Skip to content

Commit d794cd0

Browse files
committed
Fix DateReader for SBB. Improve date spam for SBB.
1 parent cd45734 commit d794cd0

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ void DateReader::set_hours(
136136
for (size_t attempts = 0; attempts < 10; attempts++){
137137
// Move cursor out of the way.
138138
for (size_t c = 0; c < 7; c++){
139-
pbf_press_dpad(context, DPAD_LEFT, 5, 3);
139+
ssf_issue_scroll(context, DPAD_LEFT);
140140
}
141141
context.wait_for_all_requests();
142142
context.wait_for(std::chrono::milliseconds(250));
@@ -157,15 +157,15 @@ void DateReader::set_hours(
157157
// We're done.
158158
if (current_hour == hour){
159159
for (size_t c = 0; c < 7; c++){
160-
pbf_press_dpad(context, DPAD_RIGHT, 5, 3);
160+
ssf_issue_scroll(context, DPAD_RIGHT);
161161
}
162162
return;
163163
}
164164

165165
// Move the cursor to the hour.
166-
pbf_press_dpad(context, DPAD_RIGHT, 5, 3);
167-
pbf_press_dpad(context, DPAD_RIGHT, 5, 3);
168-
pbf_press_dpad(context, DPAD_RIGHT, 5, 3);
166+
ssf_issue_scroll(context, DPAD_RIGHT);
167+
ssf_issue_scroll(context, DPAD_RIGHT);
168+
ssf_issue_scroll(context, DPAD_RIGHT);
169169

170170
ImageViewRGB32 us_hours = extract_box_reference(snapshot, m_us_hour);
171171
ImageStats stats_us_hours = image_stats(us_hours);
@@ -175,27 +175,27 @@ void DateReader::set_hours(
175175
uint8_t diff = (24 + (uint8_t)hour - (uint8_t)current_hour) % 12;
176176
if (diff < 6){
177177
for (size_t c = 0; c < diff; c++){
178-
pbf_press_dpad(context, DPAD_UP, 5, 3);
178+
ssf_issue_scroll(context, DPAD_UP);
179179
}
180180
}else{
181181
for (size_t c = diff; c < 12; c++){
182-
pbf_press_dpad(context, DPAD_DOWN, 5, 3);
182+
ssf_issue_scroll(context, DPAD_DOWN);
183183
}
184184
}
185185
if ((hour < 12) != (current_hour < 12)){
186-
pbf_press_dpad(context, DPAD_RIGHT, 5, 3);
187-
pbf_press_dpad(context, DPAD_RIGHT, 5, 3);
188-
pbf_press_dpad(context, DPAD_DOWN, 5, 3);
186+
ssf_issue_scroll(context, DPAD_RIGHT);
187+
ssf_issue_scroll(context, DPAD_RIGHT);
188+
ssf_issue_scroll(context, DPAD_DOWN);
189189
}
190190
}else{
191191
uint8_t diff = (24 + (uint8_t)hour - (uint8_t)current_hour) % 24;
192192
if (diff < 12){
193193
for (size_t c = 0; c < diff; c++){
194-
pbf_press_dpad(context, DPAD_UP, 5, 3);
194+
ssf_issue_scroll(context, DPAD_UP);
195195
}
196196
}else{
197197
for (size_t c = diff; c < 24; c++){
198-
pbf_press_dpad(context, DPAD_DOWN, 5, 3);
198+
ssf_issue_scroll(context, DPAD_DOWN);
199199
}
200200
}
201201
}

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_Navigation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ void home_to_date_time(ProControllerContext& context, bool to_date_change, bool
8080

8181
// Two A presses in case we drop the 1st one.
8282
ssf_mash1_button(context, BUTTON_A, 200ms);
83-
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 3000ms, 3000ms);
83+
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 2500ms, 2500ms);
8484
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 500ms, 500ms);
8585

8686
ssf_issue_scroll(context, SSF_SCROLL_DOWN);

0 commit comments

Comments
 (0)