Skip to content

Commit

Permalink
Avoid host error reset
Browse files Browse the repository at this point in the history
  • Loading branch information
@thinkyhead
thinkyhead committed Aug 8, 2023
1 parent fd41757 commit 60081b1
Show file tree
Hide file tree
Showing 13 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion Marlin/src/core/language.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
#define STR_ERR_ARC_ARGS "G2/G3 bad parameters"
#define STR_ERR_PROTECTED_PIN "Protected Pin"
#define STR_ERR_M420_FAILED "Failed to enable Bed Leveling"
#define STR_ERR_M428_TOO_FAR "Too far from reference point"
#define STR_ERR_M428_TOO_FAR "Too far from MIN/MAX"
#define STR_ERR_M303_DISABLED "PIDTEMP disabled"
#define STR_M119_REPORT "Reporting endstop status"
#define STR_ON "ON"
Expand Down
10 changes: 5 additions & 5 deletions Marlin/src/lcd/extui/anycubic_vyper/dgus_tft.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ namespace Anycubic {
DEBUG_ECHOLNPGM("printerKilled()\nerror: ", error, "\ncomponent: ", component);
#endif

if (strcmp_P(error, PSTR("Heating Failed")) == 0) {
if (strcmp_P(error, GET_TEXT(MSG_HEATING_FAILED_LCD)) == 0) {

if (strcmp_P(component, PSTR("Bed")) == 0) {
changePageOfTFT(PAGE_CHS_ABNORMAL_BED_HEATER);
Expand All @@ -305,7 +305,7 @@ namespace Anycubic {
}

}
else if (strcmp_P(error, PSTR("Err: MINTEMP")) == 0) {
else if (strcmp_P(error, GET_TEXT(MSG_ERR_MINTEMP)) == 0) {

if (strcmp_P(component, PSTR("Bed")) == 0) {
changePageOfTFT(PAGE_CHS_ABNORMAL_BED_NTC);
Expand All @@ -317,7 +317,7 @@ namespace Anycubic {
}

}
else if (strcmp_P(error, PSTR("Err: MAXTEMP")) == 0) {
else if (strcmp_P(error, GET_TEXT(MSG_ERR_MAXTEMP)) == 0) {

if (strcmp_P(component, PSTR("Bed")) == 0) {
changePageOfTFT(PAGE_CHS_ABNORMAL_BED_NTC);
Expand All @@ -329,7 +329,7 @@ namespace Anycubic {
}

}
else if (strcmp_P(error, PSTR("THERMAL RUNAWAY")) == 0) {
else if (strcmp_P(error, GET_TEXT(MSG_THERMAL_RUNAWAY)) == 0) {

if (strcmp_P(component, PSTR("Bed")) == 0) {
changePageOfTFT(PAGE_CHS_ABNORMAL_BED_HEATER);
Expand All @@ -341,7 +341,7 @@ namespace Anycubic {
}

}
else if (strcmp_P(error, PSTR("Homing Failed")) == 0) {
else if (strcmp_P(error, GET_TEXT(MSG_KILL_HOMING_FAILED)) == 0) {

if (strcmp_P(component, PSTR("X")) == 0) {
changePageOfTFT(PAGE_CHS_ABNORMAL_X_ENDSTOP);
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/lcd/language/language_de.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,8 @@ namespace LanguageNarrow_de {
LSTR MSG_MESH_LOADED = _UxGT("Netz %i geladen");
LSTR MSG_MESH_SAVED = _UxGT("Netz %i gespeichert");
LSTR MSG_UBL_NO_STORAGE = _UxGT("Kein Speicher");
LSTR MSG_UBL_SAVE_ERROR = _UxGT("Err:UBL speichern");
LSTR MSG_UBL_RESTORE_ERROR = _UxGT("Err:UBL wiederherst.");
LSTR MSG_UBL_SAVE_ERROR = _UxGT("UBL speichern Error");
LSTR MSG_UBL_RESTORE_ERROR = _UxGT("UBL wiederherst. Error");
LSTR MSG_UBL_Z_OFFSET = _UxGT("Z-Versatz: ");
LSTR MSG_UBL_Z_OFFSET_STOPPED = _UxGT("Z-Versatz angehalten");
LSTR MSG_UBL_STEP_BY_STEP_MENU = _UxGT("Schrittweises UBL");
Expand Down
14 changes: 7 additions & 7 deletions Marlin/src/lcd/language/language_en.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ namespace LanguageNarrow_en {
LSTR MSG_HOME_OFFSET_Y = _UxGT("Home Offset Y");
LSTR MSG_HOME_OFFSET_Z = _UxGT("Home Offset Z");
LSTR MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets Applied");
LSTR MSG_ERR_M428_TOO_FAR = _UxGT("Err: Too far!");
LSTR MSG_ERR_M428_TOO_FAR = _UxGT("MIN/MAX Too Far");
LSTR MSG_TRAMMING_WIZARD = _UxGT("Tramming Wizard");
LSTR MSG_SELECT_ORIGIN = _UxGT("Select Origin");
LSTR MSG_LAST_VALUE_SP = _UxGT("Last value ");
Expand Down Expand Up @@ -271,8 +271,8 @@ namespace LanguageNarrow_en {
LSTR MSG_MESH_SAVED = _UxGT("Mesh %i Saved");
LSTR MSG_MESH_ACTIVE = _UxGT("Mesh %i active");
LSTR MSG_UBL_NO_STORAGE = _UxGT("No Storage");
LSTR MSG_UBL_SAVE_ERROR = _UxGT("Err: UBL Save");
LSTR MSG_UBL_RESTORE_ERROR = _UxGT("Err: UBL Restore");
LSTR MSG_UBL_SAVE_ERROR = _UxGT("UBL Save Error");
LSTR MSG_UBL_RESTORE_ERROR = _UxGT("UBL Restore Error");
LSTR MSG_UBL_Z_OFFSET = _UxGT("Z-Offset: ");
LSTR MSG_UBL_Z_OFFSET_STOPPED = _UxGT("Z-Offset Stopped");
LSTR MSG_UBL_STEP_BY_STEP_MENU = _UxGT("Step-By-Step UBL");
Expand Down Expand Up @@ -462,10 +462,10 @@ namespace LanguageNarrow_en {
LSTR MSG_LOAD_EEPROM = _UxGT("Load Settings");
LSTR MSG_RESTORE_DEFAULTS = _UxGT("Restore Defaults");
LSTR MSG_INIT_EEPROM = _UxGT("Initialize EEPROM");
LSTR MSG_ERR_EEPROM_CRC = _UxGT("Err: EEPROM CRC");
LSTR MSG_ERR_EEPROM_SIZE = _UxGT("Err: EEPROM Size");
LSTR MSG_ERR_EEPROM_VERSION = _UxGT("Err: EEPROM Version");
LSTR MSG_ERR_EEPROM_CORRUPT = _UxGT("Err: EEPROM Corrupt");
LSTR MSG_ERR_EEPROM_CRC = _UxGT("EEPROM CRC Error");
LSTR MSG_ERR_EEPROM_SIZE = _UxGT("EEPROM Size Error");
LSTR MSG_ERR_EEPROM_VERSION = _UxGT("EEPROM Version Error");
LSTR MSG_ERR_EEPROM_CORRUPT = _UxGT("EEPROM Corrupt Error");
LSTR MSG_SETTINGS_STORED = _UxGT("Settings Stored");
LSTR MSG_HAS_PREVIEW = _UxGT("Has preview");
LSTR MSG_RESET_PRINTER = _UxGT("Reset Printer");
Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/lcd/language/language_es.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,9 +312,9 @@ namespace LanguageNarrow_es {
LSTR MSG_LOAD_EEPROM = _UxGT("Cargar EEPROM");
LSTR MSG_RESTORE_DEFAULTS = _UxGT("Rest. fábrica");
LSTR MSG_INIT_EEPROM = _UxGT("Inicializar EEPROM");
LSTR MSG_ERR_EEPROM_CRC = _UxGT("Err: EEPROM CRC");
LSTR MSG_ERR_EEPROM_SIZE = _UxGT("Err: EEPROM Tamaño");
LSTR MSG_ERR_EEPROM_VERSION = _UxGT("Err: Versión EEPROM");
LSTR MSG_ERR_EEPROM_CRC = _UxGT("EEPROM CRC Error");
LSTR MSG_ERR_EEPROM_SIZE = _UxGT("EEPROM Tamaño Error");
LSTR MSG_ERR_EEPROM_VERSION = _UxGT("Versión EEPROM Error");
LSTR MSG_MEDIA_UPDATE = _UxGT("Actualizar SD/FD");
LSTR MSG_RESET_PRINTER = _UxGT("Resetear Impresora");
LSTR MSG_REFRESH = LCD_STR_REFRESH _UxGT("Recargar");
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_eu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,8 @@ namespace LanguageNarrow_eu {
LSTR MSG_BABYSTEP_Z = _UxGT("Mikro-urratsa Z");
LSTR MSG_BABYSTEP_N = _UxGT("Mikro-urratsa @");
LSTR MSG_ENDSTOP_ABORT = _UxGT("Endstop deusezta.");
LSTR MSG_HEATING_FAILED_LCD = _UxGT("Err: Beroketa");
LSTR MSG_ERR_REDUNDANT_TEMP = _UxGT("Err: Tenperatura");
LSTR MSG_HEATING_FAILED_LCD = _UxGT("Beroketa Error");
LSTR MSG_THERMAL_RUNAWAY = _UxGT("TENP. KONTROL EZA");
LSTR MSG_ERR_MAXTEMP = _UxGT("Err: Tenp Maximoa");
LSTR MSG_ERR_MINTEMP = _UxGT("Err: Tenp Minimoa");
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/lcd/language/language_fr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ namespace LanguageNarrow_fr {
LSTR MSG_MESH_LOADED = _UxGT("Grille %i chargée");
LSTR MSG_MESH_SAVED = _UxGT("Grille %i enreg.");
LSTR MSG_UBL_NO_STORAGE = _UxGT("Pas de mémoire");
LSTR MSG_UBL_SAVE_ERROR = _UxGT("Err: Enreg. UBL");
LSTR MSG_UBL_RESTORE_ERROR = _UxGT("Err: Ouvrir UBL");
LSTR MSG_UBL_SAVE_ERROR = _UxGT("Enreg. UBL Error");
LSTR MSG_UBL_RESTORE_ERROR = _UxGT("Ouvrir UBL Error");
LSTR MSG_UBL_Z_OFFSET = _UxGT("Z-Offset: ");
LSTR MSG_UBL_Z_OFFSET_STOPPED = _UxGT("Décal. Z arrêté");
LSTR MSG_UBL_STEP_BY_STEP_MENU = _UxGT("Assistant UBL");
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/lcd/language/language_fr_na.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ namespace LanguageNarrow_fr_na {
LSTR MSG_MESH_LOADED = _UxGT("Grille %i chargee");
LSTR MSG_MESH_SAVED = _UxGT("Grille %i enreg.");
LSTR MSG_UBL_NO_STORAGE = _UxGT("Pas de memoire");
LSTR MSG_UBL_SAVE_ERROR = _UxGT("Err: Enreg. UBL");
LSTR MSG_UBL_RESTORE_ERROR = _UxGT("Err: Ouvrir UBL");
LSTR MSG_UBL_SAVE_ERROR = _UxGT("Enreg. UBL Error");
LSTR MSG_UBL_RESTORE_ERROR = _UxGT("Ouvrir UBL Error");
LSTR MSG_UBL_Z_OFFSET = _UxGT("Z-Offset: ");
LSTR MSG_UBL_Z_OFFSET_STOPPED = _UxGT("Decal. Z arrete");
LSTR MSG_UBL_STEP_BY_STEP_MENU = _UxGT("Assistant UBL");
Expand Down
14 changes: 7 additions & 7 deletions Marlin/src/lcd/language/language_it.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ namespace LanguageNarrow_it {
LSTR MSG_HOME_OFFSET_Y = _UxGT("Offset home Y");
LSTR MSG_HOME_OFFSET_Z = _UxGT("Offset home Z");
LSTR MSG_HOME_OFFSETS_APPLIED = _UxGT("Offset applicato");
LSTR MSG_ERR_M428_TOO_FAR = _UxGT("Err: Troppo lontano!");
LSTR MSG_ERR_M428_TOO_FAR = _UxGT("Troppo lontano! Error");
LSTR MSG_TRAMMING_WIZARD = _UxGT("Wizard Tramming");
LSTR MSG_SELECT_ORIGIN = _UxGT("Selez. origine");
LSTR MSG_LAST_VALUE_SP = _UxGT("Ultimo valore ");
Expand Down Expand Up @@ -259,8 +259,8 @@ namespace LanguageNarrow_it {
LSTR MSG_MESH_SAVED = _UxGT("Mesh %i salvata");
LSTR MSG_MESH_ACTIVE = _UxGT("Mesh %i attiva");
LSTR MSG_UBL_NO_STORAGE = _UxGT("Nessuna memoria");
LSTR MSG_UBL_SAVE_ERROR = _UxGT("Err: Salvataggio UBL");
LSTR MSG_UBL_RESTORE_ERROR = _UxGT("Err: Ripristino UBL");
LSTR MSG_UBL_SAVE_ERROR = _UxGT("Salvataggio UBL Error");
LSTR MSG_UBL_RESTORE_ERROR = _UxGT("Ripristino UBL Error");
LSTR MSG_UBL_Z_OFFSET = _UxGT("Z-Offset: ");
LSTR MSG_UBL_Z_OFFSET_STOPPED = _UxGT("Z-Offset Fermato");
LSTR MSG_UBL_STEP_BY_STEP_MENU = _UxGT("UBL passo passo");
Expand Down Expand Up @@ -443,10 +443,10 @@ namespace LanguageNarrow_it {
LSTR MSG_LOAD_EEPROM = _UxGT("Carica impostazioni");
LSTR MSG_RESTORE_DEFAULTS = _UxGT("Ripristina imp.");
LSTR MSG_INIT_EEPROM = _UxGT("Inizializza EEPROM");
LSTR MSG_ERR_EEPROM_CRC = _UxGT("Err: CRC EEPROM");
LSTR MSG_ERR_EEPROM_SIZE = _UxGT("Err: Dimens.EEPROM");
LSTR MSG_ERR_EEPROM_VERSION = _UxGT("Err: Versione EEPROM");
LSTR MSG_ERR_EEPROM_CORRUPT = _UxGT("Err: EEPROM corrotta");
LSTR MSG_ERR_EEPROM_CRC = _UxGT("CRC EEPROM Error");
LSTR MSG_ERR_EEPROM_SIZE = _UxGT("Dimens.EEPROM Error");
LSTR MSG_ERR_EEPROM_VERSION = _UxGT("Versione EEPROM Error");
LSTR MSG_ERR_EEPROM_CORRUPT = _UxGT("EEPROM corrotta Error");
LSTR MSG_SETTINGS_STORED = _UxGT("Impostazioni mem.");
LSTR MSG_MEDIA_UPDATE = _UxGT("Aggiorna media");
LSTR MSG_RESET_PRINTER = _UxGT("Resetta stampante");
Expand Down
10 changes: 5 additions & 5 deletions Marlin/src/lcd/language/language_ro.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ namespace LanguageNarrow_ro {
LSTR MSG_MESH_LOADED = _UxGT("Mesh %i Loaded");
LSTR MSG_MESH_SAVED = _UxGT("Mesh %i Saved");
LSTR MSG_UBL_NO_STORAGE = _UxGT("No Storage");
LSTR MSG_UBL_SAVE_ERROR = _UxGT("Err: UBL Save");
LSTR MSG_UBL_RESTORE_ERROR = _UxGT("Err: UBL Restore");
LSTR MSG_UBL_SAVE_ERROR = _UxGT("UBL Save Error");
LSTR MSG_UBL_RESTORE_ERROR = _UxGT("UBL Restore Error");
LSTR MSG_UBL_Z_OFFSET = _UxGT("Z-Offset: ");
LSTR MSG_UBL_Z_OFFSET_STOPPED = _UxGT("Z-Offset Stopped");
LSTR MSG_UBL_STEP_BY_STEP_MENU = _UxGT("Step-By-Step UBL");
Expand Down Expand Up @@ -315,9 +315,9 @@ namespace LanguageNarrow_ro {
LSTR MSG_LOAD_EEPROM = _UxGT("Load Settings");
LSTR MSG_RESTORE_DEFAULTS = _UxGT("Restore Defaults");
LSTR MSG_INIT_EEPROM = _UxGT("Initialize EEPROM");
LSTR MSG_ERR_EEPROM_CRC = _UxGT("Err: EEPROM CRC");
LSTR MSG_ERR_EEPROM_SIZE = _UxGT("Err: Mărimea EEPROM");
LSTR MSG_ERR_EEPROM_VERSION = _UxGT("Err: Versiunea EEPROM");
LSTR MSG_ERR_EEPROM_CRC = _UxGT("EEPROM CRC Error");
LSTR MSG_ERR_EEPROM_SIZE = _UxGT("Mărimea EEPROM Error");
LSTR MSG_ERR_EEPROM_VERSION = _UxGT("Versiunea EEPROM Error");
LSTR MSG_SETTINGS_STORED = _UxGT("Settings Stored");
LSTR MSG_MEDIA_UPDATE = _UxGT("Media Update");
LSTR MSG_RESET_PRINTER = _UxGT("Reset Imprimanta");
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/lcd/language/language_zh_CN.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ namespace LanguageNarrow_zh_CN {
LSTR MSG_MESH_LOADED = _UxGT("网格 %i 已装载"); // "Mesh %i loaded"
LSTR MSG_MESH_SAVED = _UxGT("网格 %i 已保存"); // "Mesh %i saved"
LSTR MSG_UBL_NO_STORAGE = _UxGT("没有存储"); // "No storage"
LSTR MSG_UBL_SAVE_ERROR = _UxGT("错误: UBL保存"); // "Err: UBL Save"
LSTR MSG_UBL_RESTORE_ERROR = _UxGT("错误: UBL还原"); // "Err: UBL Restore"
LSTR MSG_UBL_SAVE_ERROR = _UxGT("错误: UBL保存"); // "UBL Save Error"
LSTR MSG_UBL_RESTORE_ERROR = _UxGT("错误: UBL还原"); // "UBL Restore Error"
LSTR MSG_UBL_Z_OFFSET = _UxGT("Z偏移量: ");
LSTR MSG_UBL_Z_OFFSET_STOPPED = _UxGT("Z偏移已停止"); // "Z-Offset Stopped"
LSTR MSG_UBL_STEP_BY_STEP_MENU = _UxGT("一步步UBL"); // "Step-By-Step UBL"
Expand Down
8 changes: 4 additions & 4 deletions Marlin/src/lcd/language/language_zh_TW.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@ namespace LanguageNarrow_zh_TW {
LSTR MSG_MESH_LOADED = _UxGT("網格 %i 已裝載"); // "Mesh %i loaded"
LSTR MSG_MESH_SAVED = _UxGT("網格 %i 已保存"); // "Mesh %i saved"
LSTR MSG_UBL_NO_STORAGE = _UxGT("沒有存儲"); // "No storage"
LSTR MSG_UBL_SAVE_ERROR = _UxGT("錯誤: UBL保存"); // "Err: UBL Save"
LSTR MSG_UBL_RESTORE_ERROR = _UxGT("錯誤: UBL還原"); // "Err: UBL Restore"
LSTR MSG_UBL_SAVE_ERROR = _UxGT("錯誤: UBL保存"); // "UBL Save Error"
LSTR MSG_UBL_RESTORE_ERROR = _UxGT("錯誤: UBL還原"); // "UBL Restore Error"
LSTR MSG_UBL_Z_OFFSET = _UxGT("Z-偏移:"); // "Z-Offset: "
LSTR MSG_UBL_Z_OFFSET_STOPPED = _UxGT("Z偏移已停止"); // "Z-Offset Stopped"
LSTR MSG_UBL_STEP_BY_STEP_MENU = _UxGT("一步步UBL"); // "Step-By-Step UBL"
Expand Down Expand Up @@ -296,8 +296,8 @@ namespace LanguageNarrow_zh_TW {
LSTR MSG_LOAD_EEPROM = _UxGT("載入設置"); // "Load memory"
LSTR MSG_RESTORE_DEFAULTS = _UxGT("恢復安全值"); // "Restore failsafe"
LSTR MSG_INIT_EEPROM = _UxGT("初始化設置"); // "Initialize EEPROM"
LSTR MSG_ERR_EEPROM_CRC = _UxGT("錯誤: EEPROM CRC"); // "Err: EEPROM CRC"
LSTR MSG_ERR_EEPROM_SIZE = _UxGT("錯誤: EEPROM 尺寸"); // "Err: EEPROM Index"
LSTR MSG_ERR_EEPROM_CRC = _UxGT("錯誤: EEPROM CRC"); // "EEPROM CRC Error"
LSTR MSG_ERR_EEPROM_SIZE = _UxGT("錯誤: EEPROM 尺寸"); // "EEPROM Index Error"
LSTR MSG_ERR_EEPROM_VERSION = _UxGT("錯誤: EEPROM 版本"); // "EEPROM Version"
LSTR MSG_MEDIA_UPDATE = _UxGT("媒體更新"); // "Media Update"
LSTR MSG_RESET_PRINTER = _UxGT("重置打印機"); // "Reset Printer
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/module/probe.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ bool Probe::set_deployed(const bool deploy, const bool no_return/*=false*/) {
if (PROBE_TRIGGERED() == deploy) { // Unchanged after deploy/stow action?
if (IsRunning()) {
SERIAL_ERROR_MSG("Z-Probe failed");
LCD_ALERTMESSAGE_F("Err: ZPROBE");
LCD_ALERTMESSAGE_F("ZPROBE Error");
}
stop();
return true;
Expand Down

0 comments on commit 60081b1

Please sign in to comment.