diff --git a/Marlin/src/core/serial.cpp b/Marlin/src/core/serial.cpp index f7b9dbf61..2c0dabb52 100644 --- a/Marlin/src/core/serial.cpp +++ b/Marlin/src/core/serial.cpp @@ -75,10 +75,4 @@ void serial_spaces(uint8_t count) { count *= (PROPORTIONAL_FONT_RATIO); while (c print_xyz(prefix, suffix, xyz[X_AXIS], xyz[Y_AXIS], xyz[Z_AXIS]); } - #if HAS_ABL - void print_xyz(const char* prefix, const char* suffix, const vector_3 &xyz) { - print_xyz(prefix, suffix, xyz.x, xyz.y, xyz.z); - } - #endif - #endif diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h index 335976d26..1b29cfc06 100644 --- a/Marlin/src/core/serial.h +++ b/Marlin/src/core/serial.h @@ -25,10 +25,6 @@ #include "../inc/MarlinConfig.h" -#if HAS_ABL && ENABLED(DEBUG_LEVELING_FEATURE) - #include "../libs/vector_3.h" -#endif - /** * Define debug bit-masks */ @@ -243,9 +239,6 @@ void serialprintPGM(const char* str); #if ENABLED(DEBUG_LEVELING_FEATURE) void print_xyz(const char* prefix, const char* suffix, const float x, const float y, const float z); void print_xyz(const char* prefix, const char* suffix, const float xyz[]); - #if HAS_ABL - void print_xyz(const char* prefix, const char* suffix, const vector_3 &xyz); - #endif #define DEBUG_POS(SUFFIX,VAR) do { print_xyz(PSTR(" " STRINGIFY(VAR) "="), PSTR(" : " SUFFIX "\n"), VAR); } while(0) #endif diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp index 03b1d582c..1537239ad 100644 --- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp +++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp @@ -41,7 +41,7 @@ #include "../../../feature/bedlevel/bedlevel.h" #include "../../../libs/least_squares_fit.h" -#include "../../../feature/Max7219_Debug_LEDs.h" + #include "../../../feature/Max7219_Debug_LEDs.h" #include @@ -1496,6 +1496,8 @@ #if HAS_BED_PROBE + #include "../../../libs/vector_3.h" + void unified_bed_leveling::tilt_mesh_based_on_probed_grid(const bool do_3_pt_leveling) { constexpr int16_t x_min = max(MIN_PROBE_X, MESH_MIN_X), x_max = min(MAX_PROBE_X, MESH_MAX_X), diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp index c37c5e790..49b1fa7cb 100644 --- a/Marlin/src/gcode/bedlevel/abl/G29.cpp +++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp @@ -44,6 +44,10 @@ #include "../../../libs/least_squares_fit.h" #endif +#if ABL_PLANAR + #include "../../../libs/vector_3.h" +#endif + #if ABL_GRID #if ENABLED(PROBE_Y_FIRST) #define PR_OUTER_VAR xCount diff --git a/Marlin/src/libs/vector_3.cpp b/Marlin/src/libs/vector_3.cpp index 8506cb977..c0dfbc93f 100644 --- a/Marlin/src/libs/vector_3.cpp +++ b/Marlin/src/libs/vector_3.cpp @@ -41,7 +41,7 @@ #include "../inc/MarlinConfig.h" -#if HAS_ABL +#if ABL_PLANAR || ENABLED(AUTO_BED_LEVELING_UBL) #include "vector_3.h" diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h index 0b594fff6..031cee745 100644 --- a/Marlin/src/module/planner.h +++ b/Marlin/src/module/planner.h @@ -40,7 +40,7 @@ #include "delta.h" #endif -#if HAS_ABL +#if ABL_PLANAR #include "../libs/vector_3.h" #endif