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

Fix G28 leveling state, UBL compile (#20499)

Browse Source
This commit is contained in:
Tanguy Pruvot
2020-12-22 14:01:24 +01:00
committed by GitHub
parent cfad5cb435
commit c559fc8227
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/src/gcode/calibrate/G28.cpp
View File

@ -241,8 +241,8 @@ void GcodeSuite::G28() {
// Disable the leveling matrix before homing
#if HAS_LEVELING
const bool leveling_restore_state = ENABLED(ENABLE_LEVELING_AFTER_G28) || TERN0(RESTORE_LEVELING_AFTER_G28, planner.leveling_active);
TERN_(PROBE_MANUALLY, g29_in_progress = false); // Cancel the active G29 session
IF_ENABLED(RESTORE_LEVELING_AFTER_G28, const bool leveling_restore_state = planner.leveling_active);
IF_ENABLED(PROBE_MANUALLY, g29_in_progress = false); // Cancel the active G29 session
set_bed_leveling_enabled(false);
#endif
@ -435,7 +435,8 @@ void GcodeSuite::G28() {
do_blocking_move_to_z(delta_clip_start_height);
#endif
TERN_(RESTORE_LEVELING_AFTER_G28, set_bed_leveling_enabled(leveling_restore_state));
IF_ENABLED(RESTORE_LEVELING_AFTER_G28, set_bed_leveling_enabled(leveling_restore_state));
IF_ENABLED(ENABLE_LEVELING_AFTER_G28, set_bed_leveling_enabled(true));
restore_feedrate_and_scaling();