Skip to content

Commit dc47dcf

Browse files
committed
Reduce date change timeout.
1 parent 5203d6b commit dc47dcf

File tree

2 files changed

+3
-36
lines changed

2 files changed

+3
-36
lines changed

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ std::pair<DateFormat, DateTime> DateReader::read_date(Logger& logger, std::share
256256
if (!detect(*screen)){
257257
throw_and_log<OperationFailedException>(
258258
logger, ErrorReport::SEND_ERROR_REPORT,
259-
"Not on data change screen.",
259+
"Not on date change screen.",
260260
nullptr,
261261
std::move(screen)
262262
);
@@ -267,7 +267,7 @@ std::pair<DateFormat, DateTime> DateReader::read_date(Logger& logger, std::share
267267
if (stats_window_top.stddev.sum() > 10){
268268
throw_and_log<OperationFailedException>(
269269
logger, ErrorReport::SEND_ERROR_REPORT,
270-
"Not on data change screen.",
270+
"Not on date change screen.",
271271
nullptr,
272272
std::move(screen)
273273
);
@@ -592,7 +592,7 @@ void change_date(
592592
HomeWatcher home;
593593
DateChangeWatcher date_reader;
594594
int ret = wait_until(
595-
env.console, context, std::chrono::seconds(120),
595+
env.console, context, std::chrono::seconds(10),
596596
{
597597
home,
598598
date_reader

SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.cpp

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -106,39 +106,6 @@ void AutonomousBallThrower::program(SingleSwitchProgramEnvironment& env, BotBase
106106
results.balls_used,
107107
results.result
108108
);
109-
110-
#if 0
111-
while (true)
112-
{
113-
NormalBattleMenuWatcher battle_menu(COLOR_RED);
114-
int ret = wait_until(
115-
env.console, context,
116-
std::chrono::seconds(120),
117-
{
118-
battle_menu,
119-
}
120-
);
121-
122-
context.wait_for(std::chrono::milliseconds(100));
123-
switch (ret){
124-
case 0:
125-
throw_ball(env.console, context);
126-
stats.m_balls++;
127-
env.update_stats();
128-
break;
129-
default:
130-
throw FatalProgramException(
131-
env.console, ErrorReport::SEND_ERROR_REPORT,
132-
"Failed to detect battle menu after 60 seconds, did you catch or fail?",
133-
true
134-
);
135-
}
136-
137-
}
138-
#endif
139-
140-
// env.update_stats();
141-
// send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
142109
}
143110

144111

0 commit comments

Comments
 (0)