From 1968983f3555a1341796412e9ab2ea062eed2649 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 22 Aug 2016 15:02:19 -0500 Subject: [PATCH] Move PROBE_SELECTED to an earlier point --- Marlin/Conditionals_LCD.h | 4 +++- Marlin/Conditionals_post.h | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/Conditionals_LCD.h b/Marlin/Conditionals_LCD.h index 29c67bf757..5413cbd997 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 8e65b6dd47..ca477f9f18 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)