From e82b4e98a492343394ece560f14841b771ea7178 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 6 Dec 2024 17:13:48 -0600 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20More=20informative=20probe=20con?= =?UTF-8?q?flict=20message=20(2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/inc/SanityCheck.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index 6e9e6358ab..9c21c4fd29 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -1226,10 +1226,10 @@ static_assert(NUM_SERVOS <= NUM_SERVO_PLUGS, "NUM_SERVOS (or some servo index) i + (DISABLED(BLTOUCH) && HAS_Z_SERVO_PROBE) \ + COUNT_ENABLED(PROBE_MANUALLY, BLTOUCH, BD_SENSOR, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, RACK_AND_PINION_PROBE, SENSORLESS_PROBING, MAGLEV4, MAG_MOUNTED_PROBE, BIQU_MICROPROBE_V1, BIQU_MICROPROBE_V2) #error "Please enable only one probe option. See the following errors:" - #if DISABLED(BLTOUCH) && HAS_Z_SERVO_PROBE - #error "(Z_SERVO_PROBE is enabled.)" - #elif ENABLED(BLTOUCH) && !HAS_Z_SERVO_PROBE + #if ENABLED(BLTOUCH) #error "(BLTOUCH is enabled.)" + #elif HAS_Z_SERVO_PROBE + #error "(Z_SERVO_PROBE is enabled.)" #endif #if ENABLED(PROBE_MANUALLY) #error "(PROBE_MANUALLY is enabled.)"