Configurable delay for BLTouch servo emulation
This commit is contained in:
parent
deaad78df9
commit
c56eec29f0
25 changed files with 27 additions and 1 deletions
|
@ -345,6 +345,9 @@
|
||||||
#undef DEACTIVATE_SERVOS_AFTER_MOVE
|
#undef DEACTIVATE_SERVOS_AFTER_MOVE
|
||||||
#undef SERVO_DELAY
|
#undef SERVO_DELAY
|
||||||
#define SERVO_DELAY 50
|
#define SERVO_DELAY 50
|
||||||
|
#ifndef BLTOUCH_DELAY
|
||||||
|
#define BLTOUCH_DELAY 375
|
||||||
|
#endif
|
||||||
#undef Z_SERVO_ANGLES
|
#undef Z_SERVO_ANGLES
|
||||||
#define Z_SERVO_ANGLES { BLTOUCH_DEPLOY, BLTOUCH_STOW }
|
#define Z_SERVO_ANGLES { BLTOUCH_DEPLOY, BLTOUCH_STOW }
|
||||||
|
|
||||||
|
|
|
@ -559,6 +559,7 @@
|
||||||
// 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.
|
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
|
||||||
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
||||||
//#define Z_ENDSTOP_SERVO_NR 0
|
//#define Z_ENDSTOP_SERVO_NR 0
|
||||||
|
|
|
@ -1990,7 +1990,7 @@ static void clean_up_after_endstop_or_probe_move() {
|
||||||
#if ENABLED(BLTOUCH)
|
#if ENABLED(BLTOUCH)
|
||||||
void bltouch_command(int angle) {
|
void bltouch_command(int angle) {
|
||||||
servo[Z_ENDSTOP_SERVO_NR].move(angle); // Give the BL-Touch the command and wait
|
servo[Z_ENDSTOP_SERVO_NR].move(angle); // Give the BL-Touch the command and wait
|
||||||
safe_delay(375);
|
safe_delay(BLTOUCH_DELAY);
|
||||||
}
|
}
|
||||||
|
|
||||||
void set_bltouch_deployed(const bool deploy) {
|
void set_bltouch_deployed(const bool deploy) {
|
||||||
|
|
|
@ -559,6 +559,7 @@
|
||||||
// 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.
|
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
|
||||||
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
||||||
//#define Z_ENDSTOP_SERVO_NR 0
|
//#define Z_ENDSTOP_SERVO_NR 0
|
||||||
|
|
|
@ -542,6 +542,7 @@
|
||||||
// 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.
|
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
|
||||||
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
||||||
//#define Z_ENDSTOP_SERVO_NR 0
|
//#define Z_ENDSTOP_SERVO_NR 0
|
||||||
|
|
|
@ -542,6 +542,7 @@
|
||||||
// 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.
|
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
|
||||||
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
||||||
//#define Z_ENDSTOP_SERVO_NR 0
|
//#define Z_ENDSTOP_SERVO_NR 0
|
||||||
|
|
|
@ -551,6 +551,7 @@
|
||||||
// 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.
|
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
|
||||||
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
||||||
//#define Z_ENDSTOP_SERVO_NR 0
|
//#define Z_ENDSTOP_SERVO_NR 0
|
||||||
|
|
|
@ -553,6 +553,7 @@
|
||||||
// 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.
|
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
|
||||||
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
||||||
//#define Z_ENDSTOP_SERVO_NR 0
|
//#define Z_ENDSTOP_SERVO_NR 0
|
||||||
|
|
|
@ -588,6 +588,7 @@
|
||||||
// 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.
|
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
|
||||||
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
||||||
//#define Z_ENDSTOP_SERVO_NR 0
|
//#define Z_ENDSTOP_SERVO_NR 0
|
||||||
|
|
|
@ -559,6 +559,7 @@
|
||||||
// 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.
|
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
|
||||||
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
||||||
//#define Z_ENDSTOP_SERVO_NR 0
|
//#define Z_ENDSTOP_SERVO_NR 0
|
||||||
|
|
|
@ -559,6 +559,7 @@
|
||||||
// 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.
|
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
|
||||||
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
||||||
//#define Z_ENDSTOP_SERVO_NR 0
|
//#define Z_ENDSTOP_SERVO_NR 0
|
||||||
|
|
|
@ -559,6 +559,7 @@
|
||||||
// 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.
|
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
|
||||||
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
||||||
//#define Z_ENDSTOP_SERVO_NR 0
|
//#define Z_ENDSTOP_SERVO_NR 0
|
||||||
|
|
|
@ -558,6 +558,7 @@
|
||||||
// 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.
|
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
|
||||||
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
||||||
//#define Z_ENDSTOP_SERVO_NR 0
|
//#define Z_ENDSTOP_SERVO_NR 0
|
||||||
|
|
|
@ -574,6 +574,7 @@
|
||||||
// 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.
|
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
|
||||||
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
||||||
//#define Z_ENDSTOP_SERVO_NR 0
|
//#define Z_ENDSTOP_SERVO_NR 0
|
||||||
|
|
|
@ -580,6 +580,7 @@
|
||||||
// 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.
|
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
|
||||||
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
||||||
//#define Z_ENDSTOP_SERVO_NR 0
|
//#define Z_ENDSTOP_SERVO_NR 0
|
||||||
|
|
|
@ -605,6 +605,7 @@
|
||||||
// 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.
|
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
|
||||||
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
||||||
//#define Z_ENDSTOP_SERVO_NR 0
|
//#define Z_ENDSTOP_SERVO_NR 0
|
||||||
|
|
|
@ -551,6 +551,7 @@
|
||||||
// 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.
|
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
|
||||||
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
||||||
//#define Z_ENDSTOP_SERVO_NR 0
|
//#define Z_ENDSTOP_SERVO_NR 0
|
||||||
|
|
|
@ -559,6 +559,7 @@
|
||||||
// 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.
|
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
|
||||||
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
||||||
//#define Z_ENDSTOP_SERVO_NR 0
|
//#define Z_ENDSTOP_SERVO_NR 0
|
||||||
|
|
|
@ -617,6 +617,7 @@
|
||||||
// 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.
|
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
|
||||||
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
||||||
//#define Z_ENDSTOP_SERVO_NR 0
|
//#define Z_ENDSTOP_SERVO_NR 0
|
||||||
|
|
|
@ -604,6 +604,7 @@
|
||||||
// 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.
|
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
|
||||||
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
||||||
//#define Z_ENDSTOP_SERVO_NR 0
|
//#define Z_ENDSTOP_SERVO_NR 0
|
||||||
|
|
|
@ -604,6 +604,7 @@
|
||||||
// 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.
|
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
|
||||||
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
||||||
//#define Z_ENDSTOP_SERVO_NR 0
|
//#define Z_ENDSTOP_SERVO_NR 0
|
||||||
|
|
|
@ -598,6 +598,7 @@
|
||||||
// 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.
|
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
|
||||||
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
||||||
//#define Z_ENDSTOP_SERVO_NR 0
|
//#define Z_ENDSTOP_SERVO_NR 0
|
||||||
|
|
|
@ -617,6 +617,7 @@
|
||||||
// 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.
|
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
|
||||||
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
||||||
//#define Z_ENDSTOP_SERVO_NR 0
|
//#define Z_ENDSTOP_SERVO_NR 0
|
||||||
|
|
|
@ -562,6 +562,7 @@
|
||||||
// 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.
|
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
|
||||||
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
||||||
//#define Z_ENDSTOP_SERVO_NR 0
|
//#define Z_ENDSTOP_SERVO_NR 0
|
||||||
|
|
|
@ -555,6 +555,7 @@
|
||||||
// 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.
|
// The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
|
||||||
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
// Z Servo Probe, such as an endstop switch on a rotating arm.
|
||||||
//#define Z_ENDSTOP_SERVO_NR 0
|
//#define Z_ENDSTOP_SERVO_NR 0
|
||||||
|
|
Reference in a new issue