Browse Source

Show Cancel/Continue screen for ABL "Level Bed"

Scott Lahteine 7 years ago
parent
commit
a81606c680
1 changed files with 14 additions and 14 deletions
  1. 14
    14
      Marlin/ultralcd.cpp

+ 14
- 14
Marlin/ultralcd.cpp View File

1609
       lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING;
1609
       lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING;
1610
     }
1610
     }
1611
 
1611
 
1612
+  #endif // LCD_BED_LEVELING
1613
+
1614
+  #if ENABLED(LCD_BED_LEVELING) || HAS_ABL
1615
+
1612
     /**
1616
     /**
1613
      * Step 2: Continue Bed Leveling...
1617
      * Step 2: Continue Bed Leveling...
1614
      */
1618
      */
1615
     void _lcd_level_bed_continue() {
1619
     void _lcd_level_bed_continue() {
1616
-      #if PLANNER_LEVELING && DISABLED(AUTO_BED_LEVELING_UBL)
1617
-        reset_bed_level();
1620
+      #if ENABLED(LCD_BED_LEVELING)
1621
+        defer_return_to_status = true;
1622
+        axis_homed[X_AXIS] = axis_homed[Y_AXIS] = axis_homed[Z_AXIS] = false;
1623
+        lcd_goto_screen(_lcd_level_bed_homing);
1624
+        enqueue_and_echo_commands_P(PSTR("G28"));
1625
+      #else
1626
+        lcd_return_to_status();
1627
+        enqueue_and_echo_commands_P(axis_homed[X_AXIS] && axis_homed[Y_AXIS] ? PSTR("G29") : PSTR("G28\nG29"));
1618
       #endif
1628
       #endif
1619
-      defer_return_to_status = true;
1620
-      axis_homed[X_AXIS] = axis_homed[Y_AXIS] = axis_homed[Z_AXIS] = false;
1621
-      lcd_goto_screen(_lcd_level_bed_homing);
1622
-      enqueue_and_echo_commands_P(PSTR("G28"));
1623
     }
1629
     }
1624
 
1630
 
1625
     /**
1631
     /**
1632
       END_MENU();
1638
       END_MENU();
1633
     }
1639
     }
1634
 
1640
 
1635
-  #endif // LCD_BED_LEVELING
1641
+  #endif // LCD_BED_LEVELING || HAS_ABL
1636
 
1642
 
1637
   /**
1643
   /**
1638
    *
1644
    *
1669
     //
1675
     //
1670
     // Level Bed
1676
     // Level Bed
1671
     //
1677
     //
1672
-    #if ENABLED(LCD_BED_LEVELING)
1678
+    #if ENABLED(LCD_BED_LEVELING) || HAS_ABL
1673
 
1679
 
1674
       #if ENABLED(PROBE_MANUALLY)
1680
       #if ENABLED(PROBE_MANUALLY)
1675
         if (!g29_in_progress)
1681
         if (!g29_in_progress)
1676
       #endif
1682
       #endif
1677
           MENU_ITEM(submenu, MSG_LEVEL_BED, lcd_level_bed);
1683
           MENU_ITEM(submenu, MSG_LEVEL_BED, lcd_level_bed);
1678
 
1684
 
1679
-    #elif HAS_ABL
1680
-
1681
-      MENU_ITEM(gcode, MSG_LEVEL_BED,
1682
-        axis_homed[X_AXIS] && axis_homed[Y_AXIS] ? PSTR("G29") : PSTR("G28\nG29")
1683
-      );
1684
-
1685
     #endif
1685
     #endif
1686
 
1686
 
1687
     #if HAS_M206_COMMAND
1687
     #if HAS_M206_COMMAND

Loading…
Cancel
Save