Browse Source

Create MSG_CANCEL c=9
Delete ">Cancel"
Samed 10 bytes
Updated MSG_MEASURED_OFFSET c=20

3d-gussner 3 years ago
parent
commit
178fe36dc7

+ 1 - 0
Firmware/messages.c

@@ -17,6 +17,7 @@ const char MSG_BED_HEATING[] PROGMEM_I1 = ISTR("Bed Heating"); ////
 const char MSG_BED_LEVELING_FAILED_POINT_LOW[] PROGMEM_I1 = ISTR("Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."); ////c=20 r=6
 const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[] PROGMEM_I1 = ISTR("XYZ calibration failed. Please consult the manual."); ////c=20 r=8
 const char MSG_BELT_STATUS[] PROGMEM_I1 = ISTR("Belt status");////c=18
+const char MSG_CANCEL[] PROGMEM_I1 = ISTR("Cancel");////c=9
 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

+ 1 - 0
Firmware/messages.h

@@ -18,6 +18,7 @@ extern const char MSG_BED_HEATING[];
 extern const char MSG_BED_LEVELING_FAILED_POINT_LOW[];
 extern const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[];
 extern const char MSG_BELT_STATUS[];
+extern const char MSG_CANCEL[];
 extern const char MSG_CALIBRATE_Z_AUTO[];
 extern const char MSG_CARD_MENU[];
 extern const char MSG_CHECKING_X[];

+ 3 - 3
Firmware/ultralcd.cpp

@@ -2236,7 +2236,7 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed)
                 // handled earlier
                 break;
             }
-            lcd_puts_at_P(0, 3, _i(">Cancel"));                   ////MSG_ c=20 r=1
+            lcd_puts_at_P(0, 3, _T(MSG_CANCEL));
         }
 
         if (lcd_clicked())
@@ -2828,7 +2828,7 @@ static void lcd_menu_xyz_skew()
 //! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations.
 static void lcd_menu_xyz_offset()
 {
-    lcd_puts_at_P(0, 0, _i("[0;0] point offset"));////MSG_MEASURED_OFFSET
+    lcd_puts_at_P(0, 0, _i("[0;0] point offset"));////MSG_MEASURED_OFFSET c=20
     lcd_puts_at_P(0, 1, separator);
     lcd_puts_at_P(0, 2, PSTR("X"));  ////c=10 r=1
     lcd_puts_at_P(0, 3, PSTR("Y"));  ////c=10 r=1
@@ -4622,7 +4622,7 @@ void lcd_v2_calibration()
 	{
 	    const uint8_t filament = choose_menu_P(
             _i("Select filament:"), ////c=20
-            _T(MSG_FILAMENT),_i("Cancel"));  ////c=19 r=1
+            _T(MSG_FILAMENT),_T(MSG_CANCEL));
 	    if (filament < 5)
 	    {
 	        lay1cal_filament = filament;

+ 1 - 4
lang/lang_en.txt

@@ -28,9 +28,6 @@
 #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4
 "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode"
 
-#
-">Cancel"
-
 #MSG_BABYSTEPPING_Z c=15
 "Adjusting Z:"
 
@@ -133,7 +130,7 @@
 #MSG_MENU_CALIBRATION
 "Calibration"
 
-#
+#MSG_CANCEL c=9
 "Cancel"
 
 #MSG_SD_REMOVED

+ 1 - 5
lang/lang_en_cz.txt

@@ -38,10 +38,6 @@
 "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode"
 "POZOR:\x0aCrash detekce\x0adeaktivovana ve\x0aStealth modu"
 
-#
-">Cancel"
-">Zrusit"
-
 #MSG_BABYSTEPPING_Z c=15
 "Adjusting Z:"
 "Doladeni Z:"
@@ -178,7 +174,7 @@
 "Calibration"
 "Kalibrace"
 
-#
+#MSG_CANCEL c=9
 "Cancel"
 "Zrusit"
 

+ 1 - 5
lang/lang_en_de.txt

@@ -38,10 +38,6 @@
 "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode"
 "WARNUNG:\x0aCrash Erkennung\x0adeaktiviert im\x0aStealth Modus"
 
-#
-">Cancel"
-">Abbruch"
-
 #MSG_BABYSTEPPING_Z c=15
 "Adjusting Z:"
 "Z Anpassen:"
@@ -178,7 +174,7 @@
 "Calibration"
 "Kalibrierung"
 
-#
+#MSG_CANCEL c=9
 "Cancel"
 "Abbruch"
 

+ 1 - 5
lang/lang_en_es.txt

@@ -38,10 +38,6 @@
 "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode"
 "ATENCION:\x0aDec. choque\x0adesactivada en\x0aModo silencio"
 
-#
-">Cancel"
-">Cancelar"
-
 #MSG_BABYSTEPPING_Z c=15
 "Adjusting Z:"
 "Ajustar-Z:"
@@ -178,7 +174,7 @@
 "Calibration"
 "Calibracion"
 
-#
+#MSG_CANCEL c=9
 "Cancel"
 "Cancelar"
 

+ 1 - 5
lang/lang_en_fr.txt

@@ -38,10 +38,6 @@
 "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode"
 "ATTENTION:\x0aDetection de crash\x0adesactivee en\x0amode furtif"
 
-#
-">Cancel"
-">Annuler"
-
 #MSG_BABYSTEPPING_Z c=15
 "Adjusting Z:"
 "Ajuster Z:"
@@ -178,7 +174,7 @@
 "Calibration"
 "\x00"
 
-#
+#MSG_CANCEL c=9
 "Cancel"
 "Annuler"
 

+ 1 - 5
lang/lang_en_it.txt

@@ -38,10 +38,6 @@
 "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode"
 "ATTENZIONE:\x0aRilev. impatto\x0adisattivato in\x0aModalita silenziosa"
 
-#
-">Cancel"
-">Annulla"
-
 #MSG_BABYSTEPPING_Z c=15
 "Adjusting Z:"
 "Compensaz. Z:"
@@ -178,7 +174,7 @@
 "Calibration"
 "Calibrazione"
 
-#
+#MSG_CANCEL c=9
 "Cancel"
 "Annulla"
 

+ 1 - 5
lang/lang_en_nl.txt

@@ -38,10 +38,6 @@
 "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode"
 "WARNING:\x0aCrashdetectie\x0auitgeschakeld in\x0aStealth stand"
 
-#
-">Cancel"
-">Annuleren"
-
 #MSG_BABYSTEPPING_Z c=15
 "Adjusting Z:"
 "Z is ingesteld:"
@@ -178,7 +174,7 @@
 "Calibration"
 "Kalibratie"
 
-#
+#MSG_CANCEL c=9
 "Cancel"
 "Annuleren"
 

+ 1 - 5
lang/lang_en_pl.txt

@@ -38,10 +38,6 @@
 "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode"
 "UWAGA:\x0aWykrywanie zderzen\x0awylaczone w\x0atrybie Stealth"
 
-#
-">Cancel"
-">Anuluj"
-
 #MSG_BABYSTEPPING_Z c=15
 "Adjusting Z:"
 "Ustawianie Z:"
@@ -178,7 +174,7 @@
 "Calibration"
 "Kalibracja"
 
-#
+#MSG_CANCEL c=9
 "Cancel"
 "Anuluj"