diff --git a/Marlin/Conditionals_LCD.h b/Marlin/Conditionals_LCD.h index 29c67bf757d8561b34d0186b50a94c47c67b74ab..5413cbd9972b0ef1ec057f6bf6b98336d3db6097 100644 --- a/Marlin/Conditionals_LCD.h +++ b/Marlin/Conditionals_LCD.h @@ -22,7 +22,7 @@ /** * Conditionals_LCD.h - * LCD Defines that depend on configuration but are not editable. + * Conditionals that need to be set before Configuration_adv.h or pins.h */ #ifndef CONDITIONALS_LCD_H // Get the LCD defines which are needed first @@ -316,4 +316,6 @@ #define TOOL_E_INDEX current_block->active_extruder #endif + #define PROBE_SELECTED (ENABLED(FIX_MOUNTED_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED)) + #endif //CONDITIONALS_LCD_H diff --git a/Marlin/Conditionals_post.h b/Marlin/Conditionals_post.h index 8e65b6dd476e974f1e559c2ad88dfd331b0c4921..ca477f9f18b3d49e10b4dadb4d9c581e07252a39 100644 --- a/Marlin/Conditionals_post.h +++ b/Marlin/Conditionals_post.h @@ -586,8 +586,6 @@ #endif #endif - #define PROBE_SELECTED (ENABLED(FIX_MOUNTED_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED)) - #define PROBE_PIN_CONFIGURED (HAS_Z_MIN_PROBE_PIN || (HAS_Z_MIN && ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN))) #define HAS_BED_PROBE (PROBE_SELECTED && PROBE_PIN_CONFIGURED)