Browse Source

Lang - text "open" removed from dictionary

Robert Pelnar 6 years ago
parent
commit
1cbb261707

+ 6 - 6
Firmware/Marlin_main.cpp

@@ -5781,7 +5781,7 @@ Sigma_Exit:
         if(READ(X_MIN_PIN)^X_MIN_ENDSTOP_INVERTING){
         if(READ(X_MIN_PIN)^X_MIN_ENDSTOP_INVERTING){
           SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT));
           SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT));
         }else{
         }else{
-          SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_OPEN));
+          SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN);
         }
         }
         SERIAL_PROTOCOLLN("");
         SERIAL_PROTOCOLLN("");
       #endif
       #endif
@@ -5790,7 +5790,7 @@ Sigma_Exit:
         if(READ(X_MAX_PIN)^X_MAX_ENDSTOP_INVERTING){
         if(READ(X_MAX_PIN)^X_MAX_ENDSTOP_INVERTING){
           SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT));
           SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT));
         }else{
         }else{
-          SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_OPEN));
+          SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN);
         }
         }
         SERIAL_PROTOCOLLN("");
         SERIAL_PROTOCOLLN("");
       #endif
       #endif
@@ -5799,7 +5799,7 @@ Sigma_Exit:
         if(READ(Y_MIN_PIN)^Y_MIN_ENDSTOP_INVERTING){
         if(READ(Y_MIN_PIN)^Y_MIN_ENDSTOP_INVERTING){
           SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT));
           SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT));
         }else{
         }else{
-          SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_OPEN));
+          SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN);
         }
         }
         SERIAL_PROTOCOLLN("");
         SERIAL_PROTOCOLLN("");
       #endif
       #endif
@@ -5808,7 +5808,7 @@ Sigma_Exit:
         if(READ(Y_MAX_PIN)^Y_MAX_ENDSTOP_INVERTING){
         if(READ(Y_MAX_PIN)^Y_MAX_ENDSTOP_INVERTING){
           SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT));
           SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT));
         }else{
         }else{
-          SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_OPEN));
+          SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN);
         }
         }
         SERIAL_PROTOCOLLN("");
         SERIAL_PROTOCOLLN("");
       #endif
       #endif
@@ -5817,7 +5817,7 @@ Sigma_Exit:
         if(READ(Z_MIN_PIN)^Z_MIN_ENDSTOP_INVERTING){
         if(READ(Z_MIN_PIN)^Z_MIN_ENDSTOP_INVERTING){
           SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT));
           SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT));
         }else{
         }else{
-          SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_OPEN));
+          SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN);
         }
         }
         SERIAL_PROTOCOLLN("");
         SERIAL_PROTOCOLLN("");
       #endif
       #endif
@@ -5826,7 +5826,7 @@ Sigma_Exit:
         if(READ(Z_MAX_PIN)^Z_MAX_ENDSTOP_INVERTING){
         if(READ(Z_MAX_PIN)^Z_MAX_ENDSTOP_INVERTING){
           SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT));
           SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT));
         }else{
         }else{
-          SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_OPEN));
+          SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN);
         }
         }
         SERIAL_PROTOCOLLN("");
         SERIAL_PROTOCOLLN("");
       #endif
       #endif

+ 1 - 1
Firmware/messages.c

@@ -26,7 +26,6 @@ const char MSG_CRASHDETECT_NA[] PROGMEM_I1 = ISTR("Crash det.  [N/A]"); ////c=0
 const char MSG_CRASHDETECT_OFF[] PROGMEM_I1 = ISTR("Crash det.  [off]"); ////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_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_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_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_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_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); ////c=0 r=0
 const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 r=1
 const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 r=1
@@ -122,3 +121,4 @@ const char MSG_ENDSTOPS_HIT[] PROGMEM_N1 = "endstops hit: "; ////c=0 r=0
 const char MSG_SD_ERR_WRITE_TO_FILE[] PROGMEM_N1 = "error writing to file"; ////c=0 r=0
 const char MSG_SD_ERR_WRITE_TO_FILE[] PROGMEM_N1 = "error writing to file"; ////c=0 r=0
 const char MSG_OK[] PROGMEM_N1 = "ok"; ////c=0 r=0
 const char MSG_OK[] PROGMEM_N1 = "ok"; ////c=0 r=0
 const char MSG_SD_OPEN_FILE_FAIL[] PROGMEM_N1 = "open failed, File: "; ////c=0 r=0
 const char MSG_SD_OPEN_FILE_FAIL[] PROGMEM_N1 = "open failed, File: "; ////c=0 r=0
+const char MSG_ENDSTOP_OPEN[] PROGMEM_N1 = "open"; ////c=0 r=0

+ 1 - 1
Firmware/messages.h

@@ -27,7 +27,6 @@ extern const char MSG_CRASHDETECT_NA[];
 extern const char MSG_CRASHDETECT_OFF[];
 extern const char MSG_CRASHDETECT_OFF[];
 extern const char MSG_CRASHDETECT_ON[];
 extern const char MSG_CRASHDETECT_ON[];
 extern const char MSG_ENDSTOP_HIT[];
 extern const char MSG_ENDSTOP_HIT[];
-extern const char MSG_ENDSTOP_OPEN[];
 extern const char MSG_ERR_STOPPED[];
 extern const char MSG_ERR_STOPPED[];
 extern const char MSG_ERROR[];
 extern const char MSG_ERROR[];
 extern const char MSG_EXTRUDER[];
 extern const char MSG_EXTRUDER[];
