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

Temp cal.

Browse Source
This commit is contained in:
Alex Voinea 2019-11-08 19:44:48 +02:00
parent 0de47bf0fd
commit 20a59f5f40
9 changed files with 25 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/messages.c
View File

@ -90,7 +90,7 @@ const char MSG_STEALTH[] PROGMEM_I1 = ISTR("Stealth"); ////
const char MSG_STEEL_SHEET_CHECK[] PROGMEM_I1 = ISTR("Is steel sheet on heatbed?"); ////c=20 r=2 const char MSG_STEEL_SHEET_CHECK[] PROGMEM_I1 = ISTR("Is steel sheet on heatbed?"); ////c=20 r=2
const char MSG_STOP_PRINT[] PROGMEM_I1 = ISTR("Stop print"); //// const char MSG_STOP_PRINT[] PROGMEM_I1 = ISTR("Stop print"); ////
const char MSG_STOPPED[] PROGMEM_I1 = ISTR("STOPPED. "); //// const char MSG_STOPPED[] PROGMEM_I1 = ISTR("STOPPED. "); ////
const char MSG_TEMP_CALIBRATION[] PROGMEM_I1 = ISTR("Temp. cal. "); ////c=20 r=1 const char MSG_TEMP_CALIBRATION[] PROGMEM_I1 = ISTR("Temp. cal."); ////c=12 r=1
const char MSG_TEMP_CALIBRATION_DONE[] PROGMEM_I1 = ISTR("Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."); ////c=20 r=12 const char MSG_TEMP_CALIBRATION_DONE[] PROGMEM_I1 = ISTR("Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."); ////c=20 r=12
const char MSG_UNLOAD_FILAMENT[] PROGMEM_I1 = ISTR("Unload filament"); ////c=17 const char MSG_UNLOAD_FILAMENT[] PROGMEM_I1 = ISTR("Unload filament"); ////c=17
const char MSG_UNLOADING_FILAMENT[] PROGMEM_I1 = ISTR("Unloading filament"); ////c=20 r=1 const char MSG_UNLOADING_FILAMENT[] PROGMEM_I1 = ISTR("Unloading filament"); ////c=20 r=1

14
Firmware/ultralcd.cpp
View File

@ -838,12 +838,13 @@ void lcdui_print_status_line(void)
break; break;
case CustomMsg::TempCal: // PINDA temp calibration in progress case CustomMsg::TempCal: // PINDA temp calibration in progress
{ {
char statusLine[LCD_WIDTH + 1];
sprintf_P(statusLine, PSTR("%-20S"), _T(MSG_TEMP_CALIBRATION));
char progress[4]; char progress[4];
sprintf_P(progress, PSTR("%d/6"), custom_message_state);
memcpy(statusLine + 12, progress, sizeof(progress) - 1);
lcd_set_cursor(0, 3); lcd_set_cursor(0, 3);
lcd_puts_P(_T(MSG_TEMP_CALIBRATION)); lcd_print(statusLine);
lcd_set_cursor(12, 3);
sprintf(progress, "%d/6", custom_message_state);
lcd_print(progress);
} }
break; break;
case CustomMsg::TempCompPreheat: // temp compensation preheat case CustomMsg::TempCompPreheat: // temp compensation preheat
@ -5742,10 +5743,7 @@ static void lcd_settings_menu()
MENU_ITEM_SUBMENU_P(_i("Lin. correction"), lcd_settings_linearity_correction_menu); MENU_ITEM_SUBMENU_P(_i("Lin. correction"), lcd_settings_linearity_correction_menu);
#endif //LINEARITY_CORRECTION && TMC2130 #endif //LINEARITY_CORRECTION && TMC2130
if (temp_cal_active == false) MENU_ITEM_TOGGLE_P(_T(MSG_TEMP_CALIBRATION), temp_cal_active ? _T(MSG_ON) : _T(MSG_OFF), lcd_temp_calibration_set);
MENU_ITEM_FUNCTION_P(_i("Temp. cal. [off]"), lcd_temp_calibration_set);////MSG_TEMP_CALIBRATION_OFF c=20 r=1
else
MENU_ITEM_FUNCTION_P(_i("Temp. cal. [on]"), lcd_temp_calibration_set);////MSG_TEMP_CALIBRATION_ON c=20 r=1
#ifdef HAS_SECOND_SERIAL_PORT #ifdef HAS_SECOND_SERIAL_PORT
MENU_ITEM_TOGGLE_P(_T(MSG_RPI_PORT), (selectedSerialPort == 0) ? _T(MSG_OFF) : _T(MSG_ON), lcd_second_serial_set); MENU_ITEM_TOGGLE_P(_T(MSG_RPI_PORT), (selectedSerialPort == 0) ? _T(MSG_OFF) : _T(MSG_ON), lcd_second_serial_set);

