🎨 Adjust some conditionals

2021-06-10 02:05:04 -05:00
parent 967942460e
commit c9a3ba99be
9 changed files with 25 additions and 18 deletions
--- a/Marlin/src/lcd/menu/menu_probe_offset.cpp
+++ b/Marlin/src/lcd/menu/menu_probe_offset.cpp
@ -42,7 +42,7 @@
 // Global storage
 float z_offset_backup, calculated_z_offset, z_offset_ref;

-#if ENABLED(HAS_LEVELING)
+#if HAS_LEVELING
  bool leveling_was_active;
 #endif

--- a/Marlin/src/lcd/menu/menu_tramming.cpp
+++ b/Marlin/src/lcd/menu/menu_tramming.cpp
@ -92,7 +92,7 @@ void goto_tramming_wizard() {

  // Inject G28, wait for homing to complete,
  set_all_unhomed();
-  queue.inject_P(TERN(G28_L0_ENSURES_LEVELING_OFF, PSTR("G28L0"), G28_STR));
+  queue.inject_P(TERN(CAN_SET_LEVELING_AFTER_G28, PSTR("G28L0"), G28_STR));

  ui.goto_screen([]{
    _lcd_draw_homing();