Browse Source

Merge pull request #5488 from thinkyhead/rc_fade_compiler_warn

Patch fade_factor compiler warning
pull/1/head
Scott Lahteine 8 years ago
committed by GitHub
parent
commit
b9ee0d7bd3
  1. 8
      Marlin/planner.cpp

8
Marlin/planner.cpp

@ -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
}

Loading…
Cancel
Save