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

Lang - text "endstops hit: " removed from dictionary

Browse Source
This commit is contained in:
Robert Pelnar 2018-11-22 17:53:51 +01:00
parent 0baa6412fc
commit 9f86a334c6
10 changed files with 7 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/messages.c
View File

@ -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

4
Firmware/messages.h
View File

@ -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)
}

8
Firmware/stepper.cpp
View File

@ -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;

3
lang/lang_en.txt
View File

@ -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"

4
lang/lang_en_cz.txt
View File

@ -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"

4
lang/lang_en_de.txt
View File

@ -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"

4
lang/lang_en_es.txt
View File

@ -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"

4
lang/lang_en_fr.txt
View File

@ -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"

4
lang/lang_en_it.txt
View File

@ -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"

4
lang/lang_en_pl.txt
View File

@ -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"