3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-27 22:08:02 +00:00
Code Issues Releases Wiki Activity

Merge pull request #5488 from thinkyhead/rc_fade_compiler_warn

Browse Source 
Patch fade_factor compiler warning
This commit is contained in:
Scott Lahteine 2016-12-13 03:00:47 -08:00 committed by GitHub
commit b9ee0d7bd3
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
z_fade_factor = 1.0;
#else
constexpr float z_fade_factor = 1.0;
#endif
#if ENABLED(MESH_BED_LEVELING)
@ -584,7 +582,11 @@ void Planner::check_axes_activity() {
#elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
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
}