Skip to content

Commit 8487a51

Browse files
committed
Factor out code.py status messages
1 parent d01b9ce commit 8487a51

File tree

1 file changed

+15
-18
lines changed

1 file changed

+15
-18
lines changed

main.c

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -242,16 +242,24 @@ void cleanup_after_vm(supervisor_allocation* heap) {
242242
reset_status_led();
243243
}
244244

245+
void print_code_py_status_message(safe_mode_t safe_mode) {
246+
if (autoreload_is_enabled()) {
247+
serial_write_compressed(translate("Auto-reload is on. Simply save files over USB to run them or enter REPL to disable.\n"));
248+
} else {
249+
serial_write_compressed(translate("Auto-reload is off.\n"));
250+
}
251+
if (safe_mode != NO_SAFE_MODE) {
252+
serial_write_compressed(translate("Running in safe mode! "));
253+
serial_write_compressed(translate("Not running saved code.\n"));
254+
}
255+
}
256+
245257
bool run_code_py(safe_mode_t safe_mode) {
246258
bool serial_connected_at_start = serial_connected();
247259
#if CIRCUITPY_AUTORELOAD_DELAY_MS > 0
248260
if (serial_connected_at_start) {
249261
serial_write("\n");
250-
if (autoreload_is_enabled()) {
251-
serial_write_compressed(translate("Auto-reload is on. Simply save files over USB to run them or enter REPL to disable.\n"));
252-
} else {
253-
serial_write_compressed(translate("Auto-reload is off.\n"));
254-
}
262+
print_code_py_status_message(safe_mode);
255263
}
256264
#endif
257265

@@ -263,10 +271,7 @@ bool run_code_py(safe_mode_t safe_mode) {
263271

264272
bool found_main = false;
265273

266-
if (safe_mode != NO_SAFE_MODE) {
267-
serial_write_compressed(translate("Running in safe mode! "));
268-
serial_write_compressed(translate("Not running saved code.\n"));
269-
} else {
274+
if (safe_mode == NO_SAFE_MODE) {
270275
new_status_color(MAIN_RUNNING);
271276

272277
static const char * const supported_filenames[] = STRING_LIST("code.txt", "code.py", "main.py", "main.txt");
@@ -320,15 +325,7 @@ bool run_code_py(safe_mode_t safe_mode) {
320325

321326
if (!serial_connected_before_animation && serial_connected()) {
322327
if (!serial_connected_at_start) {
323-
if (autoreload_is_enabled()) {
324-
serial_write_compressed(translate("Auto-reload is on. Simply save files over USB to run them or enter REPL to disable.\n"));
325-
} else {
326-
serial_write_compressed(translate("Auto-reload is off.\n"));
327-
}
328-
if (safe_mode != NO_SAFE_MODE) {
329-
serial_write_compressed(translate("Running in safe mode! "));
330-
serial_write_compressed(translate("Not running saved code.\n"));
331-
}
328+
print_code_py_status_message(safe_mode);
332329
}
333330
print_safe_mode_message(safe_mode);
334331
serial_write("\n");

0 commit comments

Comments
 (0)