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

Define #MSG_PINDA c=6 and remove duplicate saved 8 bytes

This commit is contained in:
3d-gussner 2021-03-30 19:30:26 +02:00
parent 6a266d497b
commit 1c09e8411d
11 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Firmware/messages.c
View File

@ -73,6 +73,7 @@ const char MSG_NO[] PROGMEM_I1 = ISTR("No"); ////c=3
const char MSG_NOZZLE[] PROGMEM_I1 = ISTR("Nozzle"); ////c=12 const char MSG_NOZZLE[] PROGMEM_I1 = ISTR("Nozzle"); ////c=12
const char MSG_PAPER[] PROGMEM_I1 = ISTR("Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."); ////c=20 r=10 const char MSG_PAPER[] PROGMEM_I1 = ISTR("Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."); ////c=20 r=10
const char MSG_PAUSE_PRINT[] PROGMEM_I1 = ISTR("Pause print");////c=18 const char MSG_PAUSE_PRINT[] PROGMEM_I1 = ISTR("Pause print");////c=18
const char MSG_PINDA[] PROGMEM_I1 = ISTR("PINDA");////c=6
const char MSG_PLACE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please place steel sheet on heatbed."); ////c=20 r=5 const char MSG_PLACE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please place steel sheet on heatbed."); ////c=20 r=5
const char MSG_PLEASE_WAIT[] PROGMEM_I1 = ISTR("Please wait"); ////c=20 const char MSG_PLEASE_WAIT[] PROGMEM_I1 = ISTR("Please wait"); ////c=20
const char MSG_POWER_FAILURES[] PROGMEM_I1 = ISTR("Power failures"); ////c=15 const char MSG_POWER_FAILURES[] PROGMEM_I1 = ISTR("Power failures"); ////c=15

1
Firmware/messages.h
View File

@ -72,6 +72,7 @@ extern const char MSG_NO[];
extern const char MSG_NOZZLE[]; extern const char MSG_NOZZLE[];
extern const char MSG_PAPER[]; extern const char MSG_PAPER[];
extern const char MSG_PAUSE_PRINT[]; extern const char MSG_PAUSE_PRINT[];
extern const char MSG_PINDA[];
extern const char MSG_PLACE_STEEL_SHEET[]; extern const char MSG_PLACE_STEEL_SHEET[];
extern const char MSG_PLEASE_WAIT[]; extern const char MSG_PLEASE_WAIT[];
extern const char MSG_POWER_FAILURES[]; extern const char MSG_POWER_FAILURES[];

4
Firmware/ultralcd.cpp
View File

@ -1724,7 +1724,7 @@ static void lcd_menu_temperatures()
lcd_menu_temperatures_line( _i("Ambient"), (int)current_temperature_ambient ); ////MSG_AMBIENT c=14 lcd_menu_temperatures_line( _i("Ambient"), (int)current_temperature_ambient ); ////MSG_AMBIENT c=14
#endif //AMBIENT_THERMISTOR #endif //AMBIENT_THERMISTOR
#ifdef PINDA_THERMISTOR #ifdef PINDA_THERMISTOR
lcd_menu_temperatures_line( _i("PINDA"), (int)current_temperature_pinda ); ////c=14 lcd_menu_temperatures_line( _T(MSG_PINDA), (int)current_temperature_pinda ); ////MSG_PINDA
#endif //PINDA_THERMISTOR #endif //PINDA_THERMISTOR
menu_back_if_clicked(); menu_back_if_clicked();
} }
@ -3764,7 +3764,7 @@ static void lcd_show_sensors_state()
finda_state = mmu_finda; finda_state = mmu_finda;
} }
//lcd_puts_at_P(0, 0, _i("Sensor state")); //lcd_puts_at_P(0, 0, _i("Sensor state"));
lcd_puts_at_P(0, 0, _i("PINDA")); lcd_puts_at_P(0, 0, _T(MSG_PINDA));
lcd_set_cursor(LCD_WIDTH - 14, 0); lcd_set_cursor(LCD_WIDTH - 14, 0);
lcd_print_state(pinda_state); lcd_print_state(pinda_state);

2
lang/lang_en.txt
View File

@ -616,7 +616,7 @@
#MSG_WIZARD_HEATING c=20 r=3 #MSG_WIZARD_HEATING c=20 r=3
"Preheating nozzle. Please wait." "Preheating nozzle. Please wait."
# c=14 #MSG_PINDA c=6
"PINDA" "PINDA"
#MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20 #MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20

2
lang/lang_en_cz.txt
View File

@ -822,7 +822,7 @@
"Preheating nozzle. Please wait." "Preheating nozzle. Please wait."
"Predehrev trysky. Prosim cekejte." "Predehrev trysky. Prosim cekejte."
# c=14 #MSG_PINDA c=6
"PINDA" "PINDA"
"\x00" "\x00"

2
lang/lang_en_de.txt
View File

@ -822,7 +822,7 @@
"Preheating nozzle. Please wait." "Preheating nozzle. Please wait."
"Vorheizen der Duese. Bitte warten." "Vorheizen der Duese. Bitte warten."
# c=14 #MSG_PINDA c=6
"PINDA" "PINDA"
"\x00" "\x00"

2
lang/lang_en_es.txt
View File

@ -822,7 +822,7 @@
"Preheating nozzle. Please wait." "Preheating nozzle. Please wait."
"Precalentando nozzle. Espera por favor." "Precalentando nozzle. Espera por favor."
# c=14 #MSG_PINDA c=6
"PINDA" "PINDA"
"\x00" "\x00"

2
lang/lang_en_fr.txt
View File

@ -822,7 +822,7 @@
"Preheating nozzle. Please wait." "Preheating nozzle. Please wait."
"Prechauffage de la buse. Merci de patienter." "Prechauffage de la buse. Merci de patienter."
# c=14 #MSG_PINDA c=6
"PINDA" "PINDA"
"\x00" "\x00"

2
lang/lang_en_it.txt
View File

@ -822,7 +822,7 @@
"Preheating nozzle. Please wait." "Preheating nozzle. Please wait."
"Preriscaldando l'ugello. Attendere prego." "Preriscaldando l'ugello. Attendere prego."
# c=14 #MSG_PINDA c=6
"PINDA" "PINDA"
"\x00" "\x00"

2
lang/lang_en_nl.txt
View File

@ -822,7 +822,7 @@
"Preheating nozzle. Please wait." "Preheating nozzle. Please wait."
"Opwarmen van de tuit. Wacht aub." "Opwarmen van de tuit. Wacht aub."
# c=14 #MSG_PINDA c=6
"PINDA" "PINDA"
"\x00" "\x00"

2
lang/lang_en_pl.txt
View File

@ -822,7 +822,7 @@
"Preheating nozzle. Please wait." "Preheating nozzle. Please wait."
"Nagrzewanie dyszy. Prosze czekac." "Nagrzewanie dyszy. Prosze czekac."
# c=14 #MSG_PINDA c=6
"PINDA" "PINDA"
"\x00" "\x00"