From 42f2a6141624e065fa6be81c88c5d1e05d5f4292 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 18:46:02 +0100 Subject: [PATCH] Lang - text "TRIGGERED" removed from dictionary --- Firmware/Marlin_main.cpp | 12 ++++++------ Firmware/messages.c | 2 +- Firmware/messages.h | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 10 files changed, 8 insertions(+), 35 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index e87eb911..7358fdbc 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5779,7 +5779,7 @@ Sigma_Exit: #if defined(X_MIN_PIN) && X_MIN_PIN > -1 SERIAL_PROTOCOLRPGM(_n("x_min: "));////MSG_X_MIN c=0 r=0 if(READ(X_MIN_PIN)^X_MIN_ENDSTOP_INVERTING){ - SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT)); + SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_HIT); }else{ SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); } @@ -5788,7 +5788,7 @@ Sigma_Exit: #if defined(X_MAX_PIN) && X_MAX_PIN > -1 SERIAL_PROTOCOLRPGM(_n("x_max: "));////MSG_X_MAX c=0 r=0 if(READ(X_MAX_PIN)^X_MAX_ENDSTOP_INVERTING){ - SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT)); + SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_HIT); }else{ SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); } @@ -5797,7 +5797,7 @@ Sigma_Exit: #if defined(Y_MIN_PIN) && Y_MIN_PIN > -1 SERIAL_PROTOCOLRPGM(_n("y_min: "));////MSG_Y_MIN c=0 r=0 if(READ(Y_MIN_PIN)^Y_MIN_ENDSTOP_INVERTING){ - SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT)); + SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_HIT); }else{ SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); } @@ -5806,7 +5806,7 @@ Sigma_Exit: #if defined(Y_MAX_PIN) && Y_MAX_PIN > -1 SERIAL_PROTOCOLRPGM(_n("y_max: "));////MSG_Y_MAX c=0 r=0 if(READ(Y_MAX_PIN)^Y_MAX_ENDSTOP_INVERTING){ - SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT)); + SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_HIT); }else{ SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); } @@ -5815,7 +5815,7 @@ Sigma_Exit: #if defined(Z_MIN_PIN) && Z_MIN_PIN > -1 SERIAL_PROTOCOLRPGM(MSG_Z_MIN); if(READ(Z_MIN_PIN)^Z_MIN_ENDSTOP_INVERTING){ - SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT)); + SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_HIT); }else{ SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); } @@ -5824,7 +5824,7 @@ Sigma_Exit: #if defined(Z_MAX_PIN) && Z_MAX_PIN > -1 SERIAL_PROTOCOLRPGM(MSG_Z_MAX); if(READ(Z_MAX_PIN)^Z_MAX_ENDSTOP_INVERTING){ - SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT)); + SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_HIT); }else{ SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); } diff --git a/Firmware/messages.c b/Firmware/messages.c index f8a10342..4cac4f2d 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -25,7 +25,6 @@ const char MSG_CRASH_DETECTED[] PROGMEM_I1 = ISTR("Crash detected."); ////c=20 r const char MSG_CRASHDETECT_NA[] PROGMEM_I1 = ISTR("Crash det. [N/A]"); ////c=0 r=0 const char MSG_CRASHDETECT_OFF[] PROGMEM_I1 = ISTR("Crash det. [off]"); ////c=0 r=0 const char MSG_CRASHDETECT_ON[] PROGMEM_I1 = ISTR("Crash det. [on]"); ////c=0 r=0 -const char MSG_ENDSTOP_HIT[] PROGMEM_I1 = ISTR("TRIGGERED"); ////c=0 r=0 const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); ////c=0 r=0 const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 r=1 const char MSG_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////c=17 r=1 @@ -122,3 +121,4 @@ const char MSG_SD_OPEN_FILE_FAIL[] PROGMEM_N1 = "open failed, File: "; ////c=0 r const char MSG_ENDSTOP_OPEN[] PROGMEM_N1 = "open"; ////c=0 r=0 const char MSG_POWERUP[] PROGMEM_N1 = "PowerUp"; ////c=0 r=0 const char MSG_ERR_STOPPED[] PROGMEM_N1 = "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"; ////c=0 r=0 +const char MSG_ENDSTOP_HIT[] PROGMEM_N1 = "TRIGGERED"; ////c=0 r=0 diff --git a/Firmware/messages.h b/Firmware/messages.h index d910d485..ce6ecdd7 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -26,7 +26,6 @@ extern const char MSG_CRASH_DETECTED[]; extern const char MSG_CRASHDETECT_NA[]; extern const char MSG_CRASHDETECT_OFF[]; extern const char MSG_CRASHDETECT_ON[]; -extern const char MSG_ENDSTOP_HIT[]; extern const char MSG_ERROR[]; extern const char MSG_EXTRUDER[]; extern const char MSG_FILAMENT[]; @@ -123,6 +122,7 @@ extern const char MSG_SD_OPEN_FILE_FAIL[]; extern const char MSG_ENDSTOP_OPEN[]; extern const char MSG_POWERUP[]; extern const char MSG_ERR_STOPPED[]; +extern const char MSG_ENDSTOP_HIT[]; #if defined(__cplusplus) } diff --git a/lang/lang_en.txt b/lang/lang_en.txt index d05b9a7e..1a95cc71 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -859,9 +859,6 @@ # "Total print time" -#MSG_ENDSTOP_HIT c=0 r=0 -"TRIGGERED" - #MSG_TUNE c=0 r=0 "Tune" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index d38ffb8e..12334326 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1146,10 +1146,6 @@ "Total print time" "Celkovy cas tisku" -#MSG_ENDSTOP_HIT c=0 r=0 -"TRIGGERED" -"AKTIVNI" - #MSG_TUNE c=0 r=0 "Tune" "Ladit" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 6c3d95f7..f5d77702 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1146,10 +1146,6 @@ "Total print time" "Gesamte Druckzeit" -#MSG_ENDSTOP_HIT c=0 r=0 -"TRIGGERED" -"AUSGELOEST" - #MSG_TUNE c=0 r=0 "Tune" "Feineinstellung" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index dc28f3a3..cc309600 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1146,10 +1146,6 @@ "Total print time" "Tiempo total :" -#MSG_ENDSTOP_HIT c=0 r=0 -"TRIGGERED" -"ACTIVADO" - #MSG_TUNE c=0 r=0 "Tune" "Ajustar" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 42f7d13c..626e1813 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1146,10 +1146,6 @@ "Total print time" "Temps total" -#MSG_ENDSTOP_HIT c=0 r=0 -"TRIGGERED" -"ACTIVE" - #MSG_TUNE c=0 r=0 "Tune" "Regler" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 56c1e86f..c0981a42 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1146,10 +1146,6 @@ "Total print time" "Tempo di stampa totale" -#MSG_ENDSTOP_HIT c=0 r=0 -"TRIGGERED" -"ATTIVATO" - #MSG_TUNE c=0 r=0 "Tune" "Regola" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 252960a1..0a8b9670 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1146,10 +1146,6 @@ "Total print time" "Calkowity czas druku" -#MSG_ENDSTOP_HIT c=0 r=0 -"TRIGGERED" -"AKTYWOWANO" - #MSG_TUNE c=0 r=0 "Tune" "Strojenie"