diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index d0bb8603..296fc9d8 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1162,11 +1162,12 @@ void setup() if (lang_selected >= LANG_NUM){ lcd_mylang(); } - temp_cal_active = eeprom_read_byte((uint8_t*)EEPROM_TEMP_CAL_ACTIVE); - if (temp_cal_active == 0xFF) { + + if (eeprom_read_byte((uint8_t*)EEPROM_TEMP_CAL_ACTIVE) == 255) { eeprom_write_byte((uint8_t*)EEPROM_TEMP_CAL_ACTIVE, 0); - temp_cal_active = 0; - } + temp_cal_active = false; + } else temp_cal_active = eeprom_read_byte((uint8_t*)EEPROM_TEMP_CAL_ACTIVE); + check_babystep(); //checking if Z babystep is in allowed range if (calibration_status() == CALIBRATION_STATUS_ASSEMBLED || @@ -2948,7 +2949,7 @@ void process_commands() break; } - if (run == false && card.sdprinting == true && temp_cal_active == true) { + if (run == false && card.sdprinting == true && temp_cal_active == true && calibration_status() < CALIBRATION_STATUS_PINDA) { temp_compensation_start(); run = true; repeatcommand_front(); // repeat G80 with all its parameters @@ -3095,7 +3096,7 @@ void process_commands() } clean_up_after_endstop_move(); SERIAL_ECHOLNPGM("clean up finished "); - if(temp_cal_active == true) temp_compensation_apply(); //apply PINDA temperature compensation + if(temp_cal_active == true && calibration_status() < CALIBRATION_STATUS_PINDA) temp_compensation_apply(); //apply PINDA temperature compensation babystep_apply(); // Apply Z height correction aka baby stepping before mesh bed leveing gets activated. SERIAL_ECHOLNPGM("babystep applied"); bool eeprom_bed_correction_valid = eeprom_read_byte((unsigned char*)EEPROM_BED_CORRECTION_VALID) == 1; diff --git a/Firmware/language_all.cpp b/Firmware/language_all.cpp index fc774781..a55b30e8 100644 --- a/Firmware/language_all.cpp +++ b/Firmware/language_all.cpp @@ -494,13 +494,25 @@ const char * const MSG_CALIBRATE_E_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_CALIBRATE_E_DE }; -const char MSG_CALIBRATE_PINDA_EN[] PROGMEM = "Temp. calibration"; -const char * const MSG_CALIBRATE_PINDA_LANG_TABLE[1] PROGMEM = { +const char MSG_CALIBRATE_PINDA_EN[] PROGMEM = "Calibrate"; +const char MSG_CALIBRATE_PINDA_CZ[] PROGMEM = "Zkalibrovat"; +const char * const MSG_CALIBRATE_PINDA_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_CALIBRATE_PINDA_EN, + MSG_CALIBRATE_PINDA_CZ, + MSG_CALIBRATE_PINDA_EN, + MSG_CALIBRATE_PINDA_EN, + MSG_CALIBRATE_PINDA_EN, MSG_CALIBRATE_PINDA_EN }; const char MSG_CALIBRATION_PINDA_MENU_EN[] PROGMEM = "Temp. calibration"; -const char * const MSG_CALIBRATION_PINDA_MENU_LANG_TABLE[1] PROGMEM = { +const char MSG_CALIBRATION_PINDA_MENU_CZ[] PROGMEM = "Teplotni kalibrace"; +const char * const MSG_CALIBRATION_PINDA_MENU_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_CALIBRATION_PINDA_MENU_EN, + MSG_CALIBRATION_PINDA_MENU_CZ, + MSG_CALIBRATION_PINDA_MENU_EN, + MSG_CALIBRATION_PINDA_MENU_EN, + MSG_CALIBRATION_PINDA_MENU_EN, MSG_CALIBRATION_PINDA_MENU_EN }; @@ -702,11 +714,6 @@ const char * const MSG_DWELL_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_DWELL_DE }; -const char MSG_EEPROM_SAVING_EN[] PROGMEM = "Saving"; -const char * const MSG_EEPROM_SAVING_LANG_TABLE[1] PROGMEM = { - MSG_EEPROM_SAVING_EN -}; - const char MSG_ENDSTOPS_HIT_EN[] PROGMEM = "endstops hit: "; const char * const MSG_ENDSTOPS_HIT_LANG_TABLE[1] PROGMEM = { MSG_ENDSTOPS_HIT_EN @@ -1017,7 +1024,13 @@ const char * const MSG_FIND_BED_OFFSET_AND_SKEW_LINE2_LANG_TABLE[LANG_NUM] PROGM }; const char MSG_FINISHING_MOVEMENTS_EN[] PROGMEM = "Finishing movements"; -const char * const MSG_FINISHING_MOVEMENTS_LANG_TABLE[1] PROGMEM = { +const char MSG_FINISHING_MOVEMENTS_CZ[] PROGMEM = "Dokoncovani pohybu"; +const char * const MSG_FINISHING_MOVEMENTS_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_FINISHING_MOVEMENTS_EN, + MSG_FINISHING_MOVEMENTS_CZ, + MSG_FINISHING_MOVEMENTS_EN, + MSG_FINISHING_MOVEMENTS_EN, + MSG_FINISHING_MOVEMENTS_EN, MSG_FINISHING_MOVEMENTS_EN }; @@ -1757,27 +1770,57 @@ const char * const MSG_PICK_Z_LANG_TABLE[LANG_NUM] PROGMEM = { }; const char MSG_PID_EXTRUDER_EN[] PROGMEM = "PID calibration"; -const char * const MSG_PID_EXTRUDER_LANG_TABLE[1] PROGMEM = { +const char MSG_PID_EXTRUDER_CZ[] PROGMEM = "PID kalibrace"; +const char * const MSG_PID_EXTRUDER_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_PID_EXTRUDER_EN, + MSG_PID_EXTRUDER_CZ, + MSG_PID_EXTRUDER_EN, + MSG_PID_EXTRUDER_EN, + MSG_PID_EXTRUDER_EN, MSG_PID_EXTRUDER_EN }; const char MSG_PID_FINISHED_EN[] PROGMEM = "PID cal. finished"; -const char * const MSG_PID_FINISHED_LANG_TABLE[1] PROGMEM = { +const char MSG_PID_FINISHED_CZ[] PROGMEM = "PID kal. ukoncena"; +const char * const MSG_PID_FINISHED_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_PID_FINISHED_EN, + MSG_PID_FINISHED_CZ, + MSG_PID_FINISHED_EN, + MSG_PID_FINISHED_EN, + MSG_PID_FINISHED_EN, MSG_PID_FINISHED_EN }; const char MSG_PID_RUNNING_EN[] PROGMEM = "PID cal. "; -const char * const MSG_PID_RUNNING_LANG_TABLE[1] PROGMEM = { +const char MSG_PID_RUNNING_CZ[] PROGMEM = "PID kal. "; +const char * const MSG_PID_RUNNING_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_PID_RUNNING_EN, + MSG_PID_RUNNING_CZ, + MSG_PID_RUNNING_EN, + MSG_PID_RUNNING_EN, + MSG_PID_RUNNING_EN, MSG_PID_RUNNING_EN }; const char MSG_PINDA_NOT_CALIBRATED_EN[] PROGMEM = "Temperature calibration has not been run yet"; -const char * const MSG_PINDA_NOT_CALIBRATED_LANG_TABLE[1] PROGMEM = { +const char MSG_PINDA_NOT_CALIBRATED_CZ[] PROGMEM = "Tiskarna nebyla teplotne zkalibrovana"; +const char * const MSG_PINDA_NOT_CALIBRATED_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_PINDA_NOT_CALIBRATED_EN, + MSG_PINDA_NOT_CALIBRATED_CZ, + MSG_PINDA_NOT_CALIBRATED_EN, + MSG_PINDA_NOT_CALIBRATED_EN, + MSG_PINDA_NOT_CALIBRATED_EN, MSG_PINDA_NOT_CALIBRATED_EN }; const char MSG_PINDA_PREHEAT_EN[] PROGMEM = "Preheating"; -const char * const MSG_PINDA_PREHEAT_LANG_TABLE[1] PROGMEM = { +const char MSG_PINDA_PREHEAT_CZ[] PROGMEM = "Predehrivani"; +const char * const MSG_PINDA_PREHEAT_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_PINDA_PREHEAT_EN, + MSG_PINDA_PREHEAT_CZ, + MSG_PINDA_PREHEAT_EN, + MSG_PINDA_PREHEAT_EN, + MSG_PINDA_PREHEAT_EN, MSG_PINDA_PREHEAT_EN }; @@ -1877,7 +1920,13 @@ const char * const MSG_PRINT_ABORTED_LANG_TABLE[LANG_NUM] PROGMEM = { }; const char MSG_PRINT_PAUSED_EN[] PROGMEM = "Print paused"; -const char * const MSG_PRINT_PAUSED_LANG_TABLE[1] PROGMEM = { +const char MSG_PRINT_PAUSED_CZ[] PROGMEM = "Tisk pozastaven"; +const char * const MSG_PRINT_PAUSED_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_PRINT_PAUSED_EN, + MSG_PRINT_PAUSED_CZ, + MSG_PRINT_PAUSED_EN, + MSG_PRINT_PAUSED_EN, + MSG_PRINT_PAUSED_EN, MSG_PRINT_PAUSED_EN }; @@ -1988,7 +2037,13 @@ const char * const MSG_RESUMING_LANG_TABLE[LANG_NUM] PROGMEM = { }; const char MSG_RESUMING_PRINT_EN[] PROGMEM = "Resuming print"; -const char * const MSG_RESUMING_PRINT_LANG_TABLE[1] PROGMEM = { +const char MSG_RESUMING_PRINT_CZ[] PROGMEM = "Obnovovani tisku"; +const char * const MSG_RESUMING_PRINT_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_RESUMING_PRINT_EN, + MSG_RESUMING_PRINT_CZ, + MSG_RESUMING_PRINT_EN, + MSG_RESUMING_PRINT_EN, + MSG_RESUMING_PRINT_EN, MSG_RESUMING_PRINT_EN }; @@ -2491,8 +2546,14 @@ const char * const MSG_SET_ORIGIN_LANG_TABLE[1] PROGMEM = { MSG_SET_ORIGIN_EN }; -const char MSG_SET_TEMPERATURE_EN[] PROGMEM = "Set temperature"; -const char * const MSG_SET_TEMPERATURE_LANG_TABLE[1] PROGMEM = { +const char MSG_SET_TEMPERATURE_EN[] PROGMEM = "Set temperature:"; +const char MSG_SET_TEMPERATURE_CZ[] PROGMEM = "Nastavte teplotu:"; +const char * const MSG_SET_TEMPERATURE_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_SET_TEMPERATURE_EN, + MSG_SET_TEMPERATURE_CZ, + MSG_SET_TEMPERATURE_EN, + MSG_SET_TEMPERATURE_EN, + MSG_SET_TEMPERATURE_EN, MSG_SET_TEMPERATURE_EN }; @@ -2748,23 +2809,47 @@ const char * const MSG_TEMPERATURE_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_TEMPERATURE_DE }; -const char MSG_TEMP_CALIBRATION_EN[] PROGMEM = "Temp. calibration "; -const char * const MSG_TEMP_CALIBRATION_LANG_TABLE[1] PROGMEM = { +const char MSG_TEMP_CALIBRATION_EN[] PROGMEM = "Temp. cal. "; +const char MSG_TEMP_CALIBRATION_CZ[] PROGMEM = "Tepl. kal. "; +const char * const MSG_TEMP_CALIBRATION_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_TEMP_CALIBRATION_EN, + MSG_TEMP_CALIBRATION_CZ, + MSG_TEMP_CALIBRATION_EN, + MSG_TEMP_CALIBRATION_EN, + MSG_TEMP_CALIBRATION_EN, MSG_TEMP_CALIBRATION_EN }; const char MSG_TEMP_CALIBRATION_DONE_EN[] PROGMEM = "Temperature calibration is finished. Click to continue."; -const char * const MSG_TEMP_CALIBRATION_DONE_LANG_TABLE[1] PROGMEM = { +const char MSG_TEMP_CALIBRATION_DONE_CZ[] PROGMEM = "Teplotni kalibrace dokoncena. Pokracujte stiskem tlacitka."; +const char * const MSG_TEMP_CALIBRATION_DONE_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_TEMP_CALIBRATION_DONE_EN, + MSG_TEMP_CALIBRATION_DONE_CZ, + MSG_TEMP_CALIBRATION_DONE_EN, + MSG_TEMP_CALIBRATION_DONE_EN, + MSG_TEMP_CALIBRATION_DONE_EN, MSG_TEMP_CALIBRATION_DONE_EN }; const char MSG_TEMP_CALIBRATION_OFF_EN[] PROGMEM = "Temp. cal. [OFF]"; -const char * const MSG_TEMP_CALIBRATION_OFF_LANG_TABLE[1] PROGMEM = { +const char MSG_TEMP_CALIBRATION_OFF_CZ[] PROGMEM = "Tepl. kal. [OFF]"; +const char * const MSG_TEMP_CALIBRATION_OFF_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_TEMP_CALIBRATION_OFF_EN, + MSG_TEMP_CALIBRATION_OFF_CZ, + MSG_TEMP_CALIBRATION_OFF_EN, + MSG_TEMP_CALIBRATION_OFF_EN, + MSG_TEMP_CALIBRATION_OFF_EN, MSG_TEMP_CALIBRATION_OFF_EN }; const char MSG_TEMP_CALIBRATION_ON_EN[] PROGMEM = "Temp. cal. [ON]"; -const char * const MSG_TEMP_CALIBRATION_ON_LANG_TABLE[1] PROGMEM = { +const char MSG_TEMP_CALIBRATION_ON_CZ[] PROGMEM = "Tepl. kal. [ON]"; +const char * const MSG_TEMP_CALIBRATION_ON_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_TEMP_CALIBRATION_ON_EN, + MSG_TEMP_CALIBRATION_ON_CZ, + MSG_TEMP_CALIBRATION_ON_EN, + MSG_TEMP_CALIBRATION_ON_EN, + MSG_TEMP_CALIBRATION_ON_EN, MSG_TEMP_CALIBRATION_ON_EN }; diff --git a/Firmware/language_all.h b/Firmware/language_all.h index d9f13c44..1844f09c 100644 --- a/Firmware/language_all.h +++ b/Firmware/language_all.h @@ -107,10 +107,10 @@ extern const char* const MSG_CALIBRATE_BED_RESET_LANG_TABLE[LANG_NUM]; #define MSG_CALIBRATE_BED_RESET LANG_TABLE_SELECT(MSG_CALIBRATE_BED_RESET_LANG_TABLE) extern const char* const MSG_CALIBRATE_E_LANG_TABLE[LANG_NUM]; #define MSG_CALIBRATE_E LANG_TABLE_SELECT(MSG_CALIBRATE_E_LANG_TABLE) -extern const char* const MSG_CALIBRATE_PINDA_LANG_TABLE[1]; -#define MSG_CALIBRATE_PINDA LANG_TABLE_SELECT_EXPLICIT(MSG_CALIBRATE_PINDA_LANG_TABLE, 0) -extern const char* const MSG_CALIBRATION_PINDA_MENU_LANG_TABLE[1]; -#define MSG_CALIBRATION_PINDA_MENU LANG_TABLE_SELECT_EXPLICIT(MSG_CALIBRATION_PINDA_MENU_LANG_TABLE, 0) +extern const char* const MSG_CALIBRATE_PINDA_LANG_TABLE[LANG_NUM]; +#define MSG_CALIBRATE_PINDA LANG_TABLE_SELECT(MSG_CALIBRATE_PINDA_LANG_TABLE) +extern const char* const MSG_CALIBRATION_PINDA_MENU_LANG_TABLE[LANG_NUM]; +#define MSG_CALIBRATION_PINDA_MENU LANG_TABLE_SELECT(MSG_CALIBRATION_PINDA_MENU_LANG_TABLE) extern const char* const MSG_CARD_MENU_LANG_TABLE[LANG_NUM]; #define MSG_CARD_MENU LANG_TABLE_SELECT(MSG_CARD_MENU_LANG_TABLE) extern const char* const MSG_CHANGE_EXTR_LANG_TABLE[LANG_NUM]; @@ -143,8 +143,6 @@ extern const char* const MSG_DISABLE_STEPPERS_LANG_TABLE[LANG_NUM]; #define MSG_DISABLE_STEPPERS LANG_TABLE_SELECT(MSG_DISABLE_STEPPERS_LANG_TABLE) extern const char* const MSG_DWELL_LANG_TABLE[LANG_NUM]; #define MSG_DWELL LANG_TABLE_SELECT(MSG_DWELL_LANG_TABLE) -extern const char* const MSG_EEPROM_SAVING_LANG_TABLE[1]; -#define MSG_EEPROM_SAVING LANG_TABLE_SELECT_EXPLICIT(MSG_EEPROM_SAVING_LANG_TABLE, 0) extern const char* const MSG_ENDSTOPS_HIT_LANG_TABLE[1]; #define MSG_ENDSTOPS_HIT LANG_TABLE_SELECT_EXPLICIT(MSG_ENDSTOPS_HIT_LANG_TABLE, 0) extern const char* const MSG_ENDSTOP_HIT_LANG_TABLE[1]; @@ -213,8 +211,8 @@ extern const char* const MSG_FIND_BED_OFFSET_AND_SKEW_LINE1_LANG_TABLE[LANG_NUM] #define MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 LANG_TABLE_SELECT(MSG_FIND_BED_OFFSET_AND_SKEW_LINE1_LANG_TABLE) extern const char* const MSG_FIND_BED_OFFSET_AND_SKEW_LINE2_LANG_TABLE[LANG_NUM]; #define MSG_FIND_BED_OFFSET_AND_SKEW_LINE2 LANG_TABLE_SELECT(MSG_FIND_BED_OFFSET_AND_SKEW_LINE2_LANG_TABLE) -extern const char* const MSG_FINISHING_MOVEMENTS_LANG_TABLE[1]; -#define MSG_FINISHING_MOVEMENTS LANG_TABLE_SELECT_EXPLICIT(MSG_FINISHING_MOVEMENTS_LANG_TABLE, 0) +extern const char* const MSG_FINISHING_MOVEMENTS_LANG_TABLE[LANG_NUM]; +#define MSG_FINISHING_MOVEMENTS LANG_TABLE_SELECT(MSG_FINISHING_MOVEMENTS_LANG_TABLE) extern const char* const MSG_FLOW_LANG_TABLE[LANG_NUM]; #define MSG_FLOW LANG_TABLE_SELECT(MSG_FLOW_LANG_TABLE) extern const char* const MSG_FLOW0_LANG_TABLE[1]; @@ -353,16 +351,16 @@ extern const char* const MSG_PAUSE_PRINT_LANG_TABLE[LANG_NUM]; #define MSG_PAUSE_PRINT LANG_TABLE_SELECT(MSG_PAUSE_PRINT_LANG_TABLE) extern const char* const MSG_PICK_Z_LANG_TABLE[LANG_NUM]; #define MSG_PICK_Z LANG_TABLE_SELECT(MSG_PICK_Z_LANG_TABLE) -extern const char* const MSG_PID_EXTRUDER_LANG_TABLE[1]; -#define MSG_PID_EXTRUDER LANG_TABLE_SELECT_EXPLICIT(MSG_PID_EXTRUDER_LANG_TABLE, 0) -extern const char* const MSG_PID_FINISHED_LANG_TABLE[1]; -#define MSG_PID_FINISHED LANG_TABLE_SELECT_EXPLICIT(MSG_PID_FINISHED_LANG_TABLE, 0) -extern const char* const MSG_PID_RUNNING_LANG_TABLE[1]; -#define MSG_PID_RUNNING LANG_TABLE_SELECT_EXPLICIT(MSG_PID_RUNNING_LANG_TABLE, 0) -extern const char* const MSG_PINDA_NOT_CALIBRATED_LANG_TABLE[1]; -#define MSG_PINDA_NOT_CALIBRATED LANG_TABLE_SELECT_EXPLICIT(MSG_PINDA_NOT_CALIBRATED_LANG_TABLE, 0) -extern const char* const MSG_PINDA_PREHEAT_LANG_TABLE[1]; -#define MSG_PINDA_PREHEAT LANG_TABLE_SELECT_EXPLICIT(MSG_PINDA_PREHEAT_LANG_TABLE, 0) +extern const char* const MSG_PID_EXTRUDER_LANG_TABLE[LANG_NUM]; +#define MSG_PID_EXTRUDER LANG_TABLE_SELECT(MSG_PID_EXTRUDER_LANG_TABLE) +extern const char* const MSG_PID_FINISHED_LANG_TABLE[LANG_NUM]; +#define MSG_PID_FINISHED LANG_TABLE_SELECT(MSG_PID_FINISHED_LANG_TABLE) +extern const char* const MSG_PID_RUNNING_LANG_TABLE[LANG_NUM]; +#define MSG_PID_RUNNING LANG_TABLE_SELECT(MSG_PID_RUNNING_LANG_TABLE) +extern const char* const MSG_PINDA_NOT_CALIBRATED_LANG_TABLE[LANG_NUM]; +#define MSG_PINDA_NOT_CALIBRATED LANG_TABLE_SELECT(MSG_PINDA_NOT_CALIBRATED_LANG_TABLE) +extern const char* const MSG_PINDA_PREHEAT_LANG_TABLE[LANG_NUM]; +#define MSG_PINDA_PREHEAT LANG_TABLE_SELECT(MSG_PINDA_PREHEAT_LANG_TABLE) extern const char* const MSG_PLANNER_BUFFER_BYTES_LANG_TABLE[1]; #define MSG_PLANNER_BUFFER_BYTES LANG_TABLE_SELECT_EXPLICIT(MSG_PLANNER_BUFFER_BYTES_LANG_TABLE, 0) extern const char* const MSG_PLEASE_WAIT_LANG_TABLE[LANG_NUM]; @@ -381,8 +379,8 @@ extern const char* const MSG_PRINTER_DISCONNECTED_LANG_TABLE[1]; #define MSG_PRINTER_DISCONNECTED LANG_TABLE_SELECT_EXPLICIT(MSG_PRINTER_DISCONNECTED_LANG_TABLE, 0) extern const char* const MSG_PRINT_ABORTED_LANG_TABLE[LANG_NUM]; #define MSG_PRINT_ABORTED LANG_TABLE_SELECT(MSG_PRINT_ABORTED_LANG_TABLE) -extern const char* const MSG_PRINT_PAUSED_LANG_TABLE[1]; -#define MSG_PRINT_PAUSED LANG_TABLE_SELECT_EXPLICIT(MSG_PRINT_PAUSED_LANG_TABLE, 0) +extern const char* const MSG_PRINT_PAUSED_LANG_TABLE[LANG_NUM]; +#define MSG_PRINT_PAUSED LANG_TABLE_SELECT(MSG_PRINT_PAUSED_LANG_TABLE) extern const char* const MSG_PRUSA3D_LANG_TABLE[LANG_NUM]; #define MSG_PRUSA3D LANG_TABLE_SELECT(MSG_PRUSA3D_LANG_TABLE) extern const char* const MSG_PRUSA3D_FORUM_LANG_TABLE[LANG_NUM]; @@ -405,8 +403,8 @@ extern const char* const MSG_RESUME_PRINT_LANG_TABLE[LANG_NUM]; #define MSG_RESUME_PRINT LANG_TABLE_SELECT(MSG_RESUME_PRINT_LANG_TABLE) extern const char* const MSG_RESUMING_LANG_TABLE[LANG_NUM]; #define MSG_RESUMING LANG_TABLE_SELECT(MSG_RESUMING_LANG_TABLE) -extern const char* const MSG_RESUMING_PRINT_LANG_TABLE[1]; -#define MSG_RESUMING_PRINT LANG_TABLE_SELECT_EXPLICIT(MSG_RESUMING_PRINT_LANG_TABLE, 0) +extern const char* const MSG_RESUMING_PRINT_LANG_TABLE[LANG_NUM]; +#define MSG_RESUMING_PRINT LANG_TABLE_SELECT(MSG_RESUMING_PRINT_LANG_TABLE) extern const char* const MSG_SD_CANT_ENTER_SUBDIR_LANG_TABLE[1]; #define MSG_SD_CANT_ENTER_SUBDIR LANG_TABLE_SELECT_EXPLICIT(MSG_SD_CANT_ENTER_SUBDIR_LANG_TABLE, 0) extern const char* const MSG_SD_CANT_OPEN_SUBDIR_LANG_TABLE[1]; @@ -501,8 +499,8 @@ extern const char* const MSG_SET_HOME_OFFSETS_LANG_TABLE[1]; #define MSG_SET_HOME_OFFSETS LANG_TABLE_SELECT_EXPLICIT(MSG_SET_HOME_OFFSETS_LANG_TABLE, 0) extern const char* const MSG_SET_ORIGIN_LANG_TABLE[1]; #define MSG_SET_ORIGIN LANG_TABLE_SELECT_EXPLICIT(MSG_SET_ORIGIN_LANG_TABLE, 0) -extern const char* const MSG_SET_TEMPERATURE_LANG_TABLE[1]; -#define MSG_SET_TEMPERATURE LANG_TABLE_SELECT_EXPLICIT(MSG_SET_TEMPERATURE_LANG_TABLE, 0) +extern const char* const MSG_SET_TEMPERATURE_LANG_TABLE[LANG_NUM]; +#define MSG_SET_TEMPERATURE LANG_TABLE_SELECT(MSG_SET_TEMPERATURE_LANG_TABLE) extern const char* const MSG_SHOW_END_STOPS_LANG_TABLE[LANG_NUM]; #define MSG_SHOW_END_STOPS LANG_TABLE_SELECT(MSG_SHOW_END_STOPS_LANG_TABLE) extern const char* const MSG_SILENT_MODE_OFF_LANG_TABLE[LANG_NUM]; @@ -543,14 +541,14 @@ extern const char* const MSG_TAKE_EFFECT_LANG_TABLE[LANG_NUM]; #define MSG_TAKE_EFFECT LANG_TABLE_SELECT(MSG_TAKE_EFFECT_LANG_TABLE) extern const char* const MSG_TEMPERATURE_LANG_TABLE[LANG_NUM]; #define MSG_TEMPERATURE LANG_TABLE_SELECT(MSG_TEMPERATURE_LANG_TABLE) -extern const char* const MSG_TEMP_CALIBRATION_LANG_TABLE[1]; -#define MSG_TEMP_CALIBRATION LANG_TABLE_SELECT_EXPLICIT(MSG_TEMP_CALIBRATION_LANG_TABLE, 0) -extern const char* const MSG_TEMP_CALIBRATION_DONE_LANG_TABLE[1]; -#define MSG_TEMP_CALIBRATION_DONE LANG_TABLE_SELECT_EXPLICIT(MSG_TEMP_CALIBRATION_DONE_LANG_TABLE, 0) -extern const char* const MSG_TEMP_CALIBRATION_OFF_LANG_TABLE[1]; -#define MSG_TEMP_CALIBRATION_OFF LANG_TABLE_SELECT_EXPLICIT(MSG_TEMP_CALIBRATION_OFF_LANG_TABLE, 0) -extern const char* const MSG_TEMP_CALIBRATION_ON_LANG_TABLE[1]; -#define MSG_TEMP_CALIBRATION_ON LANG_TABLE_SELECT_EXPLICIT(MSG_TEMP_CALIBRATION_ON_LANG_TABLE, 0) +extern const char* const MSG_TEMP_CALIBRATION_LANG_TABLE[LANG_NUM]; +#define MSG_TEMP_CALIBRATION LANG_TABLE_SELECT(MSG_TEMP_CALIBRATION_LANG_TABLE) +extern const char* const MSG_TEMP_CALIBRATION_DONE_LANG_TABLE[LANG_NUM]; +#define MSG_TEMP_CALIBRATION_DONE LANG_TABLE_SELECT(MSG_TEMP_CALIBRATION_DONE_LANG_TABLE) +extern const char* const MSG_TEMP_CALIBRATION_OFF_LANG_TABLE[LANG_NUM]; +#define MSG_TEMP_CALIBRATION_OFF LANG_TABLE_SELECT(MSG_TEMP_CALIBRATION_OFF_LANG_TABLE) +extern const char* const MSG_TEMP_CALIBRATION_ON_LANG_TABLE[LANG_NUM]; +#define MSG_TEMP_CALIBRATION_ON LANG_TABLE_SELECT(MSG_TEMP_CALIBRATION_ON_LANG_TABLE) extern const char* const MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF_LANG_TABLE[LANG_NUM]; #define MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF LANG_TABLE_SELECT(MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF_LANG_TABLE) extern const char* const MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON_LANG_TABLE[LANG_NUM]; diff --git a/Firmware/language_cz.h b/Firmware/language_cz.h index 9dda46c2..b2267ad8 100644 --- a/Firmware/language_cz.h +++ b/Firmware/language_cz.h @@ -264,4 +264,21 @@ #define MSG_FILAMENT_CLEAN "Je barva cista?" #define MSG_UNLOADING_FILAMENT "Vysouvam filament" -#define MSG_PAPER "Umistete list papiru na podlozku a udrzujte jej pod tryskou behem mereni prvnich 4 bodu. Pokud tryska zachyti papir, vypnete tiskarnu." \ No newline at end of file +#define MSG_PAPER "Umistete list papiru na podlozku a udrzujte jej pod tryskou behem mereni prvnich 4 bodu. Pokud tryska zachyti papir, vypnete tiskarnu." + +#define MSG_FINISHING_MOVEMENTS "Dokoncovani pohybu" +#define MSG_PRINT_PAUSED "Tisk pozastaven" +#define MSG_RESUMING_PRINT "Obnovovani tisku" +#define MSG_PID_EXTRUDER "PID kalibrace" +#define MSG_SET_TEMPERATURE "Nastavte teplotu:" +#define MSG_PID_FINISHED "PID kal. ukoncena" +#define MSG_PID_RUNNING "PID kal. " + +#define MSG_CALIBRATE_PINDA "Zkalibrovat" +#define MSG_CALIBRATION_PINDA_MENU "Teplotni kalibrace" +#define MSG_PINDA_NOT_CALIBRATED "Tiskarna nebyla teplotne zkalibrovana" +#define MSG_PINDA_PREHEAT "Predehrivani" +#define MSG_TEMP_CALIBRATION "Tepl. kal. " +#define MSG_TEMP_CALIBRATION_DONE "Teplotni kalibrace dokoncena. Pokracujte stiskem tlacitka." +#define MSG_TEMP_CALIBRATION_ON "Tepl. kal. [ON]" +#define MSG_TEMP_CALIBRATION_OFF "Tepl. kal. [OFF]" \ No newline at end of file diff --git a/Firmware/language_en.h b/Firmware/language_en.h index 2bbcd432..8c5e71d8 100644 --- a/Firmware/language_en.h +++ b/Firmware/language_en.h @@ -267,20 +267,20 @@ #define MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF "SD card [normal]" #define MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON "SD card [FlshAir]" #define MSG_PRINTER_DISCONNECTED "Printer disconnected" -#define MSG_FINISHING_MOVEMENTS "Finishing movements" -#define MSG_PRINT_PAUSED "Print paused" -#define MSG_RESUMING_PRINT "Resuming print" -#define MSG_PID_EXTRUDER "PID calibration" -#define MSG_SET_TEMPERATURE "Set temperature" -#define MSG_PID_FINISHED "PID cal. finished" -#define MSG_PID_RUNNING "PID cal. " -#define MSG_EEPROM_SAVING "Saving" +#define(length=20, lines=1) MSG_FINISHING_MOVEMENTS "Finishing movements" +#define(length=20, lines=1) MSG_PRINT_PAUSED "Print paused" +#define(length=20, lines=1) MSG_RESUMING_PRINT "Resuming print" +#define(length=17, lines=1) MSG_PID_EXTRUDER "PID calibration" +#define(length=19, lines=1) MSG_SET_TEMPERATURE "Set temperature:" +#define(length=20, lines=1) MSG_PID_FINISHED "PID cal. finished" +#define(length=20, lines=1) MSG_PID_RUNNING "PID cal. " + +#define(length=17, lines=1) MSG_CALIBRATE_PINDA "Calibrate" +#define(length=17, lines=1) MSG_CALIBRATION_PINDA_MENU "Temp. calibration" +#define(length=20, lines=4) MSG_PINDA_NOT_CALIBRATED "Temperature calibration has not been run yet" +#define(length=20, lines=1) MSG_PINDA_PREHEAT "Preheating" +#define(length=20, lines=1) MSG_TEMP_CALIBRATION "Temp. cal. " +#define(length=20, lines=4) MSG_TEMP_CALIBRATION_DONE "Temperature calibration is finished. Click to continue." +#define(length=20, lines=1) MSG_TEMP_CALIBRATION_ON "Temp. cal. [ON]" +#define(length=20, lines=1) MSG_TEMP_CALIBRATION_OFF "Temp. cal. [OFF]" -#define MSG_CALIBRATE_PINDA "Temp. calibration" -#define MSG_CALIBRATION_PINDA_MENU "Temp. calibration" -#define MSG_PINDA_NOT_CALIBRATED "Temperature calibration has not been run yet" -#define MSG_PINDA_PREHEAT "Preheating" -#define MSG_TEMP_CALIBRATION "Temp. calibration " -#define MSG_TEMP_CALIBRATION_DONE "Temperature calibration is finished. Click to continue." -#define MSG_TEMP_CALIBRATION_ON "Temp. cal. [ON]" -#define MSG_TEMP_CALIBRATION_OFF "Temp. cal. [OFF]" \ No newline at end of file diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 87d84cc1..07c23c13 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -556,7 +556,8 @@ void lcd_commands() strcpy(cmd1, "G1 Z"); strcat(cmd1, ftostr32(pause_lastpos[Z_AXIS])); enquecommand(cmd1); - enquecommand_P(PSTR("M83")); // set extruder to relative mode. + if (axis_relative_modes[3] == true) enquecommand_P(PSTR("M83")); // set extruder to relative mode. + else enquecommand_P(PSTR("M82")); // set extruder to absolute mode enquecommand_P(PSTR("G1 E" STRINGIFY(PAUSE_RETRACT))); //unretract enquecommand_P(PSTR("G90")); //absolute positioning lcd_commands_step = 1; @@ -2620,7 +2621,7 @@ static void lcd_calibration_menu() MENU_ITEM(function, MSG_CALIBRATE_BED, lcd_mesh_calibration); // "Calibrate Z" with storing the reference values to EEPROM. MENU_ITEM(submenu, MSG_HOMEYZ, lcd_mesh_calibration_z); - MENU_ITEM(submenu, MSG_CALIBRATION_PINDA_MENU, lcd_pinda_calibration_menu); + #ifndef SNMM //MENU_ITEM(function, MSG_CALIBRATE_E, lcd_calibrate_extruder); #endif @@ -2629,6 +2630,7 @@ MENU_ITEM(function, MSG_CALIBRATE_BED, lcd_mesh_calibration); #endif MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28 W")); MENU_ITEM(submenu, MSG_BED_CORRECTION_MENU, lcd_adjust_bed); + MENU_ITEM(submenu, MSG_CALIBRATION_PINDA_MENU, lcd_pinda_calibration_menu); MENU_ITEM(submenu, MSG_PID_EXTRUDER, pid_extruder); MENU_ITEM(submenu, MSG_SHOW_END_STOPS, menu_show_end_stops); MENU_ITEM(gcode, MSG_CALIBRATE_BED_RESET, PSTR("M44")); @@ -3900,6 +3902,7 @@ static void lcd_selftest() _progress = lcd_selftest_screen(4, _progress, 3, true, 1500); _result = lcd_selfcheck_axis(2, Z_MAX_POS); enquecommand_P(PSTR("G28 W")); + enquecommand_P(PSTR("G1 Z15")); } if (_result) diff --git a/Firmware/ultralcd_implementation_hitachi_HD44780.h b/Firmware/ultralcd_implementation_hitachi_HD44780.h index a718db5e..da393a66 100644 --- a/Firmware/ultralcd_implementation_hitachi_HD44780.h +++ b/Firmware/ultralcd_implementation_hitachi_HD44780.h @@ -964,7 +964,7 @@ static void lcd_implementation_status_screen() char progress[4]; lcd.setCursor(0, 3); lcd_printPGM(MSG_TEMP_CALIBRATION); - lcd.setCursor(17, 3); + lcd.setCursor(12, 3); sprintf(progress, "%d/6", custom_message_state); lcd.print(progress); }