|
@@ -2026,8 +2026,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
2026
|
2026
|
void _lcd_level_bed_homing() {
|
2027
|
2027
|
if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_HOMING), NULL);
|
2028
|
2028
|
lcdDrawUpdate = LCDVIEW_CALL_NO_REDRAW;
|
2029
|
|
- if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS])
|
2030
|
|
- lcd_goto_screen(_lcd_level_bed_homing_done);
|
|
2029
|
+ if (all_axes_homed()) lcd_goto_screen(_lcd_level_bed_homing_done);
|
2031
|
2030
|
}
|
2032
|
2031
|
|
2033
|
2032
|
#if ENABLED(PROBE_MANUALLY)
|
|
@@ -2039,7 +2038,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
2039
|
2038
|
*/
|
2040
|
2039
|
void _lcd_level_bed_continue() {
|
2041
|
2040
|
defer_return_to_status = true;
|
2042
|
|
- axis_homed[X_AXIS] = axis_homed[Y_AXIS] = axis_homed[Z_AXIS] = false;
|
|
2041
|
+ axis_homed = 0;
|
2043
|
2042
|
lcd_goto_screen(_lcd_level_bed_homing);
|
2044
|
2043
|
enqueue_and_echo_commands_P(PSTR("G28"));
|
2045
|
2044
|
}
|
|
@@ -2369,7 +2368,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
2369
|
2368
|
defer_return_to_status = true;
|
2370
|
2369
|
if (lcdDrawUpdate) lcd_implementation_drawmenu_static(LCD_HEIGHT < 3 ? 0 : (LCD_HEIGHT > 4 ? 2 : 1), PSTR(MSG_LEVEL_BED_HOMING));
|
2371
|
2370
|
lcdDrawUpdate = LCDVIEW_CALL_NO_REDRAW;
|
2372
|
|
- if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS]) {
|
|
2371
|
+ if (all_axes_homed()) {
|
2373
|
2372
|
ubl.lcd_map_control = true; // Return to the map screen
|
2374
|
2373
|
lcd_goto_screen(_lcd_ubl_output_map_lcd);
|
2375
|
2374
|
}
|
|
@@ -2414,7 +2413,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
2414
|
2413
|
void _lcd_ubl_output_map_lcd() {
|
2415
|
2414
|
static int16_t step_scaler = 0;
|
2416
|
2415
|
|
2417
|
|
- if (!(axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS]))
|
|
2416
|
+ if (!all_axes_known())
|
2418
|
2417
|
return lcd_goto_screen(_lcd_ubl_map_homing);
|
2419
|
2418
|
|
2420
|
2419
|
if (use_click()) return _lcd_ubl_map_lcd_edit_cmd();
|
|
@@ -2463,8 +2462,8 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
2463
|
2462
|
* UBL Homing before LCD map
|
2464
|
2463
|
*/
|
2465
|
2464
|
void _lcd_ubl_output_map_lcd_cmd() {
|
2466
|
|
- if (!(axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS])) {
|
2467
|
|
- axis_homed[X_AXIS] = axis_homed[Y_AXIS] = axis_homed[Z_AXIS] = false;
|
|
2465
|
+ if (!all_axes_known()) {
|
|
2466
|
+ axis_homed = 0;
|
2468
|
2467
|
enqueue_and_echo_commands_P(PSTR("G28"));
|
2469
|
2468
|
}
|
2470
|
2469
|
lcd_goto_screen(_lcd_ubl_map_homing);
|
|
@@ -2592,7 +2591,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
2592
|
2591
|
START_MENU();
|
2593
|
2592
|
MENU_BACK(MSG_PREPARE);
|
2594
|
2593
|
|
2595
|
|
- const bool is_homed = axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS];
|
|
2594
|
+ const bool is_homed = all_axes_known();
|
2596
|
2595
|
|
2597
|
2596
|
// Auto Home if not using manual probing
|
2598
|
2597
|
#if DISABLED(PROBE_MANUALLY) && DISABLED(MESH_BED_LEVELING)
|
|
@@ -2634,8 +2633,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
2634
|
2633
|
|
2635
|
2634
|
#if ENABLED(LEVEL_BED_CORNERS)
|
2636
|
2635
|
// Move to the next corner for leveling
|
2637
|
|
- if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS])
|
2638
|
|
- MENU_ITEM(submenu, MSG_LEVEL_CORNERS, _lcd_level_bed_corners);
|
|
2636
|
+ if (all_axes_homed()) MENU_ITEM(submenu, MSG_LEVEL_CORNERS, _lcd_level_bed_corners);
|
2639
|
2637
|
#endif
|
2640
|
2638
|
|
2641
|
2639
|
#if ENABLED(EEPROM_SETTINGS)
|
|
@@ -2665,7 +2663,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
2665
|
2663
|
// Move Axis
|
2666
|
2664
|
//
|
2667
|
2665
|
#if ENABLED(DELTA)
|
2668
|
|
- if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS])
|
|
2666
|
+ if (all_axes_homed())
|
2669
|
2667
|
#endif
|
2670
|
2668
|
MENU_ITEM(submenu, MSG_MOVE_AXIS, lcd_move_menu);
|
2671
|
2669
|
|
|
@@ -2709,7 +2707,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
2709
|
2707
|
#endif
|
2710
|
2708
|
|
2711
|
2709
|
#if ENABLED(LEVEL_BED_CORNERS) && DISABLED(LCD_BED_LEVELING)
|
2712
|
|
- if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS])
|
|
2710
|
+ if (all_axes_homed())
|
2713
|
2711
|
MENU_ITEM(function, MSG_LEVEL_CORNERS, _lcd_level_bed_corners);
|
2714
|
2712
|
#endif
|
2715
|
2713
|
|
|
@@ -2839,7 +2837,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
2839
|
2837
|
void _lcd_calibrate_homing() {
|
2840
|
2838
|
if (lcdDrawUpdate) lcd_implementation_drawmenu_static(LCD_HEIGHT >= 4 ? 1 : 0, PSTR(MSG_LEVEL_BED_HOMING));
|
2841
|
2839
|
lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT;
|
2842
|
|
- if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS])
|
|
2840
|
+ if (all_axes_homed())
|
2843
|
2841
|
lcd_goto_previous_menu();
|
2844
|
2842
|
}
|
2845
|
2843
|
|
|
@@ -2894,7 +2892,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
2894
|
2892
|
MENU_ITEM(submenu, MSG_DELTA_SETTINGS, lcd_delta_settings);
|
2895
|
2893
|
#if ENABLED(DELTA_CALIBRATION_MENU)
|
2896
|
2894
|
MENU_ITEM(submenu, MSG_AUTO_HOME, _lcd_delta_calibrate_home);
|
2897
|
|
- if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS]) {
|
|
2895
|
+ if (all_axes_homed()) {
|
2898
|
2896
|
MENU_ITEM(submenu, MSG_DELTA_CALIBRATE_X, _goto_tower_x);
|
2899
|
2897
|
MENU_ITEM(submenu, MSG_DELTA_CALIBRATE_Y, _goto_tower_y);
|
2900
|
2898
|
MENU_ITEM(submenu, MSG_DELTA_CALIBRATE_Z, _goto_tower_z);
|
|
@@ -3190,7 +3188,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
3190
|
3188
|
*/
|
3191
|
3189
|
|
3192
|
3190
|
#if IS_KINEMATIC || ENABLED(NO_MOTION_BEFORE_HOMING)
|
3193
|
|
- #define _MOVE_XYZ_ALLOWED (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS])
|
|
3191
|
+ #define _MOVE_XYZ_ALLOWED (all_axes_homed())
|
3194
|
3192
|
#else
|
3195
|
3193
|
#define _MOVE_XYZ_ALLOWED true
|
3196
|
3194
|
#endif
|
|
@@ -4930,7 +4928,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
4930
|
4928
|
if (REPRAPWORLD_KEYPAD_MOVE_Z_UP) reprapworld_keypad_move_z_up();
|
4931
|
4929
|
#endif
|
4932
|
4930
|
|
4933
|
|
- if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS]) {
|
|
4931
|
+ if (all_axes_homed()) {
|
4934
|
4932
|
#if ENABLED(DELTA) || Z_HOME_DIR != -1
|
4935
|
4933
|
if (REPRAPWORLD_KEYPAD_MOVE_Z_UP) reprapworld_keypad_move_z_up();
|
4936
|
4934
|
#endif
|