From 204199e1ce30ecb17fb922cbf27a7cb0c2b51680 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 10 Dec 2017 22:57:24 -0600 Subject: [PATCH] Only compare XYZ to check motion --- Marlin/src/feature/bedlevel/bedlevel.cpp | 5 +---- Marlin/src/gcode/bedlevel/M420.cpp | 5 +---- Marlin/src/module/configuration_store.cpp | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Marlin/src/feature/bedlevel/bedlevel.cpp b/Marlin/src/feature/bedlevel/bedlevel.cpp index f6b5160184..c6c96081e3 100644 --- a/Marlin/src/feature/bedlevel/bedlevel.cpp +++ b/Marlin/src/feature/bedlevel/bedlevel.cpp @@ -149,10 +149,7 @@ void set_bed_leveling_enabled(const bool enable/*=true*/) { planner.set_z_fade_height(zfh); if (level_active) { - const float oldpos[XYZE] = { - current_position[X_AXIS], current_position[Y_AXIS], - current_position[Z_AXIS], current_position[E_AXIS] - }; + const float oldpos[] = { current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS] }; #if ENABLED(AUTO_BED_LEVELING_UBL) set_bed_leveling_enabled(true); // turn back on after changing fade height #else diff --git a/Marlin/src/gcode/bedlevel/M420.cpp b/Marlin/src/gcode/bedlevel/M420.cpp index 2625d047f9..740b632544 100644 --- a/Marlin/src/gcode/bedlevel/M420.cpp +++ b/Marlin/src/gcode/bedlevel/M420.cpp @@ -45,10 +45,7 @@ */ void GcodeSuite::M420() { - const float oldpos[XYZE] = { - current_position[X_AXIS], current_position[Y_AXIS], - current_position[Z_AXIS], current_position[E_AXIS] - }; + const float oldpos[] = { current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS] }; #if ENABLED(AUTO_BED_LEVELING_UBL) diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp index 1ee19e46a3..d076cf02c0 100644 --- a/Marlin/src/module/configuration_store.cpp +++ b/Marlin/src/module/configuration_store.cpp @@ -220,10 +220,7 @@ MarlinSettings settings; * Post-process after Retrieve or Reset */ void MarlinSettings::postprocess() { - const float oldpos[XYZE] = { - current_position[X_AXIS], current_position[Y_AXIS], - current_position[Z_AXIS], current_position[E_AXIS] - }; + const float oldpos[] = { current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS] }; // steps per s2 needs to be updated to agree with units per s2 planner.reset_acceleration_rates();