MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Use axis_homed in _lcd_level_bed_homing, item in Prepare before homing

Browse Source
This commit is contained in:
Scott Lahteine 2016-04-20 18:42:01 -07:00
parent 9bcb72e7f8
commit 9d5e1f32fd
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Marlin/ultralcd.cpp
View File

@ -1054,7 +1054,7 @@ void lcd_cooldown() {
LCDVIEW_CALL_NO_REDRAW LCDVIEW_CALL_NO_REDRAW
#endif #endif
; ;
if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS]) if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS])
lcd_goto_menu(_lcd_level_bed_homing_done); lcd_goto_menu(_lcd_level_bed_homing_done);
} }
@ -1063,7 +1063,7 @@ void lcd_cooldown() {
*/ */
static void _lcd_level_bed_continue() { static void _lcd_level_bed_continue() {
defer_return_to_status = true; defer_return_to_status = true;
axis_known_position[X_AXIS] = axis_known_position[Y_AXIS] = axis_known_position[Z_AXIS] = false; axis_homed[X_AXIS] = axis_homed[Y_AXIS] = axis_homed[Z_AXIS] = false;
mbl.reset(); mbl.reset();
enqueue_and_echo_commands_P(PSTR("G28")); enqueue_and_echo_commands_P(PSTR("G28"));
lcd_goto_menu(_lcd_level_bed_homing); lcd_goto_menu(_lcd_level_bed_homing);
@ -1110,8 +1110,9 @@ static void lcd_prepare_menu() {
// Level Bed // Level Bed
// //
#if ENABLED(AUTO_BED_LEVELING_FEATURE) #if ENABLED(AUTO_BED_LEVELING_FEATURE)
if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS]) MENU_ITEM(gcode, MSG_LEVEL_BED,
MENU_ITEM(gcode, MSG_LEVEL_BED, PSTR("G29")); axis_homed[X_AXIS] && axis_homed[Y_AXIS] ? PSTR("G29") : PSTR("G28\nG29")
);
#elif ENABLED(MANUAL_BED_LEVELING) #elif ENABLED(MANUAL_BED_LEVELING)
MENU_ITEM(submenu, MSG_LEVEL_BED, lcd_level_bed); MENU_ITEM(submenu, MSG_LEVEL_BED, lcd_level_bed);
#endif #endif