🩹 No GET_TEXT with DGUS_TFT

Followup to MarlinFirmware#26164
EvilGremlin · Oct 26, 2023 · d4de811 · d4de811
1 parent 8d93e15
commit d4de811
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/Marlin/src/lcd/extui/anycubic_vyper/dgus_tft.cpp b/Marlin/src/lcd/extui/anycubic_vyper/dgus_tft.cpp
@@ -276,6 +276,9 @@ namespace Anycubic {
     return stringLength;
   }
 
+  #undef GET_TEXT
+  #define GET_TEXT(MSG) Language_en::MSG
+
   void DgusTFT::printerKilled(FSTR_P error_p, FSTR_P component_p) {
 
     // copy string in FLASH to RAM for strcmp_P
@@ -293,9 +296,9 @@ namespace Anycubic {
       DEBUG_ECHOLNPGM("printerKilled()\nerror: ", error, "\ncomponent: ", component);
     #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);
         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);
         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);
         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);
         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) {
         changePageOfTFT(PAGE_CHS_ABNORMAL_X_ENDSTOP);