10
lang/lang_en.txt
View File

@ -750,18 +750,12 @@
# #
"Select filament:" "Select filament:"
#MSG_TEMP_CALIBRATION c=20 r=1 #MSG_TEMP_CALIBRATION c=12 r=1
"Temp. cal. " "Temp. cal."
#MSG_TEMP_CALIBRATION_ON c=20 r=1
"Temp. cal. [on]"
# #
"Select temperature which matches your material." "Select temperature which matches your material."
#MSG_TEMP_CALIBRATION_OFF c=20 r=1
"Temp. cal. [off]"
#MSG_CALIBRATION_PINDA_MENU c=17 r=1 #MSG_CALIBRATION_PINDA_MENU c=17 r=1
"Temp. calibration" "Temp. calibration"

14
lang/lang_en_cz.txt
View File

@ -1002,22 +1002,14 @@
"Select filament:" "Select filament:"
"Zvolte filament:" "Zvolte filament:"
#MSG_TEMP_CALIBRATION c=20 r=1 #MSG_TEMP_CALIBRATION c=12 r=1
"Temp. cal. " "Temp. cal."
"Tepl. kal. " "Tepl. kal."
#MSG_TEMP_CALIBRATION_ON c=20 r=1
"Temp. cal. [on]"
"Tepl. kal. [zap]"
# #
"Select temperature which matches your material." "Select temperature which matches your material."
"Zvolte teplotu, ktera odpovida vasemu materialu." "Zvolte teplotu, ktera odpovida vasemu materialu."
#MSG_TEMP_CALIBRATION_OFF c=20 r=1
"Temp. cal. [off]"
"Tepl. kal. [vyp]"
#MSG_CALIBRATION_PINDA_MENU c=17 r=1 #MSG_CALIBRATION_PINDA_MENU c=17 r=1
"Temp. calibration" "Temp. calibration"
"Teplot. kalibrace" "Teplot. kalibrace"

14
lang/lang_en_de.txt
View File

@ -1002,22 +1002,14 @@
"Select filament:" "Select filament:"
"Filament auswaehlen:" "Filament auswaehlen:"
#MSG_TEMP_CALIBRATION c=20 r=1 #MSG_TEMP_CALIBRATION c=12 r=1
"Temp. cal. " "Temp. cal."
"Temp Kalib. " "Temp Kalib."
#MSG_TEMP_CALIBRATION_ON c=20 r=1
"Temp. cal. [on]"
"Temp. Kal. [an]"
# #
"Select temperature which matches your material." "Select temperature which matches your material."
"Waehlen Sie die Temperatur, die zu Ihrem Material passt." "Waehlen Sie die Temperatur, die zu Ihrem Material passt."
#MSG_TEMP_CALIBRATION_OFF c=20 r=1
"Temp. cal. [off]"
"Temp. Kal. [aus]"
#MSG_CALIBRATION_PINDA_MENU c=17 r=1 #MSG_CALIBRATION_PINDA_MENU c=17 r=1
"Temp. calibration" "Temp. calibration"
"Temp. kalibrieren" "Temp. kalibrieren"

14
lang/lang_en_es.txt
View File

