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

6
Marlin/ubl_G29.cpp Normal file → Executable file
View File

@@ -30,7 +30,6 @@
#include "Marlin.h"
#include "hex_print_routines.h"
#include "configuration_store.h"
#include "planner.h"
#include "ultralcd.h"
#include <math.h>
@@ -1068,8 +1067,7 @@
SERIAL_PROTOCOLLNPGM("?Bed Level Correction Fade Height Not Plausible.\n");
return UBL_ERR;
}
ubl.state.g29_correction_fade_height = fh;
ubl.state.g29_fade_height_multiplier = 1.0 / fh;
set_z_fade_height(fh);
}
#endif
@@ -1166,7 +1164,7 @@
safe_delay(50);
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
SERIAL_PROTOCOLLNPAIR("g29_correction_fade_height : ", ubl.state.g29_correction_fade_height);
SERIAL_PROTOCOLLNPAIR("planner.z_fade_height : ", planner.z_fade_height);
#endif
SERIAL_PROTOCOLPGM("z_offset: ");