|
@@ -136,11 +136,11 @@ uint16_t max_display_update_time = 0;
|
136
|
136
|
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(int16_t, int3, itostr3);
|
137
|
137
|
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(uint8_t, int8, i8tostr3);
|
138
|
138
|
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float3, ftostr3);
|
139
|
|
- DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float32, ftostr32);
|
|
139
|
+ DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float52, ftostr52);
|
140
|
140
|
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float43, ftostr43sign);
|
141
|
141
|
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float5, ftostr5rj);
|
142
|
142
|
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float51, ftostr51sign);
|
143
|
|
- DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float52, ftostr52sign);
|
|
143
|
+ DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float52sign, ftostr52sign);
|
144
|
144
|
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float62, ftostr62rj);
|
145
|
145
|
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(uint32_t, long5, ftostr5rj);
|
146
|
146
|
#define lcd_implementation_drawmenu_setting_edit_bool(sel, row, pstr, pstr2, data) DRAW_BOOL_SETTING(sel, row, pstr, data)
|
|
@@ -264,11 +264,11 @@ uint16_t max_display_update_time = 0;
|
264
|
264
|
DECLARE_MENU_EDIT_TYPE(int16_t, int3);
|
265
|
265
|
DECLARE_MENU_EDIT_TYPE(uint8_t, int8);
|
266
|
266
|
DECLARE_MENU_EDIT_TYPE(float, float3);
|
267
|
|
- DECLARE_MENU_EDIT_TYPE(float, float32);
|
|
267
|
+ DECLARE_MENU_EDIT_TYPE(float, float52);
|
268
|
268
|
DECLARE_MENU_EDIT_TYPE(float, float43);
|
269
|
269
|
DECLARE_MENU_EDIT_TYPE(float, float5);
|
270
|
270
|
DECLARE_MENU_EDIT_TYPE(float, float51);
|
271
|
|
- DECLARE_MENU_EDIT_TYPE(float, float52);
|
|
271
|
+ DECLARE_MENU_EDIT_TYPE(float, float52sign);
|
272
|
272
|
DECLARE_MENU_EDIT_TYPE(float, float62);
|
273
|
273
|
DECLARE_MENU_EDIT_TYPE(uint32_t, long5);
|
274
|
274
|
|
|
@@ -1404,13 +1404,20 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
1404
|
1404
|
//
|
1405
|
1405
|
MENU_ITEM_EDIT(int3, MSG_SPEED, &feedrate_percentage, 10, 999);
|
1406
|
1406
|
|
|
1407
|
+ //
|
1407
|
1408
|
// Manual bed leveling, Bed Z:
|
|
1409
|
+ //
|
1408
|
1410
|
#if ENABLED(MESH_BED_LEVELING) && ENABLED(LCD_BED_LEVELING)
|
1409
|
1411
|
MENU_ITEM_EDIT(float43, MSG_BED_Z, &mbl.z_offset, -1, 1);
|
1410
|
1412
|
#endif
|
1411
|
|
- #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
|
1413
|
+
|
|
1414
|
+ //
|
|
1415
|
+ // Leveling Fade Height
|
|
1416
|
+ //
|
|
1417
|
+ #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT) && DISABLED(SLIM_LCD_MENUS)
|
1412
|
1418
|
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_Z_FADE_HEIGHT, &new_z_fade_height, 0.0, 100.0, _lcd_set_z_fade_height);
|
1413
|
1419
|
#endif
|
|
1420
|
+
|
1414
|
1421
|
//
|
1415
|
1422
|
// Nozzle:
|
1416
|
1423
|
// Nozzle [1-4]:
|
|
@@ -1883,7 +1890,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
1883
|
1890
|
|
1884
|
1891
|
#endif // LEVEL_BED_CORNERS
|
1885
|
1892
|
|
1886
|
|
- #if ENABLED(LCD_BED_LEVELING)
|
|
1893
|
+ #if ENABLED(LCD_BED_LEVELING) && (ENABLED(PROBE_MANUALLY) || ENABLED(MESH_BED_LEVELING))
|
1887
|
1894
|
|
1888
|
1895
|
/**
|
1889
|
1896
|
*
|
|
@@ -2045,76 +2052,6 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
2045
|
2052
|
enqueue_and_echo_commands_P(PSTR("G28"));
|
2046
|
2053
|
}
|
2047
|
2054
|
|
2048
|
|
- static bool new_level_state;
|
2049
|
|
- void _lcd_toggle_bed_leveling() { set_bed_leveling_enabled(new_level_state); }
|
2050
|
|
-
|
2051
|
|
- /**
|
2052
|
|
- * Step 1: Bed Level entry-point
|
2053
|
|
- *
|
2054
|
|
- * << Prepare
|
2055
|
|
- * Auto Home (if homing needed)
|
2056
|
|
- * Leveling On/Off (if data exists, and homed)
|
2057
|
|
- * Fade Height: --- (Req: ENABLE_LEVELING_FADE_HEIGHT)
|
2058
|
|
- * Mesh Z Offset: --- (Req: MESH_BED_LEVELING)
|
2059
|
|
- * Z Probe Offset: --- (Req: HAS_BED_PROBE, Opt: BABYSTEP_ZPROBE_OFFSET)
|
2060
|
|
- * Level Bed >
|
2061
|
|
- * Level Corners > (if homed)
|
2062
|
|
- * Load Settings (Req: EEPROM_SETTINGS)
|
2063
|
|
- * Save Settings (Req: EEPROM_SETTINGS)
|
2064
|
|
- */
|
2065
|
|
- void lcd_bed_leveling() {
|
2066
|
|
- START_MENU();
|
2067
|
|
- MENU_BACK(MSG_PREPARE);
|
2068
|
|
-
|
2069
|
|
- #if DISABLED(MESH_BED_LEVELING)
|
2070
|
|
- if (!(axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS]))
|
2071
|
|
- MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28"));
|
2072
|
|
- else
|
2073
|
|
- #endif
|
2074
|
|
- if (leveling_is_valid()) {
|
2075
|
|
- new_level_state = planner.leveling_active;
|
2076
|
|
- MENU_ITEM_EDIT_CALLBACK(bool, MSG_BED_LEVELING, &new_level_state, _lcd_toggle_bed_leveling);
|
2077
|
|
- }
|
2078
|
|
-
|
2079
|
|
- #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
2080
|
|
- MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_Z_FADE_HEIGHT, &new_z_fade_height, 0.0, 100.0, _lcd_set_z_fade_height);
|
2081
|
|
- #endif
|
2082
|
|
-
|
2083
|
|
- //
|
2084
|
|
- // MBL Z Offset
|
2085
|
|
- //
|
2086
|
|
- #if ENABLED(MESH_BED_LEVELING)
|
2087
|
|
- MENU_ITEM_EDIT(float43, MSG_BED_Z, &mbl.z_offset, -1, 1);
|
2088
|
|
- #endif
|
2089
|
|
-
|
2090
|
|
- #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
|
2091
|
|
- MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
|
2092
|
|
- #elif HAS_BED_PROBE
|
2093
|
|
- MENU_ITEM_EDIT(float32, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
|
2094
|
|
- #endif
|
2095
|
|
-
|
2096
|
|
- MENU_ITEM(submenu, MSG_LEVEL_BED, _lcd_level_bed_continue);
|
2097
|
|
-
|
2098
|
|
- #if ENABLED(LEVEL_BED_CORNERS)
|
2099
|
|
- // Move to the next corner for leveling
|
2100
|
|
- if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS])
|
2101
|
|
- MENU_ITEM(submenu, MSG_LEVEL_CORNERS, _lcd_level_bed_corners);
|
2102
|
|
- #endif
|
2103
|
|
-
|
2104
|
|
- #if ENABLED(EEPROM_SETTINGS)
|
2105
|
|
- MENU_ITEM(function, MSG_LOAD_EEPROM, lcd_load_settings);
|
2106
|
|
- MENU_ITEM(function, MSG_STORE_EEPROM, lcd_store_settings);
|
2107
|
|
- #endif
|
2108
|
|
- END_MENU();
|
2109
|
|
- }
|
2110
|
|
-
|
2111
|
|
- #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
2112
|
|
- void _lcd_goto_bed_leveling() {
|
2113
|
|
- lcd_goto_screen(lcd_bed_leveling);
|
2114
|
|
- new_z_fade_height = planner.z_fade_height;
|
2115
|
|
- }
|
2116
|
|
- #endif
|
2117
|
|
-
|
2118
|
2055
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
2119
|
2056
|
|
2120
|
2057
|
void _lcd_ubl_level_bed();
|
|
@@ -2647,6 +2584,93 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
2647
|
2584
|
|
2648
|
2585
|
#endif // AUTO_BED_LEVELING_UBL
|
2649
|
2586
|
|
|
2587
|
+
|
|
2588
|
+ #if ENABLED(LCD_BED_LEVELING) || (PLANNER_LEVELING && DISABLED(SLIM_LCD_MENUS))
|
|
2589
|
+ void _lcd_toggle_bed_leveling() { set_bed_leveling_enabled(!planner.leveling_active); }
|
|
2590
|
+ #endif
|
|
2591
|
+
|
|
2592
|
+ #if ENABLED(LCD_BED_LEVELING)
|
|
2593
|
+
|
|
2594
|
+ /**
|
|
2595
|
+ * Step 1: Bed Level entry-point
|
|
2596
|
+ *
|
|
2597
|
+ * << Prepare
|
|
2598
|
+ * Auto Home (if homing needed)
|
|
2599
|
+ * Leveling On/Off (if data exists, and homed)
|
|
2600
|
+ * Fade Height: --- (Req: ENABLE_LEVELING_FADE_HEIGHT)
|
|
2601
|
+ * Mesh Z Offset: --- (Req: MESH_BED_LEVELING)
|
|
2602
|
+ * Z Probe Offset: --- (Req: HAS_BED_PROBE, Opt: BABYSTEP_ZPROBE_OFFSET)
|
|
2603
|
+ * Level Bed >
|
|
2604
|
+ * Level Corners > (if homed)
|
|
2605
|
+ * Load Settings (Req: EEPROM_SETTINGS)
|
|
2606
|
+ * Save Settings (Req: EEPROM_SETTINGS)
|
|
2607
|
+ */
|
|
2608
|
+ void lcd_bed_leveling() {
|
|
2609
|
+ START_MENU();
|
|
2610
|
+ MENU_BACK(MSG_PREPARE);
|
|
2611
|
+
|
|
2612
|
+ const bool is_homed = axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS];
|
|
2613
|
+
|
|
2614
|
+ // Auto Home if not using manual probing
|
|
2615
|
+ #if DISABLED(PROBE_MANUALLY) && DISABLED(MESH_BED_LEVELING)
|
|
2616
|
+ if (!is_homed) MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28"));
|
|
2617
|
+ #endif
|
|
2618
|
+
|
|
2619
|
+ // Level Bed
|
|
2620
|
+ #if ENABLED(PROBE_MANUALLY) || ENABLED(MESH_BED_LEVELING)
|
|
2621
|
+ // Manual leveling uses a guided procedure
|
|
2622
|
+ MENU_ITEM(submenu, MSG_LEVEL_BED, _lcd_level_bed_continue);
|
|
2623
|
+ #else
|
|
2624
|
+ // Automatic leveling can just run the G-code
|
|
2625
|
+ MENU_ITEM(gcode, MSG_LEVEL_BED, is_homed ? PSTR("G29") : PSTR("G28\nG29"));
|
|
2626
|
+ #endif
|
|
2627
|
+
|
|
2628
|
+ // Homed and leveling is valid? Then leveling can be toggled.
|
|
2629
|
+ if (is_homed && leveling_is_valid()) {
|
|
2630
|
+ bool new_level_state = planner.leveling_active;
|
|
2631
|
+ MENU_ITEM_EDIT_CALLBACK(bool, MSG_BED_LEVELING, &new_level_state, _lcd_toggle_bed_leveling);
|
|
2632
|
+ }
|
|
2633
|
+
|
|
2634
|
+ // Z Fade Height
|
|
2635
|
+ #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
|
2636
|
+ MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_Z_FADE_HEIGHT, &new_z_fade_height, 0.0, 100.0, _lcd_set_z_fade_height);
|
|
2637
|
+ #endif
|
|
2638
|
+
|
|
2639
|
+ //
|
|
2640
|
+ // MBL Z Offset
|
|
2641
|
+ //
|
|
2642
|
+ #if ENABLED(MESH_BED_LEVELING)
|
|
2643
|
+ MENU_ITEM_EDIT(float43, MSG_BED_Z, &mbl.z_offset, -1, 1);
|
|
2644
|
+ #endif
|
|
2645
|
+
|
|
2646
|
+ #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
|
|
2647
|
+ MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
|
|
2648
|
+ #elif HAS_BED_PROBE
|
|
2649
|
+ MENU_ITEM_EDIT(float52, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
|
|
2650
|
+ #endif
|
|
2651
|
+
|
|
2652
|
+ #if ENABLED(LEVEL_BED_CORNERS)
|
|
2653
|
+ // Move to the next corner for leveling
|
|
2654
|
+ if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS])
|
|
2655
|
+ MENU_ITEM(submenu, MSG_LEVEL_CORNERS, _lcd_level_bed_corners);
|
|
2656
|
+ #endif
|
|
2657
|
+
|
|
2658
|
+ #if ENABLED(EEPROM_SETTINGS)
|
|
2659
|
+ MENU_ITEM(function, MSG_LOAD_EEPROM, lcd_load_settings);
|
|
2660
|
+ MENU_ITEM(function, MSG_STORE_EEPROM, lcd_store_settings);
|
|
2661
|
+ #endif
|
|
2662
|
+ END_MENU();
|
|
2663
|
+ }
|
|
2664
|
+
|
|
2665
|
+ #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
|
2666
|
+ void _lcd_goto_bed_leveling() {
|
|
2667
|
+ lcd_goto_screen(lcd_bed_leveling);
|
|
2668
|
+ new_z_fade_height = planner.z_fade_height;
|
|
2669
|
+ }
|
|
2670
|
+ #endif
|
|
2671
|
+
|
|
2672
|
+ #endif // LCD_BED_LEVELING
|
|
2673
|
+
|
2650
|
2674
|
/**
|
2651
|
2675
|
*
|
2652
|
2676
|
* "Prepare" submenu
|
|
@@ -2683,26 +2707,44 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
2683
|
2707
|
// Level Bed
|
2684
|
2708
|
//
|
2685
|
2709
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
2686
|
|
- MENU_ITEM(submenu, MSG_UBL_LEVEL_BED,
|
2687
|
|
- #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
2688
|
|
- _lcd_goto_ubl_level_bed
|
2689
|
|
- #else
|
2690
|
|
- _lcd_ubl_level_bed
|
2691
|
|
- #endif
|
|
2710
|
+
|
|
2711
|
+ MENU_ITEM(submenu, MSG_UBL_LEVEL_BED, (
|
|
2712
|
+ #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
|
2713
|
+ _lcd_goto_ubl_level_bed
|
|
2714
|
+ #else
|
|
2715
|
+ _lcd_ubl_level_bed
|
|
2716
|
+ #endif
|
|
2717
|
+ )
|
2692
|
2718
|
);
|
|
2719
|
+
|
2693
|
2720
|
#elif ENABLED(LCD_BED_LEVELING)
|
|
2721
|
+
|
2694
|
2722
|
#if ENABLED(PROBE_MANUALLY)
|
2695
|
2723
|
if (!g29_in_progress)
|
2696
|
2724
|
#endif
|
2697
|
|
- MENU_ITEM(submenu, MSG_BED_LEVELING,
|
2698
|
|
- #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
2699
|
|
- _lcd_goto_bed_leveling
|
2700
|
|
- #else
|
2701
|
|
- lcd_bed_leveling
|
2702
|
|
- #endif
|
|
2725
|
+
|
|
2726
|
+ MENU_ITEM(submenu, MSG_BED_LEVELING, (
|
|
2727
|
+ #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
|
2728
|
+ _lcd_goto_bed_leveling
|
|
2729
|
+ #else
|
|
2730
|
+ lcd_bed_leveling
|
|
2731
|
+ #endif
|
|
2732
|
+ )
|
2703
|
2733
|
);
|
2704
|
|
- #elif PLANNER_LEVELING && DISABLED(PROBE_MANUALLY) && DISABLED(SLIM_LCD_MENUS)
|
2705
|
|
- MENU_ITEM(gcode, MSG_BED_LEVELING, PSTR("G28\nG29"));
|
|
2734
|
+
|
|
2735
|
+ #elif PLANNER_LEVELING && DISABLED(SLIM_LCD_MENUS)
|
|
2736
|
+
|
|
2737
|
+ #if DISABLED(PROBE_MANUALLY)
|
|
2738
|
+ MENU_ITEM(gcode, MSG_LEVEL_BED, PSTR("G28\nG29"));
|
|
2739
|
+ #endif
|
|
2740
|
+ if (leveling_is_valid()) {
|
|
2741
|
+ bool new_level_state = planner.leveling_active;
|
|
2742
|
+ MENU_ITEM_EDIT_CALLBACK(bool, MSG_BED_LEVELING, &new_level_state, _lcd_toggle_bed_leveling);
|
|
2743
|
+ }
|
|
2744
|
+ #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
|
2745
|
+ MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_Z_FADE_HEIGHT, &new_z_fade_height, 0.0, 100.0, _lcd_set_z_fade_height);
|
|
2746
|
+ #endif
|
|
2747
|
+
|
2706
|
2748
|
#endif
|
2707
|
2749
|
|
2708
|
2750
|
#if ENABLED(LEVEL_BED_CORNERS) && DISABLED(LCD_BED_LEVELING)
|
|
@@ -2864,15 +2906,15 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
2864
|
2906
|
void lcd_delta_settings() {
|
2865
|
2907
|
START_MENU();
|
2866
|
2908
|
MENU_BACK(MSG_DELTA_CALIBRATE);
|
2867
|
|
- MENU_ITEM_EDIT_CALLBACK(float52, MSG_DELTA_HEIGHT, &delta_height, delta_height - 10.0, delta_height + 10.0, _recalc_delta_settings);
|
|
2909
|
+ MENU_ITEM_EDIT_CALLBACK(float52sign, MSG_DELTA_HEIGHT, &delta_height, delta_height - 10.0, delta_height + 10.0, _recalc_delta_settings);
|
2868
|
2910
|
MENU_ITEM_EDIT_CALLBACK(float43, "Ex", &delta_endstop_adj[A_AXIS], -5.0, 5.0, _recalc_delta_settings);
|
2869
|
2911
|
MENU_ITEM_EDIT_CALLBACK(float43, "Ey", &delta_endstop_adj[B_AXIS], -5.0, 5.0, _recalc_delta_settings);
|
2870
|
2912
|
MENU_ITEM_EDIT_CALLBACK(float43, "Ez", &delta_endstop_adj[C_AXIS], -5.0, 5.0, _recalc_delta_settings);
|
2871
|
|
- MENU_ITEM_EDIT_CALLBACK(float52, MSG_DELTA_RADIUS, &delta_radius, delta_radius - 5.0, delta_radius + 5.0, _recalc_delta_settings);
|
|
2913
|
+ MENU_ITEM_EDIT_CALLBACK(float52sign, MSG_DELTA_RADIUS, &delta_radius, delta_radius - 5.0, delta_radius + 5.0, _recalc_delta_settings);
|
2872
|
2914
|
MENU_ITEM_EDIT_CALLBACK(float43, "Tx", &delta_tower_angle_trim[A_AXIS], -5.0, 5.0, _recalc_delta_settings);
|
2873
|
2915
|
MENU_ITEM_EDIT_CALLBACK(float43, "Ty", &delta_tower_angle_trim[B_AXIS], -5.0, 5.0, _recalc_delta_settings);
|
2874
|
2916
|
MENU_ITEM_EDIT_CALLBACK(float43, "Tz", &delta_tower_angle_trim[C_AXIS], -5.0, 5.0, _recalc_delta_settings);
|
2875
|
|
- MENU_ITEM_EDIT_CALLBACK(float52, MSG_DELTA_DIAG_ROD, &delta_diagonal_rod, delta_diagonal_rod - 5.0, delta_diagonal_rod + 5.0, _recalc_delta_settings);
|
|
2917
|
+ MENU_ITEM_EDIT_CALLBACK(float52sign, MSG_DELTA_DIAG_ROD, &delta_diagonal_rod, delta_diagonal_rod - 5.0, delta_diagonal_rod + 5.0, _recalc_delta_settings);
|
2876
|
2918
|
END_MENU();
|
2877
|
2919
|
}
|
2878
|
2920
|
|
|
@@ -3315,7 +3357,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
3315
|
3357
|
#if DISABLED(NO_VOLUMETRICS) || ENABLED(ADVANCED_PAUSE_FEATURE)
|
3316
|
3358
|
MENU_ITEM(submenu, MSG_FILAMENT, lcd_control_filament_menu);
|
3317
|
3359
|
#elif ENABLED(LIN_ADVANCE)
|
3318
|
|
- MENU_ITEM_EDIT(float32, MSG_ADVANCE_K, &planner.extruder_advance_K, 0, 999);
|
|
3360
|
+ MENU_ITEM_EDIT(float52, MSG_ADVANCE_K, &planner.extruder_advance_K, 0, 999);
|
3319
|
3361
|
#endif
|
3320
|
3362
|
|
3321
|
3363
|
#if HAS_LCD_CONTRAST
|
|
@@ -3500,7 +3542,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
3500
|
3542
|
MENU_ITEM_EDIT(bool, MSG_AUTOTEMP, &planner.autotemp_enabled);
|
3501
|
3543
|
MENU_ITEM_EDIT(float3, MSG_MIN, &planner.autotemp_min, 0, HEATER_0_MAXTEMP - 15);
|
3502
|
3544
|
MENU_ITEM_EDIT(float3, MSG_MAX, &planner.autotemp_max, 0, HEATER_0_MAXTEMP - 15);
|
3503
|
|
- MENU_ITEM_EDIT(float32, MSG_FACTOR, &planner.autotemp_factor, 0.0, 1.0);
|
|
3545
|
+ MENU_ITEM_EDIT(float52, MSG_FACTOR, &planner.autotemp_factor, 0.0, 1.0);
|
3504
|
3546
|
#endif
|
3505
|
3547
|
|
3506
|
3548
|
//
|
|
@@ -3516,9 +3558,9 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
3516
|
3558
|
#define _PID_BASE_MENU_ITEMS(ELABEL, eindex) \
|
3517
|
3559
|
raw_Ki = unscalePID_i(PID_PARAM(Ki, eindex)); \
|
3518
|
3560
|
raw_Kd = unscalePID_d(PID_PARAM(Kd, eindex)); \
|
3519
|
|
- MENU_ITEM_EDIT(float52, MSG_PID_P ELABEL, &PID_PARAM(Kp, eindex), 1, 9990); \
|
3520
|
|
- MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I ELABEL, &raw_Ki, 0.01, 9990, copy_and_scalePID_i_E ## eindex); \
|
3521
|
|
- MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D ELABEL, &raw_Kd, 1, 9990, copy_and_scalePID_d_E ## eindex)
|
|
3561
|
+ MENU_ITEM_EDIT(float52sign, MSG_PID_P ELABEL, &PID_PARAM(Kp, eindex), 1, 9990); \
|
|
3562
|
+ MENU_ITEM_EDIT_CALLBACK(float52sign, MSG_PID_I ELABEL, &raw_Ki, 0.01, 9990, copy_and_scalePID_i_E ## eindex); \
|
|
3563
|
+ MENU_ITEM_EDIT_CALLBACK(float52sign, MSG_PID_D ELABEL, &raw_Kd, 1, 9990, copy_and_scalePID_d_E ## eindex)
|
3522
|
3564
|
|
3523
|
3565
|
#if ENABLED(PID_EXTRUSION_SCALING)
|
3524
|
3566
|
#define _PID_MENU_ITEMS(ELABEL, eindex) \
|
|
@@ -3739,7 +3781,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
3739
|
3781
|
#if ENABLED(DELTA)
|
3740
|
3782
|
MENU_ITEM_EDIT(float3, MSG_VC_JERK, &planner.max_jerk[C_AXIS], 1, 990);
|
3741
|
3783
|
#else
|
3742
|
|
- MENU_ITEM_EDIT(float52, MSG_VC_JERK, &planner.max_jerk[C_AXIS], 0.1, 990);
|
|
3784
|
+ MENU_ITEM_EDIT(float52sign, MSG_VC_JERK, &planner.max_jerk[C_AXIS], 0.1, 990);
|
3743
|
3785
|
#endif
|
3744
|
3786
|
MENU_ITEM_EDIT(float3, MSG_VE_JERK, &planner.max_jerk[E_AXIS], 1, 990);
|
3745
|
3787
|
|
|
@@ -3790,7 +3832,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
3790
|
3832
|
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
|
3791
|
3833
|
MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
|
3792
|
3834
|
#elif HAS_BED_PROBE
|
3793
|
|
- MENU_ITEM_EDIT(float32, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
|
|
3835
|
+ MENU_ITEM_EDIT(float52, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
|
3794
|
3836
|
#endif
|
3795
|
3837
|
|
3796
|
3838
|
#if DISABLED(SLIM_LCD_MENUS)
|
|
@@ -3828,7 +3870,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
3828
|
3870
|
MENU_BACK(MSG_CONTROL);
|
3829
|
3871
|
|
3830
|
3872
|
#if ENABLED(LIN_ADVANCE)
|
3831
|
|
- MENU_ITEM_EDIT(float32, MSG_ADVANCE_K, &planner.extruder_advance_K, 0, 999);
|
|
3873
|
+ MENU_ITEM_EDIT(float52, MSG_ADVANCE_K, &planner.extruder_advance_K, 0, 999);
|
3832
|
3874
|
#endif
|
3833
|
3875
|
|
3834
|
3876
|
#if DISABLED(NO_VOLUMETRICS)
|
|
@@ -3913,15 +3955,15 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
3913
|
3955
|
START_MENU();
|
3914
|
3956
|
MENU_BACK(MSG_CONTROL);
|
3915
|
3957
|
MENU_ITEM_EDIT_CALLBACK(bool, MSG_AUTORETRACT, &fwretract.autoretract_enabled, fwretract.refresh_autoretract);
|
3916
|
|
- MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT, &fwretract.retract_length, 0, 100);
|
|
3958
|
+ MENU_ITEM_EDIT(float52sign, MSG_CONTROL_RETRACT, &fwretract.retract_length, 0, 100);
|
3917
|
3959
|
#if EXTRUDERS > 1
|
3918
|
|
- MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_SWAP, &fwretract.swap_retract_length, 0, 100);
|
|
3960
|
+ MENU_ITEM_EDIT(float52sign, MSG_CONTROL_RETRACT_SWAP, &fwretract.swap_retract_length, 0, 100);
|
3919
|
3961
|
#endif
|
3920
|
3962
|
MENU_ITEM_EDIT(float3, MSG_CONTROL_RETRACTF, &fwretract.retract_feedrate_mm_s, 1, 999);
|
3921
|
|
- MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_ZLIFT, &fwretract.retract_zlift, 0, 999);
|
3922
|
|
- MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER, &fwretract.retract_recover_length, -100, 100);
|
|
3963
|
+ MENU_ITEM_EDIT(float52sign, MSG_CONTROL_RETRACT_ZLIFT, &fwretract.retract_zlift, 0, 999);
|
|
3964
|
+ MENU_ITEM_EDIT(float52sign, MSG_CONTROL_RETRACT_RECOVER, &fwretract.retract_recover_length, -100, 100);
|
3923
|
3965
|
#if EXTRUDERS > 1
|
3924
|
|
- MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER_SWAP, &fwretract.swap_retract_recover_length, -100, 100);
|
|
3966
|
+ MENU_ITEM_EDIT(float52sign, MSG_CONTROL_RETRACT_RECOVER_SWAP, &fwretract.swap_retract_recover_length, -100, 100);
|
3925
|
3967
|
#endif
|
3926
|
3968
|
MENU_ITEM_EDIT(float3, MSG_CONTROL_RETRACT_RECOVERF, &fwretract.retract_recover_feedrate_mm_s, 1, 999);
|
3927
|
3969
|
#if EXTRUDERS > 1
|
|
@@ -4829,11 +4871,11 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
4829
|
4871
|
DEFINE_MENU_EDIT_TYPE(int16_t, int3, itostr3, 1);
|
4830
|
4872
|
DEFINE_MENU_EDIT_TYPE(uint8_t, int8, i8tostr3, 1);
|
4831
|
4873
|
DEFINE_MENU_EDIT_TYPE(float, float3, ftostr3, 1.0);
|
4832
|
|
- DEFINE_MENU_EDIT_TYPE(float, float32, ftostr32, 100.0);
|
|
4874
|
+ DEFINE_MENU_EDIT_TYPE(float, float52, ftostr52, 100.0);
|
4833
|
4875
|
DEFINE_MENU_EDIT_TYPE(float, float43, ftostr43sign, 1000.0);
|
4834
|
4876
|
DEFINE_MENU_EDIT_TYPE(float, float5, ftostr5rj, 0.01);
|
4835
|
4877
|
DEFINE_MENU_EDIT_TYPE(float, float51, ftostr51sign, 10.0);
|
4836
|
|
- DEFINE_MENU_EDIT_TYPE(float, float52, ftostr52sign, 100.0);
|
|
4878
|
+ DEFINE_MENU_EDIT_TYPE(float, float52sign, ftostr52sign, 100.0);
|
4837
|
4879
|
DEFINE_MENU_EDIT_TYPE(float, float62, ftostr62rj, 100.0);
|
4838
|
4880
|
DEFINE_MENU_EDIT_TYPE(uint32_t, long5, ftostr5rj, 0.01);
|
4839
|
4881
|
|