0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

🩹 No GET_TEXT with DGUS_TFT

Browse source 
Followup to #26164
This commit is contained in:
Scott Lahteine 2023-10-23 18:54:11 -05:00
parent fd62c42faa
commit ff5eb5de29
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Marlin/src/lcd/extui/anycubic_vyper/dgus_tft.cpp
View file

@ -276,6 +276,9 @@ namespace Anycubic {
return stringLength; return stringLength;
} }
#undef GET_TEXT
#define GET_TEXT(MSG) Language_en::MSG
void DgusTFT::printerKilled(FSTR_P error_p, FSTR_P component_p) { void DgusTFT::printerKilled(FSTR_P error_p, FSTR_P component_p) {
// copy string in FLASH to RAM for strcmp_P // copy string in FLASH to RAM for strcmp_P
@ -293,9 +296,9 @@ namespace Anycubic {
DEBUG_ECHOLNPGM("printerKilled()\nerror: ", error, "\ncomponent: ", component); DEBUG_ECHOLNPGM("printerKilled()\nerror: ", error, "\ncomponent: ", component);
#endif #endif
if (strcmp_P(error, Language_en::MSG_ERR_HEATING_FAILED) == 0) { if (strcmp_P(error, GET_TEXT(MSG_ERR_HEATING_FAILED)) == 0) {
if (strcmp_P(component, Language_en::MSG_BED) == 0) { if (strcmp_P(component, GET_TEXT(MSG_BED)) == 0) {
changePageOfTFT(PAGE_CHS_ABNORMAL_BED_HEATER); changePageOfTFT(PAGE_CHS_ABNORMAL_BED_HEATER);
SERIAL_ECHOLNPGM("Check Bed heater"); SERIAL_ECHOLNPGM("Check Bed heater");
} }
@ -305,9 +308,9 @@ namespace Anycubic {
} }
} }
else if (strcmp_P(error, Language_en::MSG_ERR_MINTEMP) == 0) { else if (strcmp_P(error, GET_TEXT(MSG_ERR_MINTEMP)) == 0) {
if (strcmp_P(component, Language_en::MSG_BED) == 0) { if (strcmp_P(component, GET_TEXT(MSG_BED)) == 0) {
changePageOfTFT(PAGE_CHS_ABNORMAL_BED_NTC); changePageOfTFT(PAGE_CHS_ABNORMAL_BED_NTC);
SERIAL_ECHOLNPGM("Check Bed thermistor"); SERIAL_ECHOLNPGM("Check Bed thermistor");
} }
@ -317,9 +320,9 @@ namespace Anycubic {
} }
} }
else if (strcmp_P(error, Language_en::MSG_ERR_MAXTEMP) == 0) { else if (strcmp_P(error, GET_TEXT(MSG_ERR_MAXTEMP)) == 0) {
if (strcmp_P(component, Language_en::MSG_BED) == 0) { if (strcmp_P(component, GET_TEXT(MSG_BED)) == 0) {
changePageOfTFT(PAGE_CHS_ABNORMAL_BED_NTC); changePageOfTFT(PAGE_CHS_ABNORMAL_BED_NTC);
SERIAL_ECHOLNPGM("Check Bed thermistor"); SERIAL_ECHOLNPGM("Check Bed thermistor");
} }
@ -329,9 +332,9 @@ namespace Anycubic {
} }
} }
else if (strcmp_P(error, Language_en::MSG_ERR_THERMAL_RUNAWAY) == 0) { else if (strcmp_P(error, GET_TEXT(MSG_ERR_THERMAL_RUNAWAY)) == 0) {
if (strcmp_P(component, Language_en::MSG_BED) == 0) { if (strcmp_P(component, GET_TEXT(MSG_BED)) == 0) {
changePageOfTFT(PAGE_CHS_ABNORMAL_BED_HEATER); changePageOfTFT(PAGE_CHS_ABNORMAL_BED_HEATER);
SERIAL_ECHOLNPGM("Check Bed thermal runaway"); SERIAL_ECHOLNPGM("Check Bed thermal runaway");
} }
@ -341,7 +344,7 @@ namespace Anycubic {
} }
} }
else if (strcmp_P(error, Language_en::MSG_KILL_HOMING_FAILED) == 0) { else if (strcmp_P(error, GET_TEXT(MSG_KILL_HOMING_FAILED)) == 0) {
if (strcmp_P(component, PSTR("X")) == 0) { if (strcmp_P(component, PSTR("X")) == 0) {
changePageOfTFT(PAGE_CHS_ABNORMAL_X_ENDSTOP); changePageOfTFT(PAGE_CHS_ABNORMAL_X_ENDSTOP);