3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Followup to #9663

Browse source 
`ENABLED` only works for flag type options. Floats must use `#ifdef`.
This commit is contained in:
Scott Lahteine 2018-02-15 22:18:19 -06:00
parent b56c6b9e13
commit 2ec90d2162
3 changed files with 25 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Marlin/ubl_motion.cpp
View file

@ -79,13 +79,14 @@
if (!WITHIN(cell_dest_xi, 0, GRID_MAX_POINTS_X - 1) || !WITHIN(cell_dest_yi, 0, GRID_MAX_POINTS_Y - 1)) {
// Note: There is no Z Correction in this case. We are off the grid and don't know what
// a reasonable correction would be. If the user has specified a UBL_Z_RAISE_WHEN_OFF_MESH
// a reasonable correction would be. If the user has specified a UBL_Z_RAISE_WHEN_OFF_MESH
// value, that will be used instead of a calculated (Bi-Linear interpolation) correction.
float z_raise = 0.0;
#if ENABLED(UBL_Z_RAISE_WHEN_OFF_MESH)
z_raise = UBL_Z_RAISE_WHEN_OFF_MESH;
#endif
const float z_raise = 0.0
#ifdef UBL_Z_RAISE_WHEN_OFF_MESH
+ UBL_Z_RAISE_WHEN_OFF_MESH
#endif
;
planner.buffer_segment(end[X_AXIS], end[Y_AXIS], end[Z_AXIS] + z_raise, end[E_AXIS], feed_rate, extruder);
set_current_from_destination();