Browse Source

Use lcd_goto_previous_menu_no_defer more

Scott Lahteine 6 years ago
parent
commit
f1327fd5f9
1 changed files with 3 additions and 4 deletions
  1. 3
    4
      Marlin/src/lcd/ultralcd.cpp

+ 3
- 4
Marlin/src/lcd/ultralcd.cpp View File

1841
           line_to_z(Z_MIN_POS + MANUAL_PROBE_HEIGHT);
1841
           line_to_z(Z_MIN_POS + MANUAL_PROBE_HEIGHT);
1842
           lcd_synchronize(PSTR(MSG_LEVEL_BED_DONE));
1842
           lcd_synchronize(PSTR(MSG_LEVEL_BED_DONE));
1843
         #endif
1843
         #endif
1844
-        lcd_goto_previous_menu();
1844
+        lcd_goto_previous_menu_no_defer();
1845
         lcd_completion_feedback();
1845
         lcd_completion_feedback();
1846
-        defer_return_to_status = false;
1847
       }
1846
       }
1848
       if (lcdDrawUpdate) lcd_implementation_drawmenu_static(LCD_HEIGHT >= 4 ? 1 : 0, PSTR(MSG_LEVEL_BED_DONE));
1847
       if (lcdDrawUpdate) lcd_implementation_drawmenu_static(LCD_HEIGHT >= 4 ? 1 : 0, PSTR(MSG_LEVEL_BED_DONE));
1849
       lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT;
1848
       lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT;
2907
    */
2906
    */
2908
 
2907
 
2909
   void _lcd_move_xyz(const char* name, AxisEnum axis) {
2908
   void _lcd_move_xyz(const char* name, AxisEnum axis) {
2910
-    if (use_click()) { return lcd_goto_previous_menu(); }
2909
+    if (use_click()) { return lcd_goto_previous_menu_no_defer(); }
2911
     ENCODER_DIRECTION_NORMAL();
2910
     ENCODER_DIRECTION_NORMAL();
2912
     if (encoderPosition && !processing_manual_move) {
2911
     if (encoderPosition && !processing_manual_move) {
2913
       gcode.refresh_cmd_timeout();
2912
       gcode.refresh_cmd_timeout();
2990
       const int8_t eindex=-1
2989
       const int8_t eindex=-1
2991
     #endif
2990
     #endif
2992
   ) {
2991
   ) {
2993
-    if (use_click()) { return lcd_goto_previous_menu(); }
2992
+    if (use_click()) { return lcd_goto_previous_menu_no_defer(); }
2994
     ENCODER_DIRECTION_NORMAL();
2993
     ENCODER_DIRECTION_NORMAL();
2995
     if (encoderPosition) {
2994
     if (encoderPosition) {
2996
       if (!processing_manual_move) {
2995
       if (!processing_manual_move) {

Loading…
Cancel
Save