MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compilation with UBL and Arc/Bézier

Browse Source 
Fix #10660
This commit is contained in:
Scott Lahteine 2018-05-09 00:41:51 -05:00
parent 78410b210b
commit b9e4ce3715
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/planner.h
View File

@ -401,33 +401,25 @@ class Planner {
#endif // SKEW_CORRECTION #endif // SKEW_CORRECTION
#if PLANNER_LEVELING || HAS_UBL_AND_CURVES #if PLANNER_LEVELING || HAS_UBL_AND_CURVES
/** /**
* Apply leveling to transform a cartesian position * Apply leveling to transform a cartesian position
* as it will be given to the planner and steppers. * as it will be given to the planner and steppers.
*/ */
static void apply_leveling(float &rx, float &ry, float &rz); static void apply_leveling(float &rx, float &ry, float &rz);
FORCE_INLINE static void apply_leveling(float (&raw)[XYZ]) { apply_leveling(raw[X_AXIS], raw[Y_AXIS], raw[Z_AXIS]); } FORCE_INLINE static void apply_leveling(float (&raw)[XYZ]) { apply_leveling(raw[X_AXIS], raw[Y_AXIS], raw[Z_AXIS]); }
#endif
#if PLANNER_LEVELING #if PLANNER_LEVELING
#define ARG_X float rx #define ARG_X float rx
#define ARG_Y float ry #define ARG_Y float ry
#define ARG_Z float rz #define ARG_Z float rz
static void unapply_leveling(float raw[XYZ]); static void unapply_leveling(float raw[XYZ]);
#endif
#else #else
#define ARG_X const float &rx #define ARG_X const float &rx
#define ARG_Y const float &ry #define ARG_Y const float &ry
#define ARG_Z const float &rz #define ARG_Z const float &rz
#endif #endif
/** /**
* Planner::get_next_free_block * Planner::get_next_free_block
* *