From 9f86a334c6302246198dffe9b95550b460f2868f Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 17:53:51 +0100 Subject: [PATCH] Lang - text "endstops hit: " removed from dictionary --- Firmware/messages.c | 2 +- Firmware/messages.h | 4 ++-- Firmware/stepper.cpp | 8 ++++---- 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, 7 insertions(+), 34 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 66b90f1f..d62a962a 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -27,7 +27,6 @@ const char MSG_CRASHDETECT_OFF[] PROGMEM_I1 = ISTR("Crash det. [off]"); ////c=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_ENDSTOP_OPEN[] PROGMEM_I1 = ISTR("open"); ////c=0 r=0 -const char MSG_ENDSTOPS_HIT[] PROGMEM_I1 = ISTR("endstops hit: "); ////c=0 r=0 const char MSG_ERR_STOPPED[] PROGMEM_I1 = ISTR("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_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); ////c=0 r=0 const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 r=1 @@ -122,3 +121,4 @@ const char MSG_ZPROBE_OUT[] PROGMEM_N1 = "Z probe out. bed"; ////c=0 r=0 const char MSG_ZPROBE_ZOFFSET[] PROGMEM_N1 = "Z Offset"; ////c=0 r=0 const char MSG_TMC_OVERTEMP[] PROGMEM_N1 = "TMC DRIVER OVERTEMP"; ////c=0 r=0 const char MSG_Enqueing[] PROGMEM_N1 = "enqueing \""; ////c=0 r=0 +const char MSG_ENDSTOPS_HIT[] PROGMEM_N1 = "endstops hit: "; ////c=0 r=0 diff --git a/Firmware/messages.h b/Firmware/messages.h index 3b8ca18b..ff1f2a5b 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -28,8 +28,6 @@ extern const char MSG_CRASHDETECT_OFF[]; extern const char MSG_CRASHDETECT_ON[]; extern const char MSG_ENDSTOP_HIT[]; extern const char MSG_ENDSTOP_OPEN[]; -extern const char MSG_ENDSTOPS_HIT[]; -extern const char MSG_Enqueing[]; extern const char MSG_ERR_STOPPED[]; extern const char MSG_ERROR[]; extern const char MSG_EXTRUDER[]; @@ -123,6 +121,8 @@ extern const char MSG_Z_MIN[]; extern const char MSG_ZPROBE_OUT[]; extern const char MSG_ZPROBE_ZOFFSET[]; extern const char MSG_TMC_OVERTEMP[]; +extern const char MSG_Enqueing[]; +extern const char MSG_ENDSTOPS_HIT[]; #if defined(__cplusplus) } diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index cba50f77..589a7b07 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -228,18 +228,18 @@ void checkHitEndstops() { if( endstop_x_hit || endstop_y_hit || endstop_z_hit) { SERIAL_ECHO_START; - SERIAL_ECHORPGM(_T(MSG_ENDSTOPS_HIT)); + SERIAL_ECHORPGM(MSG_ENDSTOPS_HIT); if(endstop_x_hit) { SERIAL_ECHOPAIR(" X:",(float)endstops_trigsteps[X_AXIS]/cs.axis_steps_per_unit[X_AXIS]); -// LCD_MESSAGERPGM(CAT2(_T(MSG_ENDSTOPS_HIT), PSTR("X"))); +// LCD_MESSAGERPGM(CAT2((MSG_ENDSTOPS_HIT), PSTR("X"))); } if(endstop_y_hit) { SERIAL_ECHOPAIR(" Y:",(float)endstops_trigsteps[Y_AXIS]/cs.axis_steps_per_unit[Y_AXIS]); -// LCD_MESSAGERPGM(CAT2(_T(MSG_ENDSTOPS_HIT), PSTR("Y"))); +// LCD_MESSAGERPGM(CAT2((MSG_ENDSTOPS_HIT), PSTR("Y"))); } if(endstop_z_hit) { SERIAL_ECHOPAIR(" Z:",(float)endstops_trigsteps[Z_AXIS]/cs.axis_steps_per_unit[Z_AXIS]); -// LCD_MESSAGERPGM(CAT2(_T(MSG_ENDSTOPS_HIT),PSTR("Z"))); +// LCD_MESSAGERPGM(CAT2((MSG_ENDSTOPS_HIT),PSTR("Z"))); } SERIAL_ECHOLN(""); endstop_x_hit=false; diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 5301625f..a0ff1ef5 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -196,9 +196,6 @@ #MSG_SELFTEST_ENDSTOP c=0 r=0 "Endstop" -#MSG_ENDSTOPS_HIT c=0 r=0 -"endstops hit: " - #MSG_SELFTEST_ENDSTOPS c=0 r=0 "Endstops" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index b69463b1..bd4e551e 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -262,10 +262,6 @@ "Endstop" "Koncovy spinac" -#MSG_ENDSTOPS_HIT c=0 r=0 -"endstops hit: " -"konc. spinace aktivovany: " - #MSG_SELFTEST_ENDSTOPS c=0 r=0 "Endstops" "Konc. spinace" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 3c34bcc7..859a89b6 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -262,10 +262,6 @@ "Endstop" "Endanschlag" -#MSG_ENDSTOPS_HIT c=0 r=0 -"endstops hit: " -"Endanschlag erreicht: " - #MSG_SELFTEST_ENDSTOPS c=0 r=0 "Endstops" "Endschalter" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 41cc4062..f7aede00 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -262,10 +262,6 @@ "Endstop" "\x00" -#MSG_ENDSTOPS_HIT c=0 r=0 -"endstops hit: " -"endstops golpean: " - #MSG_SELFTEST_ENDSTOPS c=0 r=0 "Endstops" "\x00" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index cd48666c..895b6bfd 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -262,10 +262,6 @@ "Endstop" "Butee" -#MSG_ENDSTOPS_HIT c=0 r=0 -"endstops hit: " -"butees atteintes :" - #MSG_SELFTEST_ENDSTOPS c=0 r=0 "Endstops" "Butees" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index dc514674..ade5148a 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -262,10 +262,6 @@ "Endstop" "Finecorsa" -#MSG_ENDSTOPS_HIT c=0 r=0 -"endstops hit: " -"finecorsa colpito: " - #MSG_SELFTEST_ENDSTOPS c=0 r=0 "Endstops" "Finecorsa" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index a594abc9..39ce8bbc 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -262,10 +262,6 @@ "Endstop" "Krancowka" -#MSG_ENDSTOPS_HIT c=0 r=0 -"endstops hit: " -"krancowki aktywowane:" - #MSG_SELFTEST_ENDSTOPS c=0 r=0 "Endstops" "Krancowki"