3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lang - text "TRIGGERED" removed from dictionary

Browse Source
This commit is contained in:
Robert Pelnar 2018-11-22 18:46:02 +01:00
parent e9131542ca
commit 42f2a61416
10 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Firmware/Marlin_main.cpp
View File

@ -5779,7 +5779,7 @@ Sigma_Exit:
#if defined(X_MIN_PIN) && X_MIN_PIN > -1 #if defined(X_MIN_PIN) && X_MIN_PIN > -1
SERIAL_PROTOCOLRPGM(_n("x_min: "));////MSG_X_MIN c=0 r=0 SERIAL_PROTOCOLRPGM(_n("x_min: "));////MSG_X_MIN c=0 r=0
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(MSG_ENDSTOP_HIT);
}else{ }else{
SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN);
} }
@ -5788,7 +5788,7 @@ Sigma_Exit:
#if defined(X_MAX_PIN) && X_MAX_PIN > -1 #if defined(X_MAX_PIN) && X_MAX_PIN > -1
SERIAL_PROTOCOLRPGM(_n("x_max: "));////MSG_X_MAX c=0 r=0 SERIAL_PROTOCOLRPGM(_n("x_max: "));////MSG_X_MAX c=0 r=0
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(MSG_ENDSTOP_HIT);
}else{ }else{
SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN);
} }
@ -5797,7 +5797,7 @@ Sigma_Exit:
#if defined(Y_MIN_PIN) && Y_MIN_PIN > -1 #if defined(Y_MIN_PIN) && Y_MIN_PIN > -1
SERIAL_PROTOCOLRPGM(_n("y_min: "));////MSG_Y_MIN c=0 r=0 SERIAL_PROTOCOLRPGM(_n("y_min: "));////MSG_Y_MIN c=0 r=0
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(MSG_ENDSTOP_HIT);
}else{ }else{
SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN);
} }
@ -5806,7 +5806,7 @@ Sigma_Exit:
#if defined(Y_MAX_PIN) && Y_MAX_PIN > -1 #if defined(Y_MAX_PIN) && Y_MAX_PIN > -1
SERIAL_PROTOCOLRPGM(_n("y_max: "));////MSG_Y_MAX c=0 r=0 SERIAL_PROTOCOLRPGM(_n("y_max: "));////MSG_Y_MAX c=0 r=0
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(MSG_ENDSTOP_HIT);
}else{ }else{
SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN);
} }
@ -5815,7 +5815,7 @@ Sigma_Exit:
#if defined(Z_MIN_PIN) && Z_MIN_PIN > -1 #if defined(Z_MIN_PIN) && Z_MIN_PIN > -1
SERIAL_PROTOCOLRPGM(MSG_Z_MIN); SERIAL_PROTOCOLRPGM(MSG_Z_MIN);
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(MSG_ENDSTOP_HIT);
}else{ }else{
SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN);
} }
@ -5824,7 +5824,7 @@ Sigma_Exit:
#if defined(Z_MAX_PIN) && Z_MAX_PIN > -1 #if defined(Z_MAX_PIN) && Z_MAX_PIN > -1
SERIAL_PROTOCOLRPGM(MSG_Z_MAX); SERIAL_PROTOCOLRPGM(MSG_Z_MAX);
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(MSG_ENDSTOP_HIT);
}else{ }else{
SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN);
} }

2
Firmware/messages.c
View File

@ -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_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_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_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
const char MSG_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////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_ENDSTOP_OPEN[] PROGMEM_N1 = "open"; ////c=0 r=0
const char MSG_POWERUP[] PROGMEM_N1 = "PowerUp"; ////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_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

2
Firmware/messages.h
View File

@ -26,7 +26,6 @@ extern const char MSG_CRASH_DETECTED[];
extern const char MSG_CRASHDETECT_NA[]; 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_ERROR[]; extern const char MSG_ERROR[];
extern const char MSG_EXTRUDER[]; extern const char MSG_EXTRUDER[];
extern const char MSG_FILAMENT[]; 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_ENDSTOP_OPEN[];
extern const char MSG_POWERUP[]; extern const char MSG_POWERUP[];
extern const char MSG_ERR_STOPPED[]; extern const char MSG_ERR_STOPPED[];
extern const char MSG_ENDSTOP_HIT[];
#if defined(__cplusplus) #if defined(__cplusplus)
} }

3
lang/lang_en.txt
View File

@ -859,9 +859,6 @@
# #
"Total print time" "Total print time"
#MSG_ENDSTOP_HIT c=0 r=0
"TRIGGERED"
#MSG_TUNE c=0 r=0 #MSG_TUNE c=0 r=0
"Tune" "Tune"

4
lang/lang_en_cz.txt
View File

@ -1146,10 +1146,6 @@
"Total print time" "Total print time"
"Celkovy cas tisku" "Celkovy cas tisku"
#MSG_ENDSTOP_HIT c=0 r=0
"TRIGGERED"
"AKTIVNI"
#MSG_TUNE c=0 r=0 #MSG_TUNE c=0 r=0
"Tune" "Tune"
"Ladit" "Ladit"

4
lang/lang_en_de.txt
View File

@ -1146,10 +1146,6 @@
"Total print time" "Total print time"
"Gesamte Druckzeit" "Gesamte Druckzeit"
#MSG_ENDSTOP_HIT c=0 r=0
"TRIGGERED"
"AUSGELOEST"
#MSG_TUNE c=0 r=0 #MSG_TUNE c=0 r=0
"Tune" "Tune"
"Feineinstellung" "Feineinstellung"

4
lang/lang_en_es.txt
View File

@ -1146,10 +1146,6 @@
"Total print time" "Total print time"
"Tiempo total :" "Tiempo total :"
#MSG_ENDSTOP_HIT c=0 r=0
"TRIGGERED"
"ACTIVADO"
#MSG_TUNE c=0 r=0 #MSG_TUNE c=0 r=0
"Tune" "Tune"
"Ajustar" "Ajustar"

4
lang/lang_en_fr.txt
View File

@ -1146,10 +1146,6 @@
"Total print time" "Total print time"
"Temps total" "Temps total"
#MSG_ENDSTOP_HIT c=0 r=0
"TRIGGERED"
"ACTIVE"
#MSG_TUNE c=0 r=0 #MSG_TUNE c=0 r=0
"Tune" "Tune"
"Regler" "Regler"

4
lang/lang_en_it.txt
View File

@ -1146,10 +1146,6 @@
"Total print time" "Total print time"
"Tempo di stampa totale" "Tempo di stampa totale"
#MSG_ENDSTOP_HIT c=0 r=0
"TRIGGERED"
"ATTIVATO"
#MSG_TUNE c=0 r=0 #MSG_TUNE c=0 r=0
"Tune" "Tune"
"Regola" "Regola"

4
lang/lang_en_pl.txt
View File

@ -1146,10 +1146,6 @@
"Total print time" "Total print time"
"Calkowity czas druku" "Calkowity czas druku"
#MSG_ENDSTOP_HIT c=0 r=0
"TRIGGERED"
"AKTYWOWANO"
#MSG_TUNE c=0 r=0 #MSG_TUNE c=0 r=0
"Tune" "Tune"
"Strojenie" "Strojenie"