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

Remove duplicate string Checking X axis and Checking Y axis using MSG_CHECKING_X and MSG_CHECKING_Y

Browse Source
This commit is contained in:
3d-gussner 2021-01-26 07:10:57 +01:00
parent 2d1e1e4cee
commit 797d8e74a3
10 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/messages.c
View File

@ -19,6 +19,8 @@ const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[] PROGMEM_I1 = ISTR("XYZ
const char MSG_BELT_STATUS[] PROGMEM_I1 = ISTR("Belt Status");////c=18 const char MSG_BELT_STATUS[] PROGMEM_I1 = ISTR("Belt Status");////c=18
const char MSG_CALIBRATE_Z_AUTO[] PROGMEM_I1 = ISTR("Calibrating Z"); ////c=20 r=2 const char MSG_CALIBRATE_Z_AUTO[] PROGMEM_I1 = ISTR("Calibrating Z"); ////c=20 r=2
const char MSG_CARD_MENU[] PROGMEM_I1 = ISTR("Print from SD"); //// const char MSG_CARD_MENU[] PROGMEM_I1 = ISTR("Print from SD"); ////
const char MSG_CHECKING_X[] PROGMEM_I1 = ISTR("Checking X axis"); ////c=20
const char MSG_CHECKING_Y[] PROGMEM_I1 = ISTR("Checking Y axis"); ////c=20
const char MSG_CONFIRM_NOZZLE_CLEAN[] PROGMEM_I1 = ISTR("Please clean the nozzle for calibration. Click when done."); ////c=20 r=8 const char MSG_CONFIRM_NOZZLE_CLEAN[] PROGMEM_I1 = ISTR("Please clean the nozzle for calibration. Click when done."); ////c=20 r=8
const char MSG_COOLDOWN[] PROGMEM_I1 = ISTR("Cooldown"); //// const char MSG_COOLDOWN[] PROGMEM_I1 = ISTR("Cooldown"); ////
const char MSG_CRASH[] PROGMEM_I1 = ISTR("Crash"); ////c=7 const char MSG_CRASH[] PROGMEM_I1 = ISTR("Crash"); ////c=7

2
Firmware/messages.h
View File

@ -20,6 +20,8 @@ extern const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[];
extern const char MSG_BELT_STATUS[]; extern const char MSG_BELT_STATUS[];
extern const char MSG_CALIBRATE_Z_AUTO[]; extern const char MSG_CALIBRATE_Z_AUTO[];
extern const char MSG_CARD_MENU[]; extern const char MSG_CARD_MENU[];
extern const char MSG_CHECKING_X[];
extern const char MSG_CHECKING_Y[];
extern const char MSG_CONFIRM_NOZZLE_CLEAN[]; extern const char MSG_CONFIRM_NOZZLE_CLEAN[];
extern const char MSG_COOLDOWN[]; extern const char MSG_COOLDOWN[];
extern const char MSG_CRASH[]; extern const char MSG_CRASH[];

8
Firmware/ultralcd.cpp
View File

@ -7232,7 +7232,7 @@ void lcd_belttest()
uint16_t X = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_X)); uint16_t X = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_X));
uint16_t Y = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_Y)); uint16_t Y = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_Y));
lcd_printf_P(_i("Checking X axis ")); // share message with selftest lcd_printf_P(_T(MSG_CHECKING_X));
lcd_set_cursor(0,1), lcd_printf_P(PSTR("X: %u -> ..."),X); lcd_set_cursor(0,1), lcd_printf_P(PSTR("X: %u -> ..."),X);
KEEPALIVE_STATE(IN_HANDLER); KEEPALIVE_STATE(IN_HANDLER);
@ -7241,7 +7241,7 @@ void lcd_belttest()
if (lcd_selfcheck_axis_sg(X_AXIS)){ if (lcd_selfcheck_axis_sg(X_AXIS)){
X = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_X)); X = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_X));
lcd_set_cursor(10,1), lcd_printf_P(PSTR("%u"),X); // Show new X value next to old one. lcd_set_cursor(10,1), lcd_printf_P(PSTR("%u"),X); // Show new X value next to old one.
lcd_puts_at_P(0,2,_i("Checking Y axis ")); lcd_puts_at_P(0,2,_T(MSG_CHECKING_Y));
lcd_set_cursor(0,3), lcd_printf_P(PSTR("Y: %u -> ..."),Y); lcd_set_cursor(0,3), lcd_printf_P(PSTR("Y: %u -> ..."),Y);
if (lcd_selfcheck_axis_sg(Y_AXIS)) if (lcd_selfcheck_axis_sg(Y_AXIS))
{ {
@ -8379,8 +8379,8 @@ static int lcd_selftest_screen(TestScreen screen, int _progress, int _progress_s
if (screen == TestScreen::PrintFan) lcd_puts_P(_T(MSG_SELFTEST_FAN)); if (screen == TestScreen::PrintFan) lcd_puts_P(_T(MSG_SELFTEST_FAN));
if (screen == TestScreen::FansOk) lcd_puts_P(_T(MSG_SELFTEST_FAN)); if (screen == TestScreen::FansOk) lcd_puts_P(_T(MSG_SELFTEST_FAN));
if (screen == TestScreen::EndStops) lcd_puts_P(_i("Checking endstops"));////MSG_SELFTEST_CHECK_ENDSTOPS c=20 if (screen == TestScreen::EndStops) lcd_puts_P(_i("Checking endstops"));////MSG_SELFTEST_CHECK_ENDSTOPS c=20
if (screen == TestScreen::AxisX) lcd_puts_P(_i("Checking X axis "));////MSG_SELFTEST_CHECK_X c=20 if (screen == TestScreen::AxisX) lcd_puts_P(_T(MSG_CHECKING_X));
if (screen == TestScreen::AxisY) lcd_puts_P(_i("Checking Y axis "));////MSG_SELFTEST_CHECK_Y c=20 if (screen == TestScreen::AxisY) lcd_puts_P(_T(MSG_CHECKING_Y));
if (screen == TestScreen::AxisZ) lcd_puts_P(_i("Checking Z axis "));////MSG_SELFTEST_CHECK_Z c=20 if (screen == TestScreen::AxisZ) lcd_puts_P(_i("Checking Z axis "));////MSG_SELFTEST_CHECK_Z c=20
if (screen == TestScreen::Bed) lcd_puts_P(_T(MSG_SELFTEST_CHECK_BED)); if (screen == TestScreen::Bed) lcd_puts_P(_T(MSG_SELFTEST_CHECK_BED));
if (screen == TestScreen::Hotend if (screen == TestScreen::Hotend

4
lang/lang_en.txt
View File

@ -343,10 +343,10 @@
#MSG_SELFTEST_CHECK_FSENSOR c=20 #MSG_SELFTEST_CHECK_FSENSOR c=20
"Checking sensors " "Checking sensors "
#MSG_SELFTEST_CHECK_X c=20 #MSG_CHECKING_X c=20
"Checking X axis " "Checking X axis "
#MSG_SELFTEST_CHECK_Y c=20 #MSG_CHECKING_Y c=20
"Checking Y axis " "Checking Y axis "
#MSG_SELFTEST_CHECK_Z c=20 #MSG_SELFTEST_CHECK_Z c=20

4
lang/lang_en_cz.txt
View File

@ -458,11 +458,11 @@
"Checking sensors " "Checking sensors "
"Kontrola senzoru" "Kontrola senzoru"
#MSG_SELFTEST_CHECK_X c=20 #MSG_CHECKING_X c=20
"Checking X axis " "Checking X axis "
"Kontrola osy X" "Kontrola osy X"
#MSG_SELFTEST_CHECK_Y c=20 #MSG_CHECKING_Y c=20
"Checking Y axis " "Checking Y axis "
"Kontrola osy Y" "Kontrola osy Y"

4
lang/lang_en_de.txt
View File

@ -458,11 +458,11 @@
"Checking sensors " "Checking sensors "
"Pruefe Sensoren " "Pruefe Sensoren "
#MSG_SELFTEST_CHECK_X c=20 #MSG_CHECKING_X c=20
"Checking X axis " "Checking X axis "
"Pruefe X Achse " "Pruefe X Achse "
#MSG_SELFTEST_CHECK_Y c=20 #MSG_CHECKING_Y c=20
"Checking Y axis " "Checking Y axis "
"Pruefe Y Achse " "Pruefe Y Achse "

4
lang/lang_en_es.txt
View File

@ -458,11 +458,11 @@
"Checking sensors " "Checking sensors "
"Comprobando sensores" "Comprobando sensores"
#MSG_SELFTEST_CHECK_X c=20 #MSG_CHECKING_X c=20
"Checking X axis " "Checking X axis "
"Control sensor X" "Control sensor X"
#MSG_SELFTEST_CHECK_Y c=20 #MSG_CHECKING_Y c=20
"Checking Y axis " "Checking Y axis "
"Control sensor Y" "Control sensor Y"

4
lang/lang_en_fr.txt
View File

@ -458,11 +458,11 @@
"Checking sensors " "Checking sensors "
"Verif. des capteurs" "Verif. des capteurs"
#MSG_SELFTEST_CHECK_X c=20 #MSG_CHECKING_X c=20
"Checking X axis " "Checking X axis "
"Verification axe X" "Verification axe X"
#MSG_SELFTEST_CHECK_Y c=20 #MSG_CHECKING_Y c=20
"Checking Y axis " "Checking Y axis "
"Verification axe Y" "Verification axe Y"

4
lang/lang_en_it.txt
View File

@ -458,11 +458,11 @@
"Checking sensors " "Checking sensors "
"Controllo sensori" "Controllo sensori"
#MSG_SELFTEST_CHECK_X c=20 #MSG_CHECKING_X c=20
"Checking X axis " "Checking X axis "
"Verifica asse X" "Verifica asse X"
#MSG_SELFTEST_CHECK_Y c=20 #MSG_CHECKING_Y c=20
"Checking Y axis " "Checking Y axis "
"Verifica asse Y" "Verifica asse Y"

4
lang/lang_en_pl.txt
View File

@ -458,11 +458,11 @@
"Checking sensors " "Checking sensors "
"Kontrola czujnikow" "Kontrola czujnikow"
#MSG_SELFTEST_CHECK_X c=20 #MSG_CHECKING_X c=20
"Checking X axis " "Checking X axis "
"Kontrola osi X" "Kontrola osi X"
#MSG_SELFTEST_CHECK_Y c=20 #MSG_CHECKING_Y c=20
"Checking Y axis " "Checking Y axis "
"Kontrola osi Y" "Kontrola osi Y"