Skip to content

Commit bc27743

Browse files
authored
Merge pull request micropython#11010 from dhalbert/startup-message-printing
simplify startup message printing
2 parents 05511a4 + fc0c196 commit bc27743

1 file changed

Lines changed: 2 additions & 20 deletions

File tree

main.c

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -441,17 +441,6 @@ static void print_code_py_status_message(safe_mode_t safe_mode) {
441441
}
442442

443443
static bool __attribute__((noinline)) run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
444-
bool serial_connected_at_start = serial_connected();
445-
bool printed_safe_mode_message = false;
446-
#if CIRCUITPY_AUTORELOAD_DELAY_MS > 0
447-
if (serial_connected_at_start) {
448-
serial_write("\r\n");
449-
print_code_py_status_message(safe_mode);
450-
print_safe_mode_message(safe_mode);
451-
printed_safe_mode_message = true;
452-
}
453-
#endif
454-
455444
bool skip_repl = false;
456445
bool skip_wait = false;
457446
bool found_main = false;
@@ -651,20 +640,13 @@ static bool __attribute__((noinline)) run_code_py(safe_mode_t safe_mode, bool *s
651640

652641
// If messages haven't been printed yet, print them
653642
if (!printed_press_any_key && serial_connected() && !autoreload_pending()) {
654-
if (!serial_connected_at_start) {
655-
print_code_py_status_message(safe_mode);
656-
}
657-
658-
if (!printed_safe_mode_message) {
659-
print_safe_mode_message(safe_mode);
660-
printed_safe_mode_message = true;
661-
}
643+
print_code_py_status_message(safe_mode);
644+
print_safe_mode_message(safe_mode);
662645
serial_write("\r\n");
663646
serial_write_compressed(MP_ERROR_TEXT("Press any key to enter the REPL. Use CTRL-D to reload.\n"));
664647
printed_press_any_key = true;
665648
}
666649
if (!serial_connected()) {
667-
serial_connected_at_start = false;
668650
printed_press_any_key = false;
669651
}
670652

0 commit comments

Comments
 (0)