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

Patch fade_factor compiler warning

Browse Source
This commit is contained in:
Scott Lahteine 2016-12-13 02:28:16 -08:00
parent 7c71bb2900
commit 7b625e0048
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/planner.cpp
View File

@ -556,8 +556,6 @@ void Planner::check_axes_activity() {
} }
else else
z_fade_factor = 1.0; z_fade_factor = 1.0;
#else
constexpr float z_fade_factor = 1.0;
#endif #endif
#if ENABLED(MESH_BED_LEVELING) #if ENABLED(MESH_BED_LEVELING)
@ -584,7 +582,11 @@ void Planner::check_axes_activity() {
#elif ENABLED(AUTO_BED_LEVELING_BILINEAR) #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
float tmp[XYZ] = { lx, ly, 0 }; float tmp[XYZ] = { lx, ly, 0 };
lz += bilinear_z_offset(tmp) * z_fade_factor; lz += bilinear_z_offset(tmp)
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
* z_fade_factor
#endif
;
#endif #endif
} }