From 50b7f627cd3fc20360f14aaad2612b7029b15261 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 25 Apr 2017 22:00:05 +0200 Subject: [PATCH] pinda preheating messages changed --- Firmware/Marlin_main.cpp | 10 ++++++++-- Firmware/language_all.cpp | 4 ++-- Firmware/language_en.h | 2 +- Firmware/ultralcd_implementation_hitachi_HD44780.h | 2 ++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 68f7c4ff0..bbb0fbd14 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -2818,6 +2818,7 @@ void process_commands() enquecommand_front_P((PSTR("G28 W0"))); break; } + custom_message = true; custom_message_type = 4; custom_message_state = 1; @@ -6322,6 +6323,8 @@ void bed_analysis(float x_dimension, float y_dimension, int x_points_num, int y_ void temp_compensation_start() { custom_message = true; custom_message_type = 5; + custom_message_state = PINDA_HEAT_T + 1; + lcd_update(2); if (degHotend(active_extruder)>EXTRUDE_MINTEMP) current_position[E_AXIS] -= DEFAULT_RETRACTION; plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 400, active_extruder); @@ -6330,12 +6333,15 @@ void temp_compensation_start() { current_position[Z_AXIS] = PINDA_PREHEAT_Z; plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); st_synchronize(); - while (fabs(degBed() - target_temperature_bed) > 1) delay_keep_alive(1000); - for(int i = 0; i < PINDA_HEAT_T; i++) delay_keep_alive(1000); + for (int i = 0; i < PINDA_HEAT_T*2; i++) { + delay_keep_alive(500); + custom_message_state = PINDA_HEAT_T - i*0.5; + } custom_message_type = 0; + custom_message_state = 0; custom_message = false; } diff --git a/Firmware/language_all.cpp b/Firmware/language_all.cpp index a55b30e85..beb32a02d 100644 --- a/Firmware/language_all.cpp +++ b/Firmware/language_all.cpp @@ -1813,8 +1813,8 @@ const char * const MSG_PINDA_NOT_CALIBRATED_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_PINDA_NOT_CALIBRATED_EN }; -const char MSG_PINDA_PREHEAT_EN[] PROGMEM = "Preheating"; -const char MSG_PINDA_PREHEAT_CZ[] PROGMEM = "Predehrivani"; +const char MSG_PINDA_PREHEAT_EN[] PROGMEM = "PINDA Heating "; +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, diff --git a/Firmware/language_en.h b/Firmware/language_en.h index 759ca2744..f1268bc23 100644 --- a/Firmware/language_en.h +++ b/Firmware/language_en.h @@ -278,7 +278,7 @@ #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_PINDA_PREHEAT "PINDA Heating " #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]" diff --git a/Firmware/ultralcd_implementation_hitachi_HD44780.h b/Firmware/ultralcd_implementation_hitachi_HD44780.h index da393a66f..bb8e0c47e 100644 --- a/Firmware/ultralcd_implementation_hitachi_HD44780.h +++ b/Firmware/ultralcd_implementation_hitachi_HD44780.h @@ -972,6 +972,8 @@ static void lcd_implementation_status_screen() if (custom_message_type == 5) { lcd.setCursor(0, 3); lcd_printPGM(MSG_PINDA_PREHEAT); + lcd.setCursor(15, 3); + if(custom_message_state <= PINDA_HEAT_T) lcd.print(custom_message_state); }