Browse Source

Tweaks for lcd_external_control

Scott Lahteine 7 years ago
parent
commit
b49acce035
2 changed files with 8 additions and 12 deletions
  1. 3
    5
      Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
  2. 5
    7
      Marlin/src/gcode/bedlevel/G26.cpp

+ 3
- 5
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp View File

@@ -1009,11 +1009,9 @@
1009 1009
             SERIAL_PROTOCOLLNPGM("\nMesh only partially populated.");
1010 1010
             do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE);
1011 1011
 
1012
-            #if ENABLED(NEWPANEL)
1013
-              lcd_quick_feedback();
1014
-              while (is_lcd_clicked()) idle();
1015
-              lcd_external_control = false;
1016
-            #endif
1012
+            lcd_quick_feedback();
1013
+            while (is_lcd_clicked()) idle();
1014
+            lcd_external_control = false;
1017 1015
 
1018 1016
             KEEPALIVE_STATE(IN_HANDLER);
1019 1017
             restore_ubl_active_state_and_leave();

+ 5
- 7
Marlin/src/gcode/bedlevel/G26.cpp View File

@@ -517,13 +517,11 @@ bool prime_nozzle() {
517 517
 
518 518
       while (is_lcd_clicked()) idle();           // Debounce Encoder Wheel
519 519
 
520
-      #if ENABLED(ULTRA_LCD)
521
-        strcpy_P(lcd_status_message, PSTR("Done Priming")); // We can't do lcd_setstatusPGM() without having it continue;
522
-                                                            // So... We cheat to get a message up.
523
-        lcd_setstatusPGM(PSTR("Done Priming"), 99);
524
-        lcd_quick_feedback();
525
-        lcd_external_control = false;
526
-      #endif
520
+      strcpy_P(lcd_status_message, PSTR("Done Priming")); // We can't do lcd_setstatusPGM() without having it continue;
521
+                                                          // So... We cheat to get a message up.
522
+      lcd_setstatusPGM(PSTR("Done Priming"), 99);
523
+      lcd_quick_feedback();
524
+      lcd_external_control = false;
527 525
     }
528 526
     else
529 527
   #endif

Loading…
Cancel
Save