use planner.z_fade_height, etc. instead of private, ubl-specific g29 fade height

This commit is contained in:
Brian authored and Roxy-3D committed 2017-04-21 09:09:09 -05:00
1 parent e66d9f1313
commit 88649b06a6
4 files changed
+12 -33

No files matched your search

Regular → Executable
+4 -10
View File
@@ -212,13 +212,7 @@ void MarlinSettings::postprocess() {
#endif
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
set_z_fade_height(
//#if ENABLED(AUTO_BED_LEVELING_UBL)
// ubl.state.g29_correction_fade_height
//#else
planner.z_fade_height
//#endif
);
set_z_fade_height(planner.z_fade_height);
#endif
#if HAS_BED_PROBE
@@ -1412,9 +1406,9 @@ void MarlinSettings::reset() {
}
CONFIG_ECHO_START;
SERIAL_ECHOPAIR(" M420 S", ubl.state.active ? 1 : 0);
//#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
// SERIAL_ECHOPAIR(" Z", ubl.state.g29_correction_fade_height);
//#endif
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
SERIAL_ECHOPAIR(" Z", planner.z_fade_height);
#endif
SERIAL_EOL;
if (!forReplay) {