bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Use GRID_MAX_POINTS. Some formatting

Browse Source
This commit is contained in:
Scott Lahteine
2017-05-12 06:48:15 -05:00
parent e51b5774db
commit a7fb55ea6d
5 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/planner.cpp
View File

@ -539,7 +539,7 @@ void Planner::check_axes_activity() {
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
// if z_fade_height enabled (nonzero) and raw_z above it, no leveling required
if ((planner.z_fade_height) && (planner.z_fade_height <= RAW_Z_POSITION(lz))) return;
lz += ubl.state.z_offset + ubl.get_z_correction(lx,ly) * ubl.fade_scaling_factor_for_z(lz);
lz += ubl.state.z_offset + ubl.get_z_correction(lx, ly) * ubl.fade_scaling_factor_for_z(lz);
#else // no fade
lz += ubl.state.z_offset + ubl.get_z_correction(lx,ly);
#endif // FADE
@ -617,7 +617,7 @@ void Planner::check_axes_activity() {
// so U==(L-O-M)/(1-M/H) for U<H
if (planner.z_fade_height) {
float z_unfaded = z_unlevel / (1.0 - z_ublmesh * planner.inverse_z_fade_height);
const float z_unfaded = z_unlevel / (1.0 - z_ublmesh * planner.inverse_z_fade_height);
if (z_unfaded < planner.z_fade_height) // don't know until after compute
z_unlevel = z_unfaded;
}