@ -1002,22 +1002,14 @@
"Select filament:" "Select filament:"
"Selecciona filamento:" "Selecciona filamento:"
#MSG_TEMP_CALIBRATION c=20 r=1 #MSG_TEMP_CALIBRATION c=12 r=1
"Temp. cal. " "Temp. cal."
"Cal. temp. " "Cal. temp."
#MSG_TEMP_CALIBRATION_ON c=20 r=1
"Temp. cal. [on]"
"Cal. temp. [on]"
# #
"Select temperature which matches your material." "Select temperature which matches your material."
"Selecciona la temperatura adecuada a tu material." "Selecciona la temperatura adecuada a tu material."
#MSG_TEMP_CALIBRATION_OFF c=20 r=1
"Temp. cal. [off]"
"Cal. temp. [off]"
#MSG_CALIBRATION_PINDA_MENU c=17 r=1 #MSG_CALIBRATION_PINDA_MENU c=17 r=1
"Temp. calibration" "Temp. calibration"
"Calibracion temp." "Calibracion temp."

12
lang/lang_en_fr.txt
View File

@ -999,22 +999,14 @@
"Select filament:" "Select filament:"
"Selectionnez le filament:" "Selectionnez le filament:"
#MSG_TEMP_CALIBRATION c=20 r=1 #MSG_TEMP_CALIBRATION c=12 r=1
"Temp. cal. " "Temp. cal."
"Calib. Temp." "Calib. Temp."
#MSG_TEMP_CALIBRATION_ON c=20 r=1
"Temp. cal. [on]"
"Calib. Temp. [on]"
# #
"Select temperature which matches your material." "Select temperature which matches your material."
"Selectionnez la temperature qui correspond a votre materiau." "Selectionnez la temperature qui correspond a votre materiau."
#MSG_TEMP_CALIBRATION_OFF c=20 r=1
"Temp. cal. [off]"
"Calib. Temp.[off]"
#MSG_CALIBRATION_PINDA_MENU c=17 r=1 #MSG_CALIBRATION_PINDA_MENU c=17 r=1
"Temp. calibration" "Temp. calibration"
"Calibration temp." "Calibration temp."

14
lang/lang_en_it.txt
View File

@ -1001,22 +1001,14 @@
"Select filament:" "Select filament:"
"Seleziona il filamento:" "Seleziona il filamento:"
#MSG_TEMP_CALIBRATION c=20 r=1 #MSG_TEMP_CALIBRATION c=12 r=1
"Temp. cal. " "Temp. cal."
"Calib. temp. " "Calib. temp."
#MSG_TEMP_CALIBRATION_ON c=20 r=1
"Temp. cal. [on]"
"Calib. temp. [on]"
# #
"Select temperature which matches your material." "Select temperature which matches your material."
"Seleziona la temperatura appropriata per il tuo materiale." "Seleziona la temperatura appropriata per il tuo materiale."
#MSG_TEMP_CALIBRATION_OFF c=20 r=1
"Temp. cal. [off]"
"Calib. temp.[off]"
#MSG_CALIBRATION_PINDA_MENU c=17 r=1 #MSG_CALIBRATION_PINDA_MENU c=17 r=1
"Temp. calibration" "Temp. calibration"
"Calib. Temp." "Calib. Temp."

12
lang/lang_en_pl.txt
View File

@ -1000,22 +1000,14 @@
"Select filament:" "Select filament:"
"Wybierz filament:" "Wybierz filament:"
#MSG_TEMP_CALIBRATION c=20 r=1 #MSG_TEMP_CALIBRATION c=12 r=1
"Temp. cal. " "Temp. cal."
"Kalibracja temp." "Kalibracja temp."
#MSG_TEMP_CALIBRATION_ON c=20 r=1
"Temp. cal. [on]"
"Kalibr.temp. [wl]"
# #
"Select temperature which matches your material." "Select temperature which matches your material."
"Wybierz temperature, ktora odpowiada Twojemu filamentowi." "Wybierz temperature, ktora odpowiada Twojemu filamentowi."
#MSG_TEMP_CALIBRATION_OFF c=20 r=1
"Temp. cal. [off]"
"Kalibr.temp.[wyl]"
#MSG_CALIBRATION_PINDA_MENU c=17 r=1 #MSG_CALIBRATION_PINDA_MENU c=17 r=1
"Temp. calibration" "Temp. calibration"
"Kalibracja temp." "Kalibracja temp."