Update some ABL/UBL conditionals

2019-02-24 20:29:03 -06:00
parent 833c2e54a1
commit 808b076000
8 changed files with 26 additions and 22 deletions
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@ -2556,7 +2556,7 @@ void MarlinSettings::reset() {
          SERIAL_ECHOLNPGM(":");
        }

-      #elif HAS_ABL
+      #elif HAS_ABL_OR_UBL

        CONFIG_ECHO_HEADING("Auto Bed Leveling:");

--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@ -155,7 +155,7 @@ float cartes[XYZ];
  float workspace_offset[XYZ] = { 0 };
 #endif

-#if OLDSCHOOL_ABL
+#if HAS_ABL_NOT_UBL
  float xy_probe_feedrate_mm_s = MMM_TO_MMS(XY_PROBE_SPEED);
 #endif

--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@ -58,7 +58,7 @@ extern float cartes[XYZ];
  extern float delta[ABC];
 #endif

-#if OLDSCHOOL_ABL
+#if HAS_ABL_NOT_UBL
  extern float xy_probe_feedrate_mm_s;
  #define XY_PROBE_FEEDRATE_MM_S xy_probe_feedrate_mm_s
 #elif defined(XY_PROBE_SPEED)