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

Update position for UBL non-segmented activate/deactivate

Browse Source
This commit is contained in:
Scott Lahteine
2018-04-17 16:02:02 -05:00
parent d462be6de6
commit e05c825a05
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Marlin/src/feature/bedlevel/bedlevel.cpp
View File

@@ -99,7 +99,21 @@ void set_bed_leveling_enabled(const bool enable/*=true*/) {
planner.unapply_leveling(current_position); planner.unapply_leveling(current_position);
} }
#else #else
planner.leveling_active = enable; // just flip the bit, current_position will be wrong until next move. // UBL equivalents for apply/unapply_leveling
#if ENABLED(SKEW_CORRECTION)
float pos[XYZ] = { current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS] };
planner.skew(pos[X_AXIS], pos[Y_AXIS], pos[Z_AXIS]);
#else
const float (&pos)[XYZE] = current_position;
#endif
if (planner.leveling_active) {
current_position[Z_AXIS] += ubl.get_z_correction(pos[X_AXIS], pos[Y_AXIS], pos[Z_AXIS]);
planner.leveling_active = false;
}
else {
planner.leveling_active = true;
current_position[Z_AXIS] -= ubl.get_z_correction(pos[X_AXIS], pos[Y_AXIS], pos[Z_AXIS]);
}
#endif #endif
#else // OLDSCHOOL_ABL #else // OLDSCHOOL_ABL