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

@leptun strip 1st char hack for duplicate Cancel

Browse Source
This commit is contained in:
3d-gussner 2021-04-23 13:03:59 +02:00
parent 403b340f19
commit 032e8a5957
10 changed files with 4 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/messages.c
View File

@ -17,7 +17,7 @@ const char MSG_BED_HEATING[] PROGMEM_I1 = ISTR("Bed Heating"); ////c=20
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_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_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_BELT_STATUS[] PROGMEM_I1 = ISTR("Belt status");////c=18
const char MSG_CANCEL[] PROGMEM_I1 = ISTR("Cancel");////c=9 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_CALIBRATE_Z_AUTO[] PROGMEM_I1 = ISTR("Calibrating Z"); ////c=20 r=2
const char MSG_CARD_MENU[] PROGMEM_I1 = ISTR("Print from SD"); ////c=18 const char MSG_CARD_MENU[] PROGMEM_I1 = ISTR("Print from SD"); ////c=18
const char MSG_CHECKING_X[] PROGMEM_I1 = ISTR("Checking X axis"); ////c=20 const char MSG_CHECKING_X[] PROGMEM_I1 = ISTR("Checking X axis"); ////c=20

6
Firmware/ultralcd.cpp
View File

@ -2209,7 +2209,7 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed)
lcd_clear(); lcd_clear();
lcd_draw_update = 1; lcd_draw_update = 1;
lcd_puts_at_P(0, 3, _i(">Cancel")); ////MSG_CANCEL2 c=10 lcd_puts_at_P(0, 3, _T(MSG_CANCEL)); ////MSG_CANCEL
lcd_set_cursor(0, 1); lcd_set_cursor(0, 1);
switch (eFilamentAction) switch (eFilamentAction)
@ -2237,7 +2237,7 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed)
// handled earlier // handled earlier
break; break;
} }
lcd_puts_at_P(0, 3, _T(MSG_CANCEL)); lcd_puts_at_P(0, 3, _T(MSG_CANCEL)); ////MSG_CANCEL
} }
lcd_set_cursor(0, 0); lcd_set_cursor(0, 0);
@ -4626,7 +4626,7 @@ void lcd_v2_calibration()
{ {
const uint8_t filament = choose_menu_P( const uint8_t filament = choose_menu_P(
_i("Select filament:"), ////MSG_SELECT_FILAMENT c=20 _i("Select filament:"), ////MSG_SELECT_FILAMENT c=20
_T(MSG_FILAMENT),_T(MSG_CANCEL)); _T(MSG_FILAMENT),(_T(MSG_CANCEL)+1)); //Hack to reuse MSG but strip 1st char off
if (filament < 5) if (filament < 5)
{ {
lay1cal_filament = filament; lay1cal_filament = filament;

3
lang/lang_en.txt
View File

@ -133,9 +133,6 @@
#MSG_MENU_CALIBRATION c=18 #MSG_MENU_CALIBRATION c=18
"Calibration" "Calibration"
#MSG_CANCEL c=9
"Cancel"
#MSG_SD_REMOVED c=20 #MSG_SD_REMOVED c=20
"Card removed" "Card removed"

4
lang/lang_en_cz.txt
View File

@ -178,10 +178,6 @@
"Calibration" "Calibration"
"Kalibrace" "Kalibrace"
#MSG_CANCEL c=9
"Cancel"
"Zrusit"
#MSG_SD_REMOVED c=20 #MSG_SD_REMOVED c=20
"Card removed" "Card removed"
"Karta vyjmuta" "Karta vyjmuta"

4
lang/lang_en_de.txt
View File

@ -178,10 +178,6 @@
"Calibration" "Calibration"
"Kalibrierung" "Kalibrierung"
#MSG_CANCEL c=9
"Cancel"
"Abbruch"
#MSG_SD_REMOVED c=20 #MSG_SD_REMOVED c=20
"Card removed" "Card removed"
"SD Karte entfernt" "SD Karte entfernt"

4
lang/lang_en_es.txt
View File

@ -178,10 +178,6 @@
"Calibration" "Calibration"
"Calibracion" "Calibracion"
#MSG_CANCEL c=9
"Cancel"
"Cancelar"
#MSG_SD_REMOVED c=20 #MSG_SD_REMOVED c=20
"Card removed" "Card removed"
"Tarjeta retirada" "Tarjeta retirada"

4
lang/lang_en_fr.txt
View File

@ -178,10 +178,6 @@
"Calibration" "Calibration"
"\x00" "\x00"
#MSG_CANCEL c=9
"Cancel"
"Annuler"
#MSG_SD_REMOVED c=20 #MSG_SD_REMOVED c=20
"Card removed" "Card removed"
"Carte retiree" "Carte retiree"

4
lang/lang_en_it.txt
View File

@ -178,10 +178,6 @@
"Calibration" "Calibration"
"Calibrazione" "Calibrazione"
#MSG_CANCEL c=9
"Cancel"
"Annulla"
#MSG_SD_REMOVED c=20 #MSG_SD_REMOVED c=20
"Card removed" "Card removed"
"SD rimossa" "SD rimossa"

4
lang/lang_en_nl.txt
View File

@ -178,10 +178,6 @@
"Calibration" "Calibration"
"Kalibratie" "Kalibratie"
#MSG_CANCEL c=9
"Cancel"
"Annuleren"
#MSG_SD_REMOVED c=20 #MSG_SD_REMOVED c=20
"Card removed" "Card removed"
"SD verwijderd" "SD verwijderd"

4
lang/lang_en_pl.txt
View File

@ -178,10 +178,6 @@
"Calibration" "Calibration"
"Kalibracja" "Kalibracja"
#MSG_CANCEL c=9
"Cancel"
"Anuluj"
#MSG_SD_REMOVED c=20 #MSG_SD_REMOVED c=20
"Card removed" "Card removed"
"Karta wyjeta" "Karta wyjeta"