From 71b4f189bfd6f53dff4e94c0ae974318733051af Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 20 Apr 2016 15:51:27 -0700 Subject: [PATCH 1/6] lcd_implementation_drawedit can take 1 arg --- Marlin/dogm_lcd_implementation.h | 2 +- Marlin/ultralcd_implementation_hitachi_HD44780.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h index a1281cf7ac..0ecbbcbab0 100644 --- a/Marlin/dogm_lcd_implementation.h +++ b/Marlin/dogm_lcd_implementation.h @@ -517,7 +517,7 @@ static void _drawmenu_setting_edit_generic(bool isSelected, uint8_t row, const c #define lcd_implementation_drawmenu_setting_edit_callback_long5(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr5(*(data))) #define lcd_implementation_drawmenu_setting_edit_callback_bool(sel, row, pstr, pstr2, data, callback) lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF)) -void lcd_implementation_drawedit(const char* pstr, const char* value) { +void lcd_implementation_drawedit(const char* pstr, const char* value=NULL) { uint8_t rows = 1; uint8_t lcd_width = LCD_WIDTH, char_width = DOG_CHAR_WIDTH; uint8_t vallen = lcd_strlen(value); diff --git a/Marlin/ultralcd_implementation_hitachi_HD44780.h b/Marlin/ultralcd_implementation_hitachi_HD44780.h index 3787db01bd..b6d60c2ffc 100644 --- a/Marlin/ultralcd_implementation_hitachi_HD44780.h +++ b/Marlin/ultralcd_implementation_hitachi_HD44780.h @@ -873,7 +873,7 @@ static void lcd_implementation_drawmenu_setting_edit_generic_P(bool sel, uint8_t #define lcd_implementation_drawmenu_setting_edit_callback_long5(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr5(*(data))) #define lcd_implementation_drawmenu_setting_edit_callback_bool(sel, row, pstr, pstr2, data, callback) lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, '>', (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF)) -void lcd_implementation_drawedit(const char* pstr, const char* value) { +void lcd_implementation_drawedit(const char* pstr, const char* value=NULL) { lcd.setCursor(1, 1); lcd_printPGM(pstr); if (value != NULL) { From 3f6ae857481e902475b2fd757c7b1d5b10b2981d Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 20 Apr 2016 15:54:08 -0700 Subject: [PATCH 2/6] Fix some MBL display issues for DOGLCD --- Marlin/ultralcd.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 3e77278229..2ab79a6505 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -1015,7 +1015,13 @@ void lcd_cooldown() { */ static void _lcd_level_bed_homing() { if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_HOMING), NULL); - lcdDrawUpdate = LCDVIEW_CALL_NO_REDRAW; + lcdDrawUpdate = + #if ENABLED(DOGLCD) + LCDVIEW_CALL_REDRAW_NEXT + #else + LCDVIEW_CALL_NO_REDRAW + #endif + ; if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS]) lcd_goto_menu(_lcd_level_bed_homing_done); } @@ -1157,10 +1163,10 @@ static void _lcd_move(const char* name, AxisEnum axis, float min, float max) { current_position[axis] += float((int32_t)encoderPosition) * move_menu_scale; if (min_software_endstops) NOLESS(current_position[axis], min); if (max_software_endstops) NOMORE(current_position[axis], max); - encoderPosition = 0; line_to_current(axis); lcdDrawUpdate = LCDVIEW_REDRAW_NOW; } + encoderPosition = 0; if (lcdDrawUpdate) lcd_implementation_drawedit(name, ftostr31(current_position[axis])); if (LCD_CLICKED) lcd_goto_previous_menu(true); } @@ -1186,10 +1192,10 @@ static void lcd_move_e( #endif if (encoderPosition && movesplanned() <= 3) { current_position[E_AXIS] += float((int32_t)encoderPosition) * move_menu_scale; - encoderPosition = 0; line_to_current(E_AXIS); lcdDrawUpdate = LCDVIEW_REDRAW_NOW; } + encoderPosition = 0; if (lcdDrawUpdate) { PGM_P pos_label; #if EXTRUDERS == 1 From 9bcb72e7f81074321d805845ac3b2edde1057ef4 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 20 Apr 2016 15:55:36 -0700 Subject: [PATCH 3/6] Further patches to MBL - break up into more handlers --- Marlin/language_en.h | 3 + Marlin/ultralcd.cpp | 144 ++++++++++++++++++++++++++----------------- 2 files changed, 91 insertions(+), 56 deletions(-) diff --git a/Marlin/language_en.h b/Marlin/language_en.h index 18ea1cbdbc..8ffbb50ed4 100644 --- a/Marlin/language_en.h +++ b/Marlin/language_en.h @@ -70,6 +70,9 @@ #ifndef MSG_LEVEL_BED_WAITING #define MSG_LEVEL_BED_WAITING "Click to Begin" #endif +#ifndef MSG_LEVEL_BED_NEXT_POINT + #define MSG_LEVEL_BED_NEXT_POINT "Next Point" +#endif #ifndef MSG_LEVEL_BED_DONE #define MSG_LEVEL_BED_DONE "Leveling Done!" #endif diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 2ab79a6505..56b7dbdaf3 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -891,15 +891,13 @@ void lcd_cooldown() { * */ - static int _lcd_level_bed_position; - static bool mbl_wait_for_move = false; + static uint8_t _lcd_level_bed_position; // Utility to go to the next mesh point // A raise is added between points if MIN_Z_HEIGHT_FOR_HOMING is in use // Note: During Manual Bed Leveling the homed Z position is MESH_HOME_SEARCH_Z // Z position will be restored with the final action, a G28 inline void _mbl_goto_xy(float x, float y) { - mbl_wait_for_move = true; current_position[Z_AXIS] = MESH_HOME_SEARCH_Z #if MIN_Z_HEIGHT_FOR_HOMING > 0 + MIN_Z_HEIGHT_FOR_HOMING @@ -914,59 +912,52 @@ void lcd_cooldown() { line_to_current(Z_AXIS); #endif st_synchronize(); - mbl_wait_for_move = false; + } + + static void _lcd_level_goto_next_point(); + + static void _lcd_level_bed_done() { + if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_DONE)); + lcdDrawUpdate = + #if ENABLED(DOGLCD) + LCDVIEW_CALL_REDRAW_NEXT + #else + LCDVIEW_CALL_NO_REDRAW + #endif + ; } /** - * 5. MBL Wait for controller movement and clicks: - * - Movement adjusts the Z axis - * - Click saves the Z, goes to the next mesh point + * Step 7: Get the Z coordinate, then goto next point or exit */ - static void _lcd_level_bed_procedure() { - // Menu handlers may be called in a re-entrant fashion - // if they call st_synchronize or plan_buffer_line. So - // while waiting for a move we just ignore new input. - if (mbl_wait_for_move) { - lcdDrawUpdate = LCDVIEW_CALL_NO_REDRAW; - return; - } - + static void _lcd_level_bed_get_z() { ENCODER_DIRECTION_NORMAL(); // Encoder wheel adjusts the Z position if (encoderPosition && movesplanned() <= 3) { refresh_cmd_timeout(); current_position[Z_AXIS] += float((int32_t)encoderPosition) * (MBL_Z_STEP); - if (min_software_endstops) NOLESS(current_position[Z_AXIS], Z_MIN_POS); - if (max_software_endstops) NOMORE(current_position[Z_AXIS], Z_MAX_POS); - encoderPosition = 0; + NOLESS(current_position[Z_AXIS], 0); + NOMORE(current_position[Z_AXIS], MESH_HOME_SEARCH_Z * 2); line_to_current(Z_AXIS); - lcdDrawUpdate = LCDVIEW_CALL_NO_REDRAW; + lcdDrawUpdate = + #if ENABLED(DOGLCD) + LCDVIEW_CALL_REDRAW_NEXT + #else + LCDVIEW_REDRAW_NOW + #endif + ; } + encoderPosition = 0; - // Update on first display, then only on updates to Z position - if (lcdDrawUpdate) { - float v = current_position[Z_AXIS] - MESH_HOME_SEARCH_Z; - lcd_implementation_drawedit(PSTR(MSG_MOVE_Z), ftostr43(v + (v < 0 ? -0.0001 : 0.0001), '+')); - } - - // We want subsequent calls, but don't force redraw - // Set here so it can be overridden by lcd_return_to_status below - lcdDrawUpdate = LCDVIEW_CALL_NO_REDRAW; - - // Click sets the current Z and moves to the next position static bool debounce_click = false; if (LCD_CLICKED) { if (!debounce_click) { debounce_click = true; // ignore multiple "clicks" in a row mbl.set_zigzag_z(_lcd_level_bed_position++, current_position[Z_AXIS]); if (_lcd_level_bed_position == (MESH_NUM_X_POINTS) * (MESH_NUM_Y_POINTS)) { - lcd_return_to_status(); - LCD_MESSAGEPGM(MSG_LEVEL_BED_DONE); - #if HAS_BUZZER - buzz(200, 659); - buzz(200, 698); - #endif + lcd_goto_menu(_lcd_level_bed_done, true); + current_position[Z_AXIS] = MESH_HOME_SEARCH_Z #if MIN_Z_HEIGHT_FOR_HOMING > 0 + MIN_Z_HEIGHT_FOR_HOMING @@ -974,44 +965,85 @@ void lcd_cooldown() { ; line_to_current(Z_AXIS); st_synchronize(); + mbl.active = true; enqueue_and_echo_commands_P(PSTR("G28")); + lcd_return_to_status(); + //LCD_MESSAGEPGM(MSG_LEVEL_BED_DONE); + #if HAS_BUZZER + buzz(200, 659); + buzz(200, 698); + #endif } else { - #if ENABLED(NEWPANEL) - lcd_quick_feedback(); - #endif - int ix, iy; - mbl.zigzag(_lcd_level_bed_position, ix, iy); - _mbl_goto_xy(mbl.get_x(ix), mbl.get_y(iy)); - encoderPosition = 0; + lcd_goto_menu(_lcd_level_goto_next_point, true); } } } else { debounce_click = false; } + + // Update on first display, then only on updates to Z position + // Show message above on clicks instead + if (lcdDrawUpdate) { + float v = current_position[Z_AXIS] - MESH_HOME_SEARCH_Z; + lcd_implementation_drawedit(PSTR(MSG_MOVE_Z), ftostr43(v + (v < 0 ? -0.0001 : 0.0001), '+')); + } + } /** - * 4. MBL Display "Click to Begin", wait for click - * Move to the first probe position + * Step 6: Display "Next point: 1 / 9" while waiting for move to finish + */ + static void _lcd_level_bed_moving() { + if (lcdDrawUpdate) { + char msg[10]; + sprintf_P(msg, PSTR("%i / %u"), (int)(_lcd_level_bed_position + 1), (MESH_NUM_X_POINTS) * (MESH_NUM_Y_POINTS)); + lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_NEXT_POINT), msg); + } + + lcdDrawUpdate = + #if ENABLED(DOGLCD) + LCDVIEW_CALL_REDRAW_NEXT + #else + LCDVIEW_CALL_NO_REDRAW + #endif + ; + } + + /** + * Step 5: Initiate a move to the next point + */ + static void _lcd_level_goto_next_point() { + // Set the menu to display ahead of blocking call + lcd_goto_menu(_lcd_level_bed_moving); + + // _mbl_goto_xy runs the menu loop until the move is done + int ix, iy; + mbl.zigzag(_lcd_level_bed_position, ix, iy); + _mbl_goto_xy(mbl.get_x(ix), mbl.get_y(iy)); + + // After the blocking function returns, change menus + lcd_goto_menu(_lcd_level_bed_get_z); + } + + /** + * Step 4: Display "Click to Begin", wait for click + * Move to the first probe position */ static void _lcd_level_bed_homing_done() { - if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_WAITING), NULL); - lcdDrawUpdate = LCDVIEW_CALL_NO_REDRAW; - if (mbl_wait_for_move) return; + if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_WAITING)); if (LCD_CLICKED) { + _lcd_level_bed_position = 0; current_position[Z_AXIS] = MESH_HOME_SEARCH_Z; plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); - _mbl_goto_xy(MESH_MIN_X, MESH_MIN_Y); - _lcd_level_bed_position = 0; - lcd_goto_menu(_lcd_level_bed_procedure, true); + lcd_goto_menu(_lcd_level_goto_next_point, true); } } /** - * 3. MBL Display "Hoing XYZ" - Wait for homing to finish + * Step 3: Display "Homing XYZ" - Wait for homing to finish */ static void _lcd_level_bed_homing() { if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_HOMING), NULL); @@ -1027,7 +1059,7 @@ void lcd_cooldown() { } /** - * 2. MBL Continue Bed Leveling... + * Step 2: Continue Bed Leveling... */ static void _lcd_level_bed_continue() { defer_return_to_status = true; @@ -1038,7 +1070,7 @@ void lcd_cooldown() { } /** - * 1. MBL entry-point: "Cancel" or "Level Bed" + * Step 1: MBL entry-point: "Cancel" or "Level Bed" */ static void lcd_level_bed() { START_MENU(); @@ -1348,7 +1380,7 @@ static void lcd_control_menu() { static void _lcd_autotune(int e) { char cmd[30]; - sprintf_P(cmd, PSTR("M303 U1 E%d S%d"), e, + sprintf_P(cmd, PSTR("M303 U1 E%i S%i"), e, #if HAS_PID_FOR_BOTH e < 0 ? autotune_temp_bed : autotune_temp[e] #elif ENABLED(PIDTEMPBED) From 9d5e1f32fdf20c8b26945a0357f70b79eb1f963c Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 20 Apr 2016 18:42:01 -0700 Subject: [PATCH 4/6] Use axis_homed in _lcd_level_bed_homing, item in Prepare before homing --- Marlin/ultralcd.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 56b7dbdaf3..09c574f148 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -1054,7 +1054,7 @@ void lcd_cooldown() { LCDVIEW_CALL_NO_REDRAW #endif ; - if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS]) + if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS]) lcd_goto_menu(_lcd_level_bed_homing_done); } @@ -1063,7 +1063,7 @@ void lcd_cooldown() { */ static void _lcd_level_bed_continue() { defer_return_to_status = true; - axis_known_position[X_AXIS] = axis_known_position[Y_AXIS] = axis_known_position[Z_AXIS] = false; + axis_homed[X_AXIS] = axis_homed[Y_AXIS] = axis_homed[Z_AXIS] = false; mbl.reset(); enqueue_and_echo_commands_P(PSTR("G28")); lcd_goto_menu(_lcd_level_bed_homing); @@ -1110,8 +1110,9 @@ static void lcd_prepare_menu() { // Level Bed // #if ENABLED(AUTO_BED_LEVELING_FEATURE) - if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS]) - MENU_ITEM(gcode, MSG_LEVEL_BED, PSTR("G29")); + MENU_ITEM(gcode, MSG_LEVEL_BED, + axis_homed[X_AXIS] && axis_homed[Y_AXIS] ? PSTR("G29") : PSTR("G28\nG29") + ); #elif ENABLED(MANUAL_BED_LEVELING) MENU_ITEM(submenu, MSG_LEVEL_BED, lcd_level_bed); #endif From 7fa2bda1b9068775ed9d2e00cfed805635e04b83 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 20 Apr 2016 18:57:17 -0700 Subject: [PATCH 5/6] Give the "alive dot" its own blink --- Marlin/ultralcd.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 09c574f148..0236347e35 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -2256,12 +2256,13 @@ void lcd_update() { } #if ENABLED(DOGLCD) // Changes due to different driver architecture of the DOGM display - bool blink = lcd_blink(); + static int8_t dot_color = 0; + dot_color = 1 - dot_color; u8g.firstPage(); do { lcd_setFont(FONT_MENU); u8g.setPrintPos(125, 0); - u8g.setColorIndex(blink ? 1 : 0); // Set color for the alive dot + u8g.setColorIndex(dot_color); // Set color for the alive dot u8g.drawPixel(127, 63); // draw alive dot u8g.setColorIndex(1); // black on white (*currentMenu)(); From dc2281d2f41a221c1635e710fcd4f68f36983434 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 20 Apr 2016 19:49:00 -0700 Subject: [PATCH 6/6] Add nextMenu, nextEncoderPosition to change menus after handler loop --- Marlin/ultralcd.cpp | 80 +++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 50 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 0236347e35..01644b982f 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -262,7 +262,7 @@ static void lcd_status_screen(); uint8_t currentMenuViewOffset; /* scroll offset in the current menu */ millis_t next_button_update_ms; uint8_t lastEncoderBits; - uint32_t encoderPosition; + uint32_t encoderPosition, nextEncoderPosition; #if PIN_EXISTS(SD_DETECT) uint8_t lcd_sd_status; #endif @@ -277,6 +277,7 @@ typedef struct { } menuPosition; menuFunc_t currentMenu = lcd_status_screen; // pointer to the currently active menu handler +menuFunc_t nextMenu = NULL; // the next menu handler to activate menuPosition menu_history[10]; uint8_t menu_history_depth = 0; @@ -311,21 +312,16 @@ float raw_Ki, raw_Kd; * Remembers the previous position */ static void lcd_goto_menu(menuFunc_t menu, const bool feedback = false, const uint32_t encoder = 0) { - if (currentMenu != menu) { - currentMenu = menu; - lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; + if (currentMenu != menu && nextMenu != menu) { + nextMenu = menu; + nextEncoderPosition = encoder; #if ENABLED(NEWPANEL) - encoderPosition = encoder; if (feedback) lcd_quick_feedback(); #endif if (menu == lcd_status_screen) { defer_return_to_status = false; menu_history_depth = 0; } - #if ENABLED(LCD_PROGRESS_BAR) - // For LCD_PROGRESS_BAR re-initialize custom characters - lcd_set_custom_characters(menu == lcd_status_screen); - #endif } } @@ -918,13 +914,6 @@ void lcd_cooldown() { static void _lcd_level_bed_done() { if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_DONE)); - lcdDrawUpdate = - #if ENABLED(DOGLCD) - LCDVIEW_CALL_REDRAW_NEXT - #else - LCDVIEW_CALL_NO_REDRAW - #endif - ; } /** @@ -940,13 +929,6 @@ void lcd_cooldown() { NOLESS(current_position[Z_AXIS], 0); NOMORE(current_position[Z_AXIS], MESH_HOME_SEARCH_Z * 2); line_to_current(Z_AXIS); - lcdDrawUpdate = - #if ENABLED(DOGLCD) - LCDVIEW_CALL_REDRAW_NEXT - #else - LCDVIEW_REDRAW_NOW - #endif - ; } encoderPosition = 0; @@ -1002,14 +984,6 @@ void lcd_cooldown() { sprintf_P(msg, PSTR("%i / %u"), (int)(_lcd_level_bed_position + 1), (MESH_NUM_X_POINTS) * (MESH_NUM_Y_POINTS)); lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_NEXT_POINT), msg); } - - lcdDrawUpdate = - #if ENABLED(DOGLCD) - LCDVIEW_CALL_REDRAW_NEXT - #else - LCDVIEW_CALL_NO_REDRAW - #endif - ; } /** @@ -1047,15 +1021,9 @@ void lcd_cooldown() { */ static void _lcd_level_bed_homing() { if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_HOMING), NULL); - lcdDrawUpdate = - #if ENABLED(DOGLCD) - LCDVIEW_CALL_REDRAW_NEXT - #else - LCDVIEW_CALL_NO_REDRAW - #endif - ; if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS]) lcd_goto_menu(_lcd_level_bed_homing_done); + lcdDrawUpdate = LCDVIEW_CALL_NO_REDRAW; // counts as a draw flag during graphical loop } /** @@ -1197,7 +1165,6 @@ static void _lcd_move(const char* name, AxisEnum axis, float min, float max) { if (min_software_endstops) NOLESS(current_position[axis], min); if (max_software_endstops) NOMORE(current_position[axis], max); line_to_current(axis); - lcdDrawUpdate = LCDVIEW_REDRAW_NOW; } encoderPosition = 0; if (lcdDrawUpdate) lcd_implementation_drawedit(name, ftostr31(current_position[axis])); @@ -1226,7 +1193,6 @@ static void lcd_move_e( if (encoderPosition && movesplanned() <= 3) { current_position[E_AXIS] += float((int32_t)encoderPosition) * move_menu_scale; line_to_current(E_AXIS); - lcdDrawUpdate = LCDVIEW_REDRAW_NOW; } encoderPosition = 0; if (lcdDrawUpdate) { @@ -1717,7 +1683,6 @@ static void lcd_control_volumetric_menu() { lcd_contrast &= 0x3F; #endif encoderPosition = 0; - lcdDrawUpdate = LCDVIEW_REDRAW_NOW; u8g.setContrast(lcd_contrast); } if (lcdDrawUpdate) { @@ -1868,12 +1833,12 @@ static void lcd_control_volumetric_menu() { } \ static void menu_action_setting_edit_ ## _name (const char* pstr, _type* ptr, _type minValue, _type maxValue) { \ _menu_action_setting_edit_ ## _name(pstr, ptr, minValue, maxValue); \ - currentMenu = menu_edit_ ## _name; \ + lcd_goto_menu(menu_edit_ ## _name); \ }\ static void menu_action_setting_edit_callback_ ## _name (const char* pstr, _type* ptr, _type minValue, _type maxValue, menuFunc_t callback) { \ _menu_action_setting_edit_ ## _name(pstr, ptr, minValue, maxValue); \ - currentMenu = menu_edit_callback_ ## _name; \ callbackFunc = callback; \ + lcd_goto_menu(menu_edit_callback_ ## _name); \ } menu_edit_type(int, int3, itostr3, 1); menu_edit_type(float, float3, ftostr3, 1); @@ -1939,7 +1904,6 @@ menu_edit_type(unsigned long, long5, ftostr5, 0.01); #endif void lcd_quick_feedback() { - lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; next_button_update_ms = millis() + 500; #if ENABLED(LCD_USE_I2C_BUZZER) @@ -2106,7 +2070,7 @@ bool lcd_blink() { * - Act on RepRap World keypad input * - Update the encoder position * - Apply acceleration to the encoder position - * - Set lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT on controller events + * - Set lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NOW on controller events * - Reset the Info Screen timeout if there's any input * - Update status indicators, if any * @@ -2114,17 +2078,21 @@ bool lcd_blink() { * - Call the handler only if lcdDrawUpdate != LCDVIEW_NONE * - Before calling the handler, LCDVIEW_CALL_NO_REDRAW => LCDVIEW_NONE * - Call the menu handler. Menu handlers should do the following: - * - If a value changes, set lcdDrawUpdate to LCDVIEW_REDRAW_NOW + * - If a value changes, set lcdDrawUpdate to LCDVIEW_REDRAW_NOW and draw the value + * (Encoder events automatically set lcdDrawUpdate for you.) * - if (lcdDrawUpdate) { redraw } * - Before exiting the handler set lcdDrawUpdate to: - * - LCDVIEW_REDRAW_NOW or LCDVIEW_NONE for no callbacks until the next controller event. * - LCDVIEW_CLEAR_CALL_REDRAW to clear screen and set LCDVIEW_CALL_REDRAW_NEXT. - * - LCDVIEW_CALL_NO_REDRAW for a callback with no forced redraw on the next loop. - * - NOTE: For some displays, the menu handler may be called 2 or more times per loop. + * - LCDVIEW_REDRAW_NOW or LCDVIEW_NONE to keep drawingm but only in this loop. + * - LCDVIEW_REDRAW_NEXT to keep drawing and draw on the next loop also. + * - LCDVIEW_CALL_NO_REDRAW to keep drawing (or start drawing) with no redraw on the next loop. + * - NOTE: For graphical displays menu handlers may be called 2 or more times per loop, + * so don't change lcdDrawUpdate without considering this. * * After the menu handler callback runs (or not): + * - Set lcdDrawUpdate to nextLcdDrawUpdate (usually unchanged) * - Clear the LCD if lcdDrawUpdate == LCDVIEW_CLEAR_CALL_REDRAW - * - Update lcdDrawUpdate for the next loop (i.e., move one state down, usually) + * - Transition lcdDrawUpdate to the next state * * No worries. This function is only called from the main thread. */ @@ -2282,6 +2250,18 @@ void lcd_update() { #endif // ULTIPANEL + // If a new menu was set, update the pointer, set to clear & redraw + if (nextMenu) { + currentMenu = nextMenu; + encoderPosition = nextEncoderPosition; + nextMenu = NULL; + lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; + #if ENABLED(LCD_PROGRESS_BAR) + // For LCD_PROGRESS_BAR re-initialize custom characters + lcd_set_custom_characters(currentMenu == lcd_status_screen); + #endif + } + switch (lcdDrawUpdate) { case LCDVIEW_CLEAR_CALL_REDRAW: lcd_implementation_clear();