|
@@ -509,6 +509,9 @@ uint16_t max_display_update_time = 0;
|
509
|
509
|
|
510
|
510
|
inline bool printer_busy() { return planner.movesplanned() || IS_SD_PRINTING; }
|
511
|
511
|
|
|
512
|
+ void lcd_move_z();
|
|
513
|
+ float move_menu_scale;
|
|
514
|
+
|
512
|
515
|
/**
|
513
|
516
|
* General function to go directly to a screen
|
514
|
517
|
*/
|
|
@@ -528,14 +531,23 @@ uint16_t max_display_update_time = 0;
|
528
|
531
|
if (currentScreen == lcd_status_screen)
|
529
|
532
|
doubleclick_expire_ms = millis() + DOUBLECLICK_MAX_INTERVAL;
|
530
|
533
|
}
|
531
|
|
- else if (screen == lcd_status_screen && currentScreen == lcd_main_menu && PENDING(millis(), doubleclick_expire_ms)/* && printer_busy()*/)
|
532
|
|
- screen =
|
533
|
|
- #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
|
534
|
|
- lcd_babystep_zoffset
|
535
|
|
- #else
|
536
|
|
- lcd_babystep_z
|
537
|
|
- #endif
|
538
|
|
- ;
|
|
534
|
+ else if (screen == lcd_status_screen && currentScreen == lcd_main_menu && PENDING(millis(), doubleclick_expire_ms)) {
|
|
535
|
+ if (printer_busy()) {
|
|
536
|
+ screen =
|
|
537
|
+ #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
|
|
538
|
+ lcd_babystep_zoffset
|
|
539
|
+ #else
|
|
540
|
+ lcd_babystep_z
|
|
541
|
+ #endif
|
|
542
|
+ ;
|
|
543
|
+ }
|
|
544
|
+ #if ENABLED(MOVE_Z_WHEN_IDLE)
|
|
545
|
+ else {
|
|
546
|
+ move_menu_scale = MOVE_Z_IDLE_MULTIPLICATOR;
|
|
547
|
+ screen = lcd_move_z;
|
|
548
|
+ }
|
|
549
|
+ #endif
|
|
550
|
+ }
|
539
|
551
|
#endif
|
540
|
552
|
|
541
|
553
|
currentScreen = screen;
|
|
@@ -2850,12 +2862,8 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
2850
|
2862
|
END_MENU();
|
2851
|
2863
|
}
|
2852
|
2864
|
|
2853
|
|
- float move_menu_scale;
|
2854
|
|
-
|
2855
|
2865
|
#if ENABLED(DELTA_CALIBRATION_MENU) || ENABLED(DELTA_AUTO_CALIBRATION)
|
2856
|
2866
|
|
2857
|
|
- void lcd_move_z();
|
2858
|
|
-
|
2859
|
2867
|
void _man_probe_pt(const float &rx, const float &ry) {
|
2860
|
2868
|
do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES);
|
2861
|
2869
|
do_blocking_move_to_xy(rx, ry);
|