Allow override of Z_ENDSTOP_SERVO_NR with BLTOUCH

This commit is contained in:
Scott Lahteine 2016-09-18 17:25:33 -05:00
parent 7d9ebda478
commit c4dcfa254e
24 changed files with 29 additions and 3 deletions

View file

@ -118,9 +118,13 @@
* The BLTouch Probe emulates a servo probe * The BLTouch Probe emulates a servo probe
*/ */
#if ENABLED(BLTOUCH) #if ENABLED(BLTOUCH)
#undef Z_ENDSTOP_SERVO_NR #ifndef Z_ENDSTOP_SERVO_NR
#undef Z_SERVO_ANGLES
#define Z_ENDSTOP_SERVO_NR 0 #define Z_ENDSTOP_SERVO_NR 0
#endif
#ifndef NUM_SERVOS
#define NUM_SERVOS (Z_ENDSTOP_SERVO_NR + 1)
#endif
#undef Z_SERVO_ANGLES
#define Z_SERVO_ANGLES {10,90} // For BLTouch 10=deploy, 90=retract #define Z_SERVO_ANGLES {10,90} // For BLTouch 10=deploy, 90=retract
#undef DEACTIVATE_SERVOS_AFTER_MOVE #undef DEACTIVATE_SERVOS_AFTER_MOVE
#if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)

View file

@ -528,6 +528,7 @@
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe. // The BLTouch probe emulates a servo probe.
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
//#define BLTOUCH //#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.

View file

@ -400,7 +400,7 @@
#if (ENABLED(FIX_MOUNTED_PROBE) && (ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED))) \ #if (ENABLED(FIX_MOUNTED_PROBE) && (ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED))) \
|| (ENABLED(Z_PROBE_ALLEN_KEY) && (HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED))) \ || (ENABLED(Z_PROBE_ALLEN_KEY) && (HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED))) \
|| (HAS_Z_SERVO_ENDSTOP && ENABLED(Z_PROBE_SLED)) || (HAS_Z_SERVO_ENDSTOP && ENABLED(Z_PROBE_SLED))
#error "Please define only one type of probe: Z Servo, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or FIX_MOUNTED_PROBE." #error "Please define only one type of probe: Z Servo/BLTOUCH, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or FIX_MOUNTED_PROBE."
#endif #endif
/** /**

View file

@ -511,6 +511,7 @@
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe. // The BLTouch probe emulates a servo probe.
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
//#define BLTOUCH //#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.

View file

@ -494,6 +494,7 @@
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe. // The BLTouch probe emulates a servo probe.
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
//#define BLTOUCH //#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.

View file

@ -492,6 +492,7 @@
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe. // The BLTouch probe emulates a servo probe.
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
//#define BLTOUCH //#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.

View file

@ -503,6 +503,7 @@
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe. // The BLTouch probe emulates a servo probe.
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
//#define BLTOUCH //#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.

View file

@ -505,6 +505,7 @@
#define FIX_MOUNTED_PROBE #define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe. // The BLTouch probe emulates a servo probe.
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
//#define BLTOUCH //#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.

View file

@ -528,6 +528,7 @@
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe. // The BLTouch probe emulates a servo probe.
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
//#define BLTOUCH //#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.

View file

@ -511,6 +511,7 @@
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe. // The BLTouch probe emulates a servo probe.
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
//#define BLTOUCH //#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.

View file

@ -511,6 +511,7 @@
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe. // The BLTouch probe emulates a servo probe.
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
//#define BLTOUCH //#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.

View file

@ -511,6 +511,7 @@
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe. // The BLTouch probe emulates a servo probe.
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
//#define BLTOUCH //#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.

View file

@ -509,6 +509,7 @@
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe. // The BLTouch probe emulates a servo probe.
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
//#define BLTOUCH //#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.

View file

@ -521,6 +521,7 @@
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe. // The BLTouch probe emulates a servo probe.
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
//#define BLTOUCH //#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.

View file

@ -532,6 +532,7 @@
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe. // The BLTouch probe emulates a servo probe.
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
//#define BLTOUCH //#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.

View file

@ -503,6 +503,7 @@
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe. // The BLTouch probe emulates a servo probe.
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
//#define BLTOUCH //#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.

View file

@ -511,6 +511,7 @@
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe. // The BLTouch probe emulates a servo probe.
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
//#define BLTOUCH //#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.

View file

@ -554,6 +554,7 @@
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe. // The BLTouch probe emulates a servo probe.
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
//#define BLTOUCH //#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.

View file

@ -554,6 +554,7 @@
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe. // The BLTouch probe emulates a servo probe.
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
//#define BLTOUCH //#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.

View file

@ -554,6 +554,7 @@
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe. // The BLTouch probe emulates a servo probe.
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
//#define BLTOUCH //#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.

View file

@ -550,6 +550,7 @@
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe. // The BLTouch probe emulates a servo probe.
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
//#define BLTOUCH //#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.

View file

@ -560,6 +560,7 @@
#define FIX_MOUNTED_PROBE #define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe. // The BLTouch probe emulates a servo probe.
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
//#define BLTOUCH //#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.

View file

@ -514,6 +514,7 @@
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe. // The BLTouch probe emulates a servo probe.
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
//#define BLTOUCH //#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.

View file

@ -507,6 +507,7 @@
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe. // The BLTouch probe emulates a servo probe.
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
//#define BLTOUCH //#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.