From 83472ab7cd5b3d18a9b539dde4c03a715d7a73c6 Mon Sep 17 00:00:00 2001 From: narno2202 Date: Mon, 22 Jul 2024 22:51:04 +0200 Subject: [PATCH 1/4] Update Configuration.h and SanityCheck.h for Biqu Microprobe and FT_MOTION --- Marlin/Configuration.h | 3 ++- Marlin/src/inc/SanityCheck.h | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index fc0f73014c19..34e21a7ffedd 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1202,7 +1202,7 @@ // Enable this feature if all enabled endstop pins are interrupt-capable. // This will remove the need to poll the interrupt pins, saving many CPU cycles. -//#define ENDSTOP_INTERRUPTS_FEATURE +// #define ENDSTOP_INTERRUPTS_FEATURE /** * Endstop Noise Threshold @@ -1465,6 +1465,7 @@ * For information about this sensor https://github.com/bigtreetech/MicroProbe * * Also requires: PROBE_ENABLE_DISABLE + * If you use FT_MOTION, ENDSTOP_INTERRUPTS_FEATURE is required */ //#define BIQU_MICROPROBE_V1 // Triggers HIGH //#define BIQU_MICROPROBE_V2 // Triggers LOW diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index e733f87e4e80..523ffdd4f6a0 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -1389,6 +1389,12 @@ static_assert(NUM_SERVOS <= NUM_SERVO_PLUGS, "NUM_SERVOS (or some servo index) i #error "BIQU MicroProbe requires a PROBE_ENABLE_PIN." #endif + #if ENABLED(FT_MOTION) + #if DISABLED(ENDSTOP_INTERRUPTS_FEATURE) + #error "BIQU Microprobe requires ENDSTOP_INTERRUPTS_FEATURE with FT_MOTION." + #endif + #endif + #if ENABLED(BIQU_MICROPROBE_V1) #if ENABLED(INVERTED_PROBE_STATE) #if Z_MIN_PROBE_ENDSTOP_HIT_STATE != LOW From 0d55b77d2201f01352266d699529e49fdedfb220 Mon Sep 17 00:00:00 2001 From: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com> Date: Mon, 22 Jul 2024 14:12:14 -0700 Subject: [PATCH 2/4] Combine --- Marlin/src/inc/SanityCheck.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index 523ffdd4f6a0..59317002b032 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -1389,10 +1389,8 @@ static_assert(NUM_SERVOS <= NUM_SERVO_PLUGS, "NUM_SERVOS (or some servo index) i #error "BIQU MicroProbe requires a PROBE_ENABLE_PIN." #endif - #if ENABLED(FT_MOTION) - #if DISABLED(ENDSTOP_INTERRUPTS_FEATURE) - #error "BIQU Microprobe requires ENDSTOP_INTERRUPTS_FEATURE with FT_MOTION." - #endif + #if ENABLED(FT_MOTION) && DISABLED(ENDSTOP_INTERRUPTS_FEATURE) + #error "BIQU Microprobe requires ENDSTOP_INTERRUPTS_FEATURE with FT_MOTION." #endif #if ENABLED(BIQU_MICROPROBE_V1) From d4791a42a21c5df9d6d673628be7576cf3edd98a Mon Sep 17 00:00:00 2001 From: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com> Date: Mon, 22 Jul 2024 14:12:37 -0700 Subject: [PATCH 3/4] Remove space --- Marlin/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 34e21a7ffedd..bda3ae07a26a 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1202,7 +1202,7 @@ // Enable this feature if all enabled endstop pins are interrupt-capable. // This will remove the need to poll the interrupt pins, saving many CPU cycles. -// #define ENDSTOP_INTERRUPTS_FEATURE +//#define ENDSTOP_INTERRUPTS_FEATURE /** * Endstop Noise Threshold From ba00d1bddecd1a2f1a6ca2d248ebe74c76c2ccb0 Mon Sep 17 00:00:00 2001 From: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com> Date: Mon, 22 Jul 2024 14:17:22 -0700 Subject: [PATCH 4/4] Tweak requirement wording --- Marlin/Configuration.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index bda3ae07a26a..d84a13c76224 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1464,8 +1464,7 @@ * A lightweight, solenoid-driven probe. * For information about this sensor https://github.com/bigtreetech/MicroProbe * - * Also requires: PROBE_ENABLE_DISABLE - * If you use FT_MOTION, ENDSTOP_INTERRUPTS_FEATURE is required + * Also requires: PROBE_ENABLE_DISABLE, ENDSTOP_INTERRUPTS_FEATURE if FT_MOTION is enabled. */ //#define BIQU_MICROPROBE_V1 // Triggers HIGH //#define BIQU_MICROPROBE_V2 // Triggers LOW