SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use lcd_goto_previous_menu_no_defer more

Browse source
This commit is contained in:
Scott Lahteine 2018-03-14 00:50:15 -05:00
parent 374ea49be9
commit f1327fd5f9
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Marlin/src/lcd/ultralcd.cpp
View file

@ -1841,9 +1841,8 @@ void kill_screen(const char* lcd_msg) {
line_to_z(Z_MIN_POS + MANUAL_PROBE_HEIGHT); line_to_z(Z_MIN_POS + MANUAL_PROBE_HEIGHT);
lcd_synchronize(PSTR(MSG_LEVEL_BED_DONE)); lcd_synchronize(PSTR(MSG_LEVEL_BED_DONE));
#endif #endif
lcd_goto_previous_menu(); lcd_goto_previous_menu_no_defer();
lcd_completion_feedback(); lcd_completion_feedback();
defer_return_to_status = false;
} }
if (lcdDrawUpdate) lcd_implementation_drawmenu_static(LCD_HEIGHT >= 4 ? 1 : 0, PSTR(MSG_LEVEL_BED_DONE)); if (lcdDrawUpdate) lcd_implementation_drawmenu_static(LCD_HEIGHT >= 4 ? 1 : 0, PSTR(MSG_LEVEL_BED_DONE));
lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT; lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT;
@ -2907,7 +2906,7 @@ void kill_screen(const char* lcd_msg) {
*/ */
void _lcd_move_xyz(const char* name, AxisEnum axis) { void _lcd_move_xyz(const char* name, AxisEnum axis) {
if (use_click()) { return lcd_goto_previous_menu(); } if (use_click()) { return lcd_goto_previous_menu_no_defer(); }
ENCODER_DIRECTION_NORMAL(); ENCODER_DIRECTION_NORMAL();
if (encoderPosition && !processing_manual_move) { if (encoderPosition && !processing_manual_move) {
gcode.refresh_cmd_timeout(); gcode.refresh_cmd_timeout();
@ -2990,7 +2989,7 @@ void kill_screen(const char* lcd_msg) {
const int8_t eindex=-1 const int8_t eindex=-1
#endif #endif
) { ) {
if (use_click()) { return lcd_goto_previous_menu(); } if (use_click()) { return lcd_goto_previous_menu_no_defer(); }
ENCODER_DIRECTION_NORMAL(); ENCODER_DIRECTION_NORMAL();
if (encoderPosition) { if (encoderPosition) {
if (!processing_manual_move) { if (!processing_manual_move) {