Browse Source

Use axis_homed in _lcd_level_bed_homing, item in Prepare before homing

Scott Lahteine 9 years ago
parent
commit
9d5e1f32fd
1 changed files with 5 additions and 4 deletions
  1. 5
    4
      Marlin/ultralcd.cpp

+ 5
- 4
Marlin/ultralcd.cpp View File

@@ -1054,7 +1054,7 @@ void lcd_cooldown() {
1054 1054
         LCDVIEW_CALL_NO_REDRAW
1055 1055
       #endif
1056 1056
     ;
1057
-    if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS])
1057
+    if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS])
1058 1058
       lcd_goto_menu(_lcd_level_bed_homing_done);
1059 1059
   }
1060 1060
 
@@ -1063,7 +1063,7 @@ void lcd_cooldown() {
1063 1063
    */
1064 1064
   static void _lcd_level_bed_continue() {
1065 1065
     defer_return_to_status = true;
1066
-    axis_known_position[X_AXIS] = axis_known_position[Y_AXIS] = axis_known_position[Z_AXIS] = false;
1066
+    axis_homed[X_AXIS] = axis_homed[Y_AXIS] = axis_homed[Z_AXIS] = false;
1067 1067
     mbl.reset();
1068 1068
     enqueue_and_echo_commands_P(PSTR("G28"));
1069 1069
     lcd_goto_menu(_lcd_level_bed_homing);
@@ -1110,8 +1110,9 @@ static void lcd_prepare_menu() {
1110 1110
   // Level Bed
1111 1111
   //
1112 1112
   #if ENABLED(AUTO_BED_LEVELING_FEATURE)
1113
-    if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS])
1114
-      MENU_ITEM(gcode, MSG_LEVEL_BED, PSTR("G29"));
1113
+    MENU_ITEM(gcode, MSG_LEVEL_BED,
1114
+      axis_homed[X_AXIS] && axis_homed[Y_AXIS] ? PSTR("G29") : PSTR("G28\nG29")
1115
+    );
1115 1116
   #elif ENABLED(MANUAL_BED_LEVELING)
1116 1117
     MENU_ITEM(submenu, MSG_LEVEL_BED, lcd_level_bed);
1117 1118
   #endif

Loading…
Cancel
Save