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

Tweaks to Z fade behavior

Browse Source
This commit is contained in:
Scott Lahteine
2019-09-26 01:15:35 -05:00
parent 1f48eaf03a
commit ee7558a622
4 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/module/configuration_store.cpp
View File

@ -2061,7 +2061,7 @@ void MarlinSettings::postprocess() {
}
else {
ubl.reset();
DEBUG_ECHOLNPGM("UBL System reset()");
DEBUG_ECHOLNPGM("UBL reset");
}
}
#endif

14
Marlin/src/module/planner.h
View File

@ -411,15 +411,13 @@ class Planner {
*/
static inline float fade_scaling_factor_for_z(const float &rz) {
static float z_fade_factor = 1;
if (z_fade_height) {
if (rz >= z_fade_height) return 0;
if (last_fade_z != rz) {
last_fade_z = rz;
z_fade_factor = 1 - rz * inverse_z_fade_height;
}
return z_fade_factor;
if (!z_fade_height) return 1;
if (rz >= z_fade_height) return 0;
if (last_fade_z != rz) {
last_fade_z = rz;
z_fade_factor = 1 - rz * inverse_z_fade_height;
}
return 1;
return z_fade_factor;
}
FORCE_INLINE static void force_fade_recalc() { last_fade_z = -999.999f; }