From 324de5463b5fa3e4b73770e4b814de12e03df0f7 Mon Sep 17 00:00:00 2001 From: sanni Date: Wed, 31 Jul 2024 12:07:44 +0200 Subject: [PATCH] Allow for flash ID error to be ignored --- Cart_Reader/Cart_Reader.ino | 5 +++++ Cart_Reader/FLASH.ino | 7 ++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Cart_Reader/Cart_Reader.ino b/Cart_Reader/Cart_Reader.ino index a672655..8d6057f 100644 --- a/Cart_Reader/Cart_Reader.ino +++ b/Cart_Reader/Cart_Reader.ino @@ -2456,6 +2456,11 @@ void print_Error(byte errorMessage) { _print_Error(); } +void print_Error(int errorMessage) { + print_STR(errorMessage, 1); + _print_Error(); +} + void _print_FatalError(void) { println_Msg(FS(FSTRING_EMPTY)); print_STR(press_button_STR, 1); diff --git a/Cart_Reader/FLASH.ino b/Cart_Reader/FLASH.ino index 4304e3e..46d53e0 100644 --- a/Cart_Reader/FLASH.ino +++ b/Cart_Reader/FLASH.ino @@ -620,7 +620,7 @@ idtheflash: println_Msg(F("UNKNOWN FLASHROM")); println_Msg(""); // Prints string out of the common strings array either with or without newline - print_STR(press_button_STR, 1); + print_Error(press_button_STR); display_Update(); wait(); @@ -629,16 +629,13 @@ idtheflash: println_Msg(F("First 40 bytes:")); println_Msg(FS(FSTRING_EMPTY)); printFlash(40); - println_Msg(FS(FSTRING_EMPTY)); display_Update(); resetFlash8(); - print_FatalError(F("Press Button to reset")); } - println_Msg(""); + println_Msg(FS(FSTRING_EMPTY)); // Prints string out of the common strings array either with or without newline print_STR(press_button_STR, 1); display_Update(); - resetFlash8(); }