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

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

Browse Source
This commit is contained in:
Brian
2017-04-20 18:45:58 -04:00
committed by Roxy-3D
parent e66d9f1313
commit 88649b06a6
4 changed files with 12 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/configuration_store.cpp Normal file → Executable file
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) {