CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Work around a compiler bug

Browse Source 
See #15478
This commit is contained in:
Scott Lahteine 2019-10-08 19:27:03 -05:00
parent 5becda25c5
commit 1df6c7a46c
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/src/inc/Conditionals_post.h
View File

@ -220,11 +220,6 @@
#ifndef Z_SAFE_HOMING_Y_POINT #ifndef Z_SAFE_HOMING_Y_POINT
#define Z_SAFE_HOMING_Y_POINT _SAFE_POINT(Y) #define Z_SAFE_HOMING_Y_POINT _SAFE_POINT(Y)
#endif #endif
#define X_TILT_FULCRUM Z_SAFE_HOMING_X_POINT
#define Y_TILT_FULCRUM Z_SAFE_HOMING_Y_POINT
#else
#define X_TILT_FULCRUM X_HOME_POS
#define Y_TILT_FULCRUM Y_HOME_POS
#endif #endif
/** /**

9
Marlin/src/module/planner.cpp
View File

@ -1350,6 +1350,15 @@ void Planner::check_axes_activity() {
#endif #endif
#if HAS_LEVELING #if HAS_LEVELING
constexpr xy_pos_t level_fulcrum = {
#if ENABLED(Z_SAFE_HOMING)
Z_SAFE_HOMING_X_POINT, Z_SAFE_HOMING_Y_POINT
#else
X_HOME_POS, Y_HOME_POS
#endif
};
/** /**
* rx, ry, rz - Cartesian positions in mm * rx, ry, rz - Cartesian positions in mm
* Leveled XYZ on completion * Leveled XYZ on completion

1
Marlin/src/module/planner.h
View File

@ -268,7 +268,6 @@ class Planner {
static bool leveling_active; // Flag that bed leveling is enabled static bool leveling_active; // Flag that bed leveling is enabled
#if ABL_PLANAR #if ABL_PLANAR
static matrix_3x3 bed_level_matrix; // Transform to compensate for bed level static matrix_3x3 bed_level_matrix; // Transform to compensate for bed level
static constexpr xy_pos_t level_fulcrum = { X_TILT_FULCRUM, Y_TILT_FULCRUM };
#endif #endif
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT) #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
static float z_fade_height, inverse_z_fade_height; static float z_fade_height, inverse_z_fade_height;