@@ -123,6 +122,7 @@ extern const char MSG_ENDSTOPS_HIT[];
 extern const char MSG_SD_ERR_WRITE_TO_FILE[];
 extern const char MSG_SD_ERR_WRITE_TO_FILE[];
 extern const char MSG_OK[];
 extern const char MSG_OK[];
 extern const char MSG_SD_OPEN_FILE_FAIL[];
 extern const char MSG_SD_OPEN_FILE_FAIL[];
+extern const char MSG_ENDSTOP_OPEN[];
 
 
 #if defined(__cplusplus)
 #if defined(__cplusplus)
 }
 }

+ 0 - 3
lang/lang_en.txt

@@ -556,9 +556,6 @@
 #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
 #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
 "Old settings found. Default PID, Esteps etc. will be set."
 "Old settings found. Default PID, Esteps etc. will be set."
 
 
-#MSG_ENDSTOP_OPEN c=0 r=0
-"open"
-
 #
 #
 "Now remove the test print from steel sheet."
 "Now remove the test print from steel sheet."
 
 

+ 0 - 4
lang/lang_en_cz.txt

@@ -742,10 +742,6 @@
 "Old settings found. Default PID, Esteps etc. will be set."
 "Old settings found. Default PID, Esteps etc. will be set."
 "Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd."
 "Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd."
 
 
-#MSG_ENDSTOP_OPEN c=0 r=0
-"open"
-"otevrit"
-
 #
 #
 "Now remove the test print from steel sheet."
 "Now remove the test print from steel sheet."
 "Nyni odstrante testovaci vytisk z tiskoveho platu."
 "Nyni odstrante testovaci vytisk z tiskoveho platu."

+ 0 - 4
lang/lang_en_de.txt

@@ -742,10 +742,6 @@
 "Old settings found. Default PID, Esteps etc. will be set."
 "Old settings found. Default PID, Esteps etc. will be set."
 "Alte Einstellungen gefunden. Standard PID, E-Steps u.s.w. werden gesetzt."
 "Alte Einstellungen gefunden. Standard PID, E-Steps u.s.w. werden gesetzt."
 
 
-#MSG_ENDSTOP_OPEN c=0 r=0
-"open"
-"offen"
-
 #
 #
 "Now remove the test print from steel sheet."
 "Now remove the test print from steel sheet."
 "Testdruck jetzt von Stahlblech entfernen."
 "Testdruck jetzt von Stahlblech entfernen."

+ 0 - 4
lang/lang_en_es.txt

@@ -742,10 +742,6 @@
 "Old settings found. Default PID, Esteps etc. will be set."
 "Old settings found. Default PID, Esteps etc. will be set."
 "Se han encontrado ajustes anteriores. Se ajustara el PID, los pasos del extrusor, etc"
 "Se han encontrado ajustes anteriores. Se ajustara el PID, los pasos del extrusor, etc"
 
 
-#MSG_ENDSTOP_OPEN c=0 r=0
-"open"
-"abrir"
-
 #
 #
 "Now remove the test print from steel sheet."
 "Now remove the test print from steel sheet."
 "Ahora retira la prueba de la lamina de acero."
 "Ahora retira la prueba de la lamina de acero."

+ 0 - 4
lang/lang_en_fr.txt

@@ -742,10 +742,6 @@
 "Old settings found. Default PID, Esteps etc. will be set."
 "Old settings found. Default PID, Esteps etc. will be set."
 "Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront pris."
 "Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront pris."
 
 
-#MSG_ENDSTOP_OPEN c=0 r=0
-"open"
-"ouvrir"
-
 #
 #
 "Now remove the test print from steel sheet."
 "Now remove the test print from steel sheet."
 "Retirez maintenant l'impression de test de la feuille d'acier."
 "Retirez maintenant l'impression de test de la feuille d'acier."

+ 0 - 4
lang/lang_en_it.txt

@@ -742,10 +742,6 @@
 "Old settings found. Default PID, Esteps etc. will be set."
 "Old settings found. Default PID, Esteps etc. will be set."
 "Sono state trovate impostazioni vecchie. I valori di default di PID, Esteps etc. saranno impostati"
 "Sono state trovate impostazioni vecchie. I valori di default di PID, Esteps etc. saranno impostati"
 
 
-#MSG_ENDSTOP_OPEN c=0 r=0
-"open"
-"apri"
-
 #
 #
 "Now remove the test print from steel sheet."
 "Now remove the test print from steel sheet."
 "Ora rimuovete la stampa di prova dalla piastra in acciaio."
 "Ora rimuovete la stampa di prova dalla piastra in acciaio."

+ 0 - 4
lang/lang_en_pl.txt

@@ -742,10 +742,6 @@
 "Old settings found. Default PID, Esteps etc. will be set."
 "Old settings found. Default PID, Esteps etc. will be set."
 "Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, itp."
 "Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, itp."
 
 
-#MSG_ENDSTOP_OPEN c=0 r=0
-"open"
-"otworz"
-
 #
 #
 "Now remove the test print from steel sheet."
 "Now remove the test print from steel sheet."
 "Teraz zdejmij wydruk testowy ze stolu."
 "Teraz zdejmij wydruk testowy ze stolu."