Jason Smith
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
9 additions and
2 deletions
-
Marlin/Configuration.h
-
Marlin/src/inc/Conditionals_post.h
-
Marlin/src/module/settings.cpp
|
@ -1291,6 +1291,9 @@ |
|
|
// at which point movement will be level to the machine's XY plane.
|
|
|
// at which point movement will be level to the machine's XY plane.
|
|
|
// The height can be set with M420 Z<height>
|
|
|
// The height can be set with M420 Z<height>
|
|
|
#define ENABLE_LEVELING_FADE_HEIGHT |
|
|
#define ENABLE_LEVELING_FADE_HEIGHT |
|
|
|
|
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT) |
|
|
|
|
|
#define DEFAULT_LEVELING_FADE_HEIGHT 10.0 // (mm) Default fade height.
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
// For Cartesian machines, instead of dividing moves on mesh boundaries,
|
|
|
// For Cartesian machines, instead of dividing moves on mesh boundaries,
|
|
|
// split up moves into short segments like a Delta. This follows the
|
|
|
// split up moves into short segments like a Delta. This follows the
|
|
|
|
@ -2448,6 +2448,10 @@ |
|
|
#endif |
|
|
#endif |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
#ifndef DEFAULT_LEVELING_FADE_HEIGHT |
|
|
|
|
|
#define DEFAULT_LEVELING_FADE_HEIGHT 0.0 |
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
#if ENABLED(SEGMENT_LEVELED_MOVES) && !defined(LEVELED_SEGMENT_LENGTH) |
|
|
#if ENABLED(SEGMENT_LEVELED_MOVES) && !defined(LEVELED_SEGMENT_LENGTH) |
|
|
#define LEVELED_SEGMENT_LENGTH 5 |
|
|
#define LEVELED_SEGMENT_LENGTH 5 |
|
|
#endif |
|
|
#endif |
|
|
|
@ -696,7 +696,7 @@ void MarlinSettings::postprocess() { |
|
|
// Global Leveling
|
|
|
// Global Leveling
|
|
|
//
|
|
|
//
|
|
|
{ |
|
|
{ |
|
|
const float zfh = TERN(ENABLE_LEVELING_FADE_HEIGHT, planner.z_fade_height, 10.0f); |
|
|
const float zfh = TERN(ENABLE_LEVELING_FADE_HEIGHT, planner.z_fade_height, (DEFAULT_LEVELING_FADE_HEIGHT)); |
|
|
EEPROM_WRITE(zfh); |
|
|
EEPROM_WRITE(zfh); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -2588,7 +2588,7 @@ void MarlinSettings::reset() { |
|
|
//
|
|
|
//
|
|
|
// Global Leveling
|
|
|
// Global Leveling
|
|
|
//
|
|
|
//
|
|
|
TERN_(ENABLE_LEVELING_FADE_HEIGHT, new_z_fade_height = 0.0); |
|
|
TERN_(ENABLE_LEVELING_FADE_HEIGHT, new_z_fade_height = (DEFAULT_LEVELING_FADE_HEIGHT)); |
|
|
TERN_(HAS_LEVELING, reset_bed_level()); |
|
|
TERN_(HAS_LEVELING, reset_bed_level()); |
|
|
|
|
|
|
|
|
#if HAS_BED_PROBE |
|
|
#if HAS_BED_PROBE |
|
|