|
@@ -506,6 +506,11 @@ uint16_t max_display_update_time = 0;
|
506
|
506
|
void lcd_goto_screen(screenFunc_t screen, const uint32_t encoder/*=0*/) {
|
507
|
507
|
if (currentScreen != screen) {
|
508
|
508
|
|
|
509
|
+ #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
|
510
|
+ // Shadow for editing the fade height
|
|
511
|
+ new_z_fade_height = planner.z_fade_height;
|
|
512
|
+ #endif
|
|
513
|
+
|
509
|
514
|
#if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING) && ENABLED(BABYSTEPPING)
|
510
|
515
|
static millis_t doubleclick_expire_ms = 0;
|
511
|
516
|
// Going to lcd_main_menu from status screen? Remember first click time.
|
|
@@ -1078,13 +1083,6 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
1078
|
1083
|
*
|
1079
|
1084
|
*/
|
1080
|
1085
|
|
1081
|
|
- #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
1082
|
|
- void _lcd_goto_tune_menu() {
|
1083
|
|
- lcd_goto_screen(lcd_tune_menu);
|
1084
|
|
- new_z_fade_height = planner.z_fade_height;
|
1085
|
|
- }
|
1086
|
|
- #endif
|
1087
|
|
-
|
1088
|
1086
|
void lcd_main_menu() {
|
1089
|
1087
|
START_MENU();
|
1090
|
1088
|
MENU_BACK(MSG_WATCH);
|
|
@@ -1111,18 +1109,11 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
1111
|
1109
|
MENU_ITEM_EDIT_CALLBACK(bool, MSG_CASE_LIGHT, (bool*)&case_light_on, update_case_light);
|
1112
|
1110
|
#endif
|
1113
|
1111
|
|
1114
|
|
- if (planner.movesplanned() || IS_SD_PRINTING) {
|
1115
|
|
- MENU_ITEM(submenu, MSG_TUNE,
|
1116
|
|
- #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
1117
|
|
- _lcd_goto_tune_menu
|
1118
|
|
- #else
|
1119
|
|
- lcd_tune_menu
|
1120
|
|
- #endif
|
1121
|
|
- );
|
1122
|
|
- }
|
1123
|
|
- else {
|
|
1112
|
+ if (planner.movesplanned() || IS_SD_PRINTING)
|
|
1113
|
+ MENU_ITEM(submenu, MSG_TUNE, lcd_tune_menu);
|
|
1114
|
+ else
|
1124
|
1115
|
MENU_ITEM(submenu, MSG_PREPARE, lcd_prepare_menu);
|
1125
|
|
- }
|
|
1116
|
+
|
1126
|
1117
|
MENU_ITEM(submenu, MSG_CONTROL, lcd_control_menu);
|
1127
|
1118
|
|
1128
|
1119
|
#if ENABLED(SDSUPPORT)
|
|
@@ -2059,13 +2050,6 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
2059
|
2050
|
|
2060
|
2051
|
void _lcd_ubl_level_bed();
|
2061
|
2052
|
|
2062
|
|
- #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
2063
|
|
- void _lcd_goto_ubl_level_bed() {
|
2064
|
|
- lcd_goto_screen(_lcd_ubl_level_bed);
|
2065
|
|
- new_z_fade_height = planner.z_fade_height;
|
2066
|
|
- }
|
2067
|
|
- #endif
|
2068
|
|
-
|
2069
|
2053
|
static int16_t ubl_storage_slot = 0,
|
2070
|
2054
|
custom_hotend_temp = 190,
|
2071
|
2055
|
side_points = 3,
|
|
@@ -2663,13 +2647,6 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
2663
|
2647
|
END_MENU();
|
2664
|
2648
|
}
|
2665
|
2649
|
|
2666
|
|
- #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
2667
|
|
- void _lcd_goto_bed_leveling() {
|
2668
|
|
- lcd_goto_screen(lcd_bed_leveling);
|
2669
|
|
- new_z_fade_height = planner.z_fade_height;
|
2670
|
|
- }
|
2671
|
|
- #endif
|
2672
|
|
-
|
2673
|
2650
|
#endif // LCD_BED_LEVELING
|
2674
|
2651
|
|
2675
|
2652
|
/**
|
|
@@ -2709,29 +2686,14 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
2709
|
2686
|
//
|
2710
|
2687
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
2711
|
2688
|
|
2712
|
|
- MENU_ITEM(submenu, MSG_UBL_LEVEL_BED, (
|
2713
|
|
- #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
2714
|
|
- _lcd_goto_ubl_level_bed
|
2715
|
|
- #else
|
2716
|
|
- _lcd_ubl_level_bed
|
2717
|
|
- #endif
|
2718
|
|
- )
|
2719
|
|
- );
|
|
2689
|
+ MENU_ITEM(submenu, MSG_UBL_LEVEL_BED, _lcd_ubl_level_bed);
|
2720
|
2690
|
|
2721
|
2691
|
#elif ENABLED(LCD_BED_LEVELING)
|
2722
|
2692
|
|
2723
|
2693
|
#if ENABLED(PROBE_MANUALLY)
|
2724
|
2694
|
if (!g29_in_progress)
|
2725
|
2695
|
#endif
|
2726
|
|
-
|
2727
|
|
- MENU_ITEM(submenu, MSG_BED_LEVELING, (
|
2728
|
|
- #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
2729
|
|
- _lcd_goto_bed_leveling
|
2730
|
|
- #else
|
2731
|
|
- lcd_bed_leveling
|
2732
|
|
- #endif
|
2733
|
|
- )
|
2734
|
|
- );
|
|
2696
|
+ MENU_ITEM(submenu, MSG_BED_LEVELING, lcd_bed_leveling);
|
2735
|
2697
|
|
2736
|
2698
|
#elif PLANNER_LEVELING && DISABLED(SLIM_LCD_MENUS)
|
2737
|
2699
|
|