Apply the reprint_pr_changes_diff2.txt provided by @3d-gussner

prusa3d · Nov 6, 2023 · 1813220 · 1813220
1 parent 934267e
commit 1813220
Show file tree

Hide file tree

Showing 17 changed files with 8,396 additions and 8,375 deletions.
diff --git a/Firmware/cardreader.h b/Firmware/cardreader.h
@@ -83,7 +83,7 @@ class CardReader
   bool ToshibaFlashAir_isEnabled() const { return card.getFlashAirCompatible(); }
   void ToshibaFlashAir_enable(bool enable) { card.setFlashAirCompatible(enable); }
   bool ToshibaFlashAir_GetIP(uint8_t *ip);
-  
+
   //Reprint
   bool FileExists(const char* filename);
 

diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp
@@ -187,7 +187,7 @@ extern const char MSG_LOAD_ALL[] PROGMEM_I1 = ISTR("Load All"); ////MSG_LOAD_ALL
 extern const char MSG_NOZZLE_CNG_MENU [] PROGMEM_I1 = ISTR("Nozzle change");////MSG_NOZZLE_CNG_MENU c=18
 extern const char MSG_NOZZLE_CNG_READ_HELP [] PROGMEM_I1 = ISTR("For a Nozzle change please read\nprusa.io/nozzle-mk3s");////MSG_NOZZLE_CNG_READ_HELP c=20 r=4
 extern const char MSG_NOZZLE_CNG_CHANGED [] PROGMEM_I1 = ISTR("Hotend at 280C! Nozzle changed and tightened to specs?");////MSG_NOZZLE_CNG_CHANGED c=20 r=6
-extern const char MSG_REPRINT [] PROGMEM_I1 = ISTR("Reprint"); ////MSG_REPRINT c=7
+extern const char MSG_REPRINT [] PROGMEM_I1 = ISTR("Reprint"); ////MSG_REPRINT c=18
 //not internationalized messages
 #if 0
 const char MSG_FW_VERSION_BETA[] PROGMEM_N1 = "You are using a BETA firmware version! It is in a development state! Use this version with CAUTION as it may DAMAGE the printer!"; ////MSG_FW_VERSION_BETA c=20 r=8

diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
@@ -5189,7 +5189,7 @@ static void lcd_main_menu()
     if(!printer_active() && enableReprint && card.cardOK)
     {
         MENU_ITEM_SUBMENU_P(_T(MSG_REPRINT), reprint_from_eeprom);
-    }else if(!printer_active() && enableReprint && saved_printing_type == PowerPanic::PRINT_TYPE_USB) 
+    }else if(!printer_active() && enableReprint && saved_printing_type == PowerPanic::PRINT_TYPE_USB)
     {
         lcd_reprint_usb_print();
     }else if (!card.cardOK && (saved_printing_type != PowerPanic::PRINT_TYPE_USB))