MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Allow override of Z_ENDSTOP_SERVO_NR with BLTOUCH

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/Conditionals_post.h
View File

@ -118,9 +118,13 @@
* The BLTouch Probe emulates a servo probe
*/
#if ENABLED(BLTOUCH)
#undef Z_ENDSTOP_SERVO_NR
#ifndef Z_ENDSTOP_SERVO_NR
#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_ENDSTOP_SERVO_NR 0
#define Z_SERVO_ANGLES {10,90} // For BLTouch 10=deploy, 90=retract
#undef DEACTIVATE_SERVOS_AFTER_MOVE
#if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)

1
Marlin/Configuration.h
View File

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

2
Marlin/SanityCheck.h
View File

@ -400,7 +400,7 @@
#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))) \
|| (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
/**

1
Marlin/example_configurations/Cartesio/Configuration.h
View File

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

1
Marlin/example_configurations/Felix/Configuration.h
View File

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

1
Marlin/example_configurations/Felix/DUAL/Configuration.h
View File

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

1
Marlin/example_configurations/Hephestos/Configuration.h
View File

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

1
Marlin/example_configurations/Hephestos_2/Configuration.h
View File

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

1
Marlin/example_configurations/K8200/Configuration.h
View File

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

1
Marlin/example_configurations/K8400/Configuration.h
View File

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

1
Marlin/example_configurations/K8400/Dual-head/Configuration.h
View File

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

1
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
View File

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

1
Marlin/example_configurations/RigidBot/Configuration.h
View File

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

1
Marlin/example_configurations/SCARA/Configuration.h
View File

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

1
Marlin/example_configurations/TAZ4/Configuration.h
View File

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

1
Marlin/example_configurations/WITBOX/Configuration.h
View File

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

1
Marlin/example_configurations/adafruit/ST7565/Configuration.h
View File

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

1
Marlin/example_configurations/delta/biv2.5/Configuration.h
View File

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

1
Marlin/example_configurations/delta/generic/Configuration.h
View File

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

1
Marlin/example_configurations/delta/kossel_mini/Configuration.h
View File

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

1
Marlin/example_configurations/delta/kossel_pro/Configuration.h
View File

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

1
Marlin/example_configurations/delta/kossel_xl/Configuration.h
View File

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

1
Marlin/example_configurations/makibox/Configuration.h
View File

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

1
Marlin/example_configurations/tvrrug/Round2/Configuration.h
View File

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