Sfoglia il codice sorgente

Use lcd_goto_previous_menu_no_defer more

Scott Lahteine 6 anni fa
parent
commit
f1327fd5f9
1 ha cambiato i file con 3 aggiunte e 4 eliminazioni
  1. 3
    4
      Marlin/src/lcd/ultralcd.cpp

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

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

Loading…
Annulla
Salva