Bladeren bron

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

3d-gussner 3 jaren geleden
bovenliggende
commit
797d8e74a3
10 gewijzigde bestanden met toevoegingen van 22 en 18 verwijderingen
  1. 2 0
      Firmware/messages.c
  2. 2 0
      Firmware/messages.h
  3. 4 4
      Firmware/ultralcd.cpp
  4. 2 2
      lang/lang_en.txt
  5. 2 2
      lang/lang_en_cz.txt
  6. 2 2
      lang/lang_en_de.txt
  7. 2 2
      lang/lang_en_es.txt
  8. 2 2
      lang/lang_en_fr.txt
  9. 2 2
      lang/lang_en_it.txt
  10. 2 2
      lang/lang_en_pl.txt

+ 2 - 0
Firmware/messages.c

@@ -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_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_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_COOLDOWN[] PROGMEM_I1 = ISTR("Cooldown"); ////
 const char MSG_CRASH[] PROGMEM_I1 = ISTR("Crash"); ////c=7

+ 2 - 0
Firmware/messages.h

@@ -20,6 +20,8 @@ extern const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[];
 extern const char MSG_BELT_STATUS[];
 extern const char MSG_CALIBRATE_Z_AUTO[];
 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_COOLDOWN[];
 extern const char MSG_CRASH[];

+ 4 - 4
Firmware/ultralcd.cpp

@@ -7232,7 +7232,7 @@ void lcd_belttest()
     
     uint16_t   X = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_X));
     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);
     KEEPALIVE_STATE(IN_HANDLER);
     
@@ -7241,7 +7241,7 @@ void lcd_belttest()
     if (lcd_selfcheck_axis_sg(X_AXIS)){
 		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_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);
 		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::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::AxisX) lcd_puts_P(_i("Checking X axis  "));////MSG_SELFTEST_CHECK_X c=20
-	if (screen == TestScreen::AxisY) lcd_puts_P(_i("Checking Y axis  "));////MSG_SELFTEST_CHECK_Y c=20
+	if (screen == TestScreen::AxisX) lcd_puts_P(_T(MSG_CHECKING_X));
+	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::Bed) lcd_puts_P(_T(MSG_SELFTEST_CHECK_BED));
 	if (screen == TestScreen::Hotend

+ 2 - 2
lang/lang_en.txt

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

+ 2 - 2
lang/lang_en_cz.txt

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

+ 2 - 2
lang/lang_en_de.txt

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

+ 2 - 2
lang/lang_en_es.txt

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

+ 2 - 2
lang/lang_en_fr.txt

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

+ 2 - 2
lang/lang_en_it.txt

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

+ 2 - 2
lang/lang_en_pl.txt

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