瀏覽代碼

status message during print recovery

PavelSindler 7 年之前
父節點
當前提交
e521831245
共有 4 個文件被更改,包括 11 次插入3 次删除
  1. 1 1
      Firmware/Marlin_main.cpp
  2. 6 1
      Firmware/language_all.cpp
  3. 2 0
      Firmware/language_all.h
  4. 2 1
      Firmware/language_en.h

+ 1 - 1
Firmware/Marlin_main.cpp

@@ -6910,7 +6910,7 @@ void recover_print() {
 	char cmd[30];
 	lcd_update_enable(true);
 	lcd_update(2);
-	lcd_setstatuspgm(WELCOME_MSG);
+	lcd_setstatuspgm(MSG_RECOVERING_PRINT);
 
 	target_temperature[active_extruder] = eeprom_read_byte((uint8_t*)EEPROM_UVLO_TARGET_HOTEND);
 	target_temperature_bed = eeprom_read_byte((uint8_t*)EEPROM_UVLO_TARGET_BED);

+ 6 - 1
Firmware/language_all.cpp

@@ -2203,7 +2203,12 @@ const char * const MSG_REBOOT_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_REBOOT_DE
 };
 
-const char MSG_RECOVER_PRINT_EN[] PROGMEM = "Blackout occured. Recover print?";
+const char MSG_RECOVERING_PRINT_EN[] PROGMEM = "Recovering print    ";
+const char * const MSG_RECOVERING_PRINT_LANG_TABLE[1] PROGMEM = {
+	MSG_RECOVERING_PRINT_EN
+};
+
+const char MSG_RECOVER_PRINT_EN[] PROGMEM = "Blackout occurred. Recover print?";
 const char * const MSG_RECOVER_PRINT_LANG_TABLE[1] PROGMEM = {
 	MSG_RECOVER_PRINT_EN
 };

+ 2 - 0
Firmware/language_all.h

@@ -414,6 +414,8 @@ extern const char* const MSG_PRUSA3D_HOWTO_LANG_TABLE[LANG_NUM];
 #define MSG_PRUSA3D_HOWTO LANG_TABLE_SELECT(MSG_PRUSA3D_HOWTO_LANG_TABLE)
 extern const char* const MSG_REBOOT_LANG_TABLE[LANG_NUM];
 #define MSG_REBOOT LANG_TABLE_SELECT(MSG_REBOOT_LANG_TABLE)
+extern const char* const MSG_RECOVERING_PRINT_LANG_TABLE[1];
+#define MSG_RECOVERING_PRINT LANG_TABLE_SELECT_EXPLICIT(MSG_RECOVERING_PRINT_LANG_TABLE, 0)
 extern const char* const MSG_RECOVER_PRINT_LANG_TABLE[1];
 #define MSG_RECOVER_PRINT LANG_TABLE_SELECT_EXPLICIT(MSG_RECOVER_PRINT_LANG_TABLE, 0)
 extern const char* const MSG_RECTRACT_LANG_TABLE[1];

+ 2 - 1
Firmware/language_en.h

@@ -304,4 +304,5 @@
 #define(length=17, lines=1) MSG_EXTRUDER_2						"Extruder 2"
 #define(length=17, lines=1) MSG_EXTRUDER_3						"Extruder 3"
 #define(length=17, lines=1) MSG_EXTRUDER_4						"Extruder 4"
-#define(length=20, lines=2) MSG_RECOVER_PRINT					"Blackout occured. Recover print?"
+#define(length=20, lines=2) MSG_RECOVER_PRINT					"Blackout occurred. Recover print?"
+#define(length=20, lines=1) MSG_RECOVERING_PRINT				"Recovering print    "