diff --git a/Marlin/src/inc/Conditionals-3-etc.h b/Marlin/src/inc/Conditionals-3-etc.h index f5568b669a..2b6500910b 100644 --- a/Marlin/src/inc/Conditionals-3-etc.h +++ b/Marlin/src/inc/Conditionals-3-etc.h @@ -420,8 +420,6 @@ #undef Z_PROBE_LOW_POINT #undef MULTIPLE_PROBING #undef EXTRA_PROBING - #undef PROBE_OFFSET_ZMIN - #undef PROBE_OFFSET_ZMAX #undef PAUSE_BEFORE_DEPLOY_STOW #undef PAUSE_PROBE_DEPLOY_WHEN_TRIGGERED #undef PROBING_HEATERS_OFF @@ -437,6 +435,11 @@ #undef NOZZLE_TO_PROBE_OFFSET #endif +#if NONE(BABYSTEPPING, HAS_BED_PROBE, HAS_WORKSPACE_OFFSET) + #undef PROBE_OFFSET_ZMIN + #undef PROBE_OFFSET_ZMAX +#endif + #if ENABLED(BELTPRINTER) && !defined(HOME_Y_BEFORE_X) #define HOME_Y_BEFORE_X #endif diff --git a/Marlin/src/lcd/dwin/proui/dwin.cpp b/Marlin/src/lcd/dwin/proui/dwin.cpp index ae94ee0025..34927e1df4 100644 --- a/Marlin/src/lcd/dwin/proui/dwin.cpp +++ b/Marlin/src/lcd/dwin/proui/dwin.cpp @@ -2168,6 +2168,13 @@ void autoHome() { queue.inject_P(G28_STR); } #if HAS_ZOFFSET_ITEM + #ifndef PROBE_OFFSET_ZMIN + #define PROBE_OFFSET_ZMIN -20 + #endif + #ifndef PROBE_OFFSET_ZMAX + #define PROBE_OFFSET_ZMAX 20 + #endif + void applyZOffset() { TERN_(EEPROM_SETTINGS, settings.save()); } void liveZOffset() { #if ANY(BABYSTEP_ZPROBE_OFFSET, JUST_BABYSTEP)