From 5dc2af961bbda993354105f56c74678cc500d0bc Mon Sep 17 00:00:00 2001 From: MRprusa3d Date: Thu, 23 Aug 2018 00:08:14 +0200 Subject: [PATCH 1/2] ShippingPrepare & M600 message after ShippingPrepare M600 :: better filament (un)retraction --- Firmware/Marlin_main.cpp | 7 +------ Firmware/messages.c | 1 + Firmware/messages.h | 1 + 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 6aea1214b..4966caa11 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1663,7 +1663,7 @@ void setup() } else if (calibration_status() == CALIBRATION_STATUS_Z_CALIBRATION) { // Show the message. - lcd_show_fullscreen_message_and_wait_P(_T(MSG_FOLLOW_CALIBRATION_FLOW)); + lcd_show_fullscreen_message_and_wait_P(_T(MSG_FOLLOW_Z_CALIBRATION_FLOW)); } } @@ -3140,11 +3140,6 @@ void gcode_M600(bool automatic, float x_position, float y_position, float z_shif plan_buffer_line(lastpos[X_AXIS], lastpos[Y_AXIS], lastpos[Z_AXIS], current_position[E_AXIS], FILAMENTCHANGE_ZFEED, active_extruder); st_synchronize(); - //Unretract - current_position[E_AXIS]= current_position[E_AXIS] - e_shift; - plan_buffer_line(lastpos[X_AXIS], lastpos[Y_AXIS], lastpos[Z_AXIS], current_position[E_AXIS], FILAMENTCHANGE_RFEED, active_extruder); - st_synchronize(); - //Set E position to original plan_set_e_position(lastpos[E_AXIS]); diff --git a/Firmware/messages.c b/Firmware/messages.c index 857c05c5d..35aa90685 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -43,6 +43,7 @@ const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE1[] PROGMEM_I1 = ISTR("Searching bed const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE2[] PROGMEM_I1 = ISTR(" of 4"); ////c=14 r=0 const char MSG_FINISHING_MOVEMENTS[] PROGMEM_I1 = ISTR("Finishing movements"); ////c=20 r=1 const char MSG_FOLLOW_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow."); ////c=20 r=8 +const char MSG_FOLLOW_Z_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."); ////c=20 r=8 const char MSG_FSENS_AUTOLOAD_NA[] PROGMEM_I1 = ISTR("F. autoload [N/A]"); ////c=17 r=1 const char MSG_FSENSOR_OFF[] PROGMEM_I1 = ISTR("Fil. sensor [off]"); ////c=0 r=0 const char MSG_FSENSOR_ON[] PROGMEM_I1 = ISTR("Fil. sensor [on]"); ////c=0 r=0 diff --git a/Firmware/messages.h b/Firmware/messages.h index 95a1610ff..07f2a3a70 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -40,6 +40,7 @@ extern const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE1[]; extern const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE2[]; extern const char MSG_FINISHING_MOVEMENTS[]; extern const char MSG_FOLLOW_CALIBRATION_FLOW[]; +extern const char MSG_FOLLOW_Z_CALIBRATION_FLOW[]; extern const char MSG_FSENS_AUTOLOAD_NA[]; extern const char MSG_FSENSOR_OFF[]; extern const char MSG_FSENSOR_ON[]; From 35cf3f3a61028ca4693fc71192d601f791823e62 Mon Sep 17 00:00:00 2001 From: MRprusa3d Date: Tue, 4 Sep 2018 14:39:46 +0200 Subject: [PATCH 2/2] Time info suffix for doubt time estimation (i.e. if feed rate changed) --- Firmware/ultralcd.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f49911bc7..46ac9d665 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -597,8 +597,15 @@ void lcdui_print_time(void) int chars = 0; if ((PRINTER_ACTIVE) && ((print_time_remaining_normal != PRINT_TIME_REMAINING_INIT) || (starttime != 0))) { - char suff = (print_time_remaining_normal == PRINT_TIME_REMAINING_INIT)?' ':'R'; - chars = lcd_printf_P(_N("%c%02u:%02u%c"), LCD_STR_CLOCK[0], print_t / 60, print_t % 60, suff); + char suff = ' '; + char suff_doubt = ' '; + if (print_time_remaining_normal != PRINT_TIME_REMAINING_INIT) + { + suff = 'R'; + if (feedmultiply != 100) + suff_doubt = '?'; + } + chars = lcd_printf_P(_N("%c%02u:%02u%c%c"), LCD_STR_CLOCK[0], print_t / 60, print_t % 60, suff, suff_doubt); } else chars = lcd_printf_P(_N("%c--:-- "), LCD_STR_CLOCK[0]);