Bladeren bron

Configurable delay for BLTouch servo emulation

Scott Lahteine 7 jaren geleden
bovenliggende
commit
c56eec29f0
25 gewijzigde bestanden met toevoegingen van 27 en 1 verwijderingen
  1. 3
    0
      Marlin/Conditionals_LCD.h
  2. 1
    0
      Marlin/Configuration.h
  3. 1
    1
      Marlin/Marlin_main.cpp
  4. 1
    0
      Marlin/example_configurations/Cartesio/Configuration.h
  5. 1
    0
      Marlin/example_configurations/Felix/Configuration.h
  6. 1
    0
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  7. 1
    0
      Marlin/example_configurations/Hephestos/Configuration.h
  8. 1
    0
      Marlin/example_configurations/Hephestos_2/Configuration.h
  9. 1
    0
      Marlin/example_configurations/K8200/Configuration.h
  10. 1
    0
      Marlin/example_configurations/K8400/Configuration.h
  11. 1
    0
      Marlin/example_configurations/K8400/Dual-head/Configuration.h
  12. 1
    0
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  13. 1
    0
      Marlin/example_configurations/RigidBot/Configuration.h
  14. 1
    0
      Marlin/example_configurations/SCARA/Configuration.h
  15. 1
    0
      Marlin/example_configurations/TAZ4/Configuration.h
  16. 1
    0
      Marlin/example_configurations/TinyBoy2/Configuration.h
  17. 1
    0
      Marlin/example_configurations/WITBOX/Configuration.h
  18. 1
    0
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  19. 1
    0
      Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h
  20. 1
    0
      Marlin/example_configurations/delta/generic/Configuration.h
  21. 1
    0
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  22. 1
    0
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  23. 1
    0
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  24. 1
    0
      Marlin/example_configurations/makibox/Configuration.h
  25. 1
    0
      Marlin/example_configurations/tvrrug/Round2/Configuration.h

+ 3
- 0
Marlin/Conditionals_LCD.h Bestand weergeven

@@ -345,6 +345,9 @@
345 345
     #undef DEACTIVATE_SERVOS_AFTER_MOVE
346 346
     #undef SERVO_DELAY
347 347
     #define SERVO_DELAY 50
348
+    #ifndef BLTOUCH_DELAY
349
+      #define BLTOUCH_DELAY 375
350
+    #endif
348 351
     #undef Z_SERVO_ANGLES
349 352
     #define Z_SERVO_ANGLES { BLTOUCH_DEPLOY, BLTOUCH_STOW }
350 353
 

+ 1
- 0
Marlin/Configuration.h Bestand weergeven

@@ -559,6 +559,7 @@
559 559
 // The BLTouch probe emulates a servo probe.
560 560
 // The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
561 561
 //#define BLTOUCH
562
+//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
562 563
 
563 564
 // Z Servo Probe, such as an endstop switch on a rotating arm.
564 565
 //#define Z_ENDSTOP_SERVO_NR 0

+ 1
- 1
Marlin/Marlin_main.cpp Bestand weergeven

@@ -1990,7 +1990,7 @@ static void clean_up_after_endstop_or_probe_move() {
1990 1990
   #if ENABLED(BLTOUCH)
1991 1991
     void bltouch_command(int angle) {
1992 1992
       servo[Z_ENDSTOP_SERVO_NR].move(angle);  // Give the BL-Touch the command and wait
1993
-      safe_delay(375);
1993
+      safe_delay(BLTOUCH_DELAY);
1994 1994
     }
1995 1995
 
1996 1996
     void set_bltouch_deployed(const bool deploy) {

+ 1
- 0
Marlin/example_configurations/Cartesio/Configuration.h Bestand weergeven

@@ -559,6 +559,7 @@
559 559
 // The BLTouch probe emulates a servo probe.
560 560
 // The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
561 561
 //#define BLTOUCH
562
+//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
562 563
 
563 564
 // Z Servo Probe, such as an endstop switch on a rotating arm.
564 565
 //#define Z_ENDSTOP_SERVO_NR 0

+ 1
- 0
Marlin/example_configurations/Felix/Configuration.h Bestand weergeven

@@ -542,6 +542,7 @@
542 542
 // The BLTouch probe emulates a servo probe.
543 543
 // The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
544 544
 //#define BLTOUCH
545
+//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
545 546
 
546 547
 // Z Servo Probe, such as an endstop switch on a rotating arm.
547 548
 //#define Z_ENDSTOP_SERVO_NR 0

+ 1
- 0
Marlin/example_configurations/Felix/DUAL/Configuration.h Bestand weergeven

@@ -542,6 +542,7 @@
542 542
 // The BLTouch probe emulates a servo probe.
543 543
 // The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
544 544
 //#define BLTOUCH
545
+//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
545 546
 
546 547
 // Z Servo Probe, such as an endstop switch on a rotating arm.
547 548
 //#define Z_ENDSTOP_SERVO_NR 0

+ 1
- 0
Marlin/example_configurations/Hephestos/Configuration.h Bestand weergeven

@@ -551,6 +551,7 @@
551 551
 // The BLTouch probe emulates a servo probe.
552 552
 // The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
553 553
 //#define BLTOUCH
554
+//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
554 555
 
555 556
 // Z Servo Probe, such as an endstop switch on a rotating arm.
556 557
 //#define Z_ENDSTOP_SERVO_NR 0

+ 1
- 0
Marlin/example_configurations/Hephestos_2/Configuration.h Bestand weergeven

@@ -553,6 +553,7 @@
553 553
 // The BLTouch probe emulates a servo probe.
554 554
 // The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
555 555
 //#define BLTOUCH
556
+//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
556 557
 
557 558
 // Z Servo Probe, such as an endstop switch on a rotating arm.
558 559
 //#define Z_ENDSTOP_SERVO_NR 0

+ 1
- 0
Marlin/example_configurations/K8200/Configuration.h Bestand weergeven

@@ -588,6 +588,7 @@
588 588
 // The BLTouch probe emulates a servo probe.
589 589
 // The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
590 590
 //#define BLTOUCH
591
+//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
591 592
 
592 593
 // Z Servo Probe, such as an endstop switch on a rotating arm.
593 594
 //#define Z_ENDSTOP_SERVO_NR 0

+ 1
- 0
Marlin/example_configurations/K8400/Configuration.h Bestand weergeven

@@ -559,6 +559,7 @@
559 559
 // The BLTouch probe emulates a servo probe.
560 560
 // The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
561 561
 //#define BLTOUCH
562
+//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
562 563
 
563 564
 // Z Servo Probe, such as an endstop switch on a rotating arm.
564 565
 //#define Z_ENDSTOP_SERVO_NR 0

+ 1
- 0
Marlin/example_configurations/K8400/Dual-head/Configuration.h Bestand weergeven

@@ -559,6 +559,7 @@
559 559
 // The BLTouch probe emulates a servo probe.
560 560
 // The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
561 561
 //#define BLTOUCH
562
+//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
562 563
 
563 564
 // Z Servo Probe, such as an endstop switch on a rotating arm.
564 565
 //#define Z_ENDSTOP_SERVO_NR 0

+ 1
- 0
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h Bestand weergeven

@@ -559,6 +559,7 @@
559 559
 // The BLTouch probe emulates a servo probe.
560 560
 // The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
561 561
 //#define BLTOUCH
562
+//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
562 563
 
563 564
 // Z Servo Probe, such as an endstop switch on a rotating arm.
564 565
 //#define Z_ENDSTOP_SERVO_NR 0

+ 1
- 0
Marlin/example_configurations/RigidBot/Configuration.h Bestand weergeven

@@ -558,6 +558,7 @@
558 558
 // The BLTouch probe emulates a servo probe.
559 559
 // The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
560 560
 //#define BLTOUCH
561
+//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
561 562
 
562 563
 // Z Servo Probe, such as an endstop switch on a rotating arm.
563 564
 //#define Z_ENDSTOP_SERVO_NR 0

+ 1
- 0
Marlin/example_configurations/SCARA/Configuration.h Bestand weergeven

@@ -574,6 +574,7 @@
574 574
 // The BLTouch probe emulates a servo probe.
575 575
 // The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
576 576
 //#define BLTOUCH
577
+//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
577 578
 
578 579
 // Z Servo Probe, such as an endstop switch on a rotating arm.
579 580
 //#define Z_ENDSTOP_SERVO_NR 0

+ 1
- 0
Marlin/example_configurations/TAZ4/Configuration.h Bestand weergeven

@@ -580,6 +580,7 @@
580 580
 // The BLTouch probe emulates a servo probe.
581 581
 // The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
582 582
 //#define BLTOUCH
583
+//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
583 584
 
584 585
 // Z Servo Probe, such as an endstop switch on a rotating arm.
585 586
 //#define Z_ENDSTOP_SERVO_NR 0

+ 1
- 0
Marlin/example_configurations/TinyBoy2/Configuration.h Bestand weergeven

@@ -605,6 +605,7 @@
605 605
 // The BLTouch probe emulates a servo probe.
606 606
 // The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
607 607
 //#define BLTOUCH
608
+//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
608 609
 
609 610
 // Z Servo Probe, such as an endstop switch on a rotating arm.
610 611
 //#define Z_ENDSTOP_SERVO_NR 0

+ 1
- 0
Marlin/example_configurations/WITBOX/Configuration.h Bestand weergeven

@@ -551,6 +551,7 @@
551 551
 // The BLTouch probe emulates a servo probe.
552 552
 // The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
553 553
 //#define BLTOUCH
554
+//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
554 555
 
555 556
 // Z Servo Probe, such as an endstop switch on a rotating arm.
556 557
 //#define Z_ENDSTOP_SERVO_NR 0

+ 1
- 0
Marlin/example_configurations/adafruit/ST7565/Configuration.h Bestand weergeven

@@ -559,6 +559,7 @@
559 559
 // The BLTouch probe emulates a servo probe.
560 560
 // The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
561 561
 //#define BLTOUCH
562
+//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
562 563
 
563 564
 // Z Servo Probe, such as an endstop switch on a rotating arm.
564 565
 //#define Z_ENDSTOP_SERVO_NR 0

+ 1
- 0
Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h Bestand weergeven

@@ -617,6 +617,7 @@
617 617
 // The BLTouch probe emulates a servo probe.
618 618
 // The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
619 619
 //#define BLTOUCH
620
+//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
620 621
 
621 622
 // Z Servo Probe, such as an endstop switch on a rotating arm.
622 623
 //#define Z_ENDSTOP_SERVO_NR 0

+ 1
- 0
Marlin/example_configurations/delta/generic/Configuration.h Bestand weergeven

@@ -604,6 +604,7 @@
604 604
 // The BLTouch probe emulates a servo probe.
605 605
 // The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
606 606
 //#define BLTOUCH
607
+//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
607 608
 
608 609
 // Z Servo Probe, such as an endstop switch on a rotating arm.
609 610
 //#define Z_ENDSTOP_SERVO_NR 0

+ 1
- 0
Marlin/example_configurations/delta/kossel_mini/Configuration.h Bestand weergeven

@@ -604,6 +604,7 @@
604 604
 // The BLTouch probe emulates a servo probe.
605 605
 // The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
606 606
 //#define BLTOUCH
607
+//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
607 608
 
608 609
 // Z Servo Probe, such as an endstop switch on a rotating arm.
609 610
 //#define Z_ENDSTOP_SERVO_NR 0

+ 1
- 0
Marlin/example_configurations/delta/kossel_pro/Configuration.h Bestand weergeven

@@ -598,6 +598,7 @@
598 598
 // The BLTouch probe emulates a servo probe.
599 599
 // The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
600 600
 //#define BLTOUCH
601
+//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
601 602
 
602 603
 // Z Servo Probe, such as an endstop switch on a rotating arm.
603 604
 //#define Z_ENDSTOP_SERVO_NR 0

+ 1
- 0
Marlin/example_configurations/delta/kossel_xl/Configuration.h Bestand weergeven

@@ -617,6 +617,7 @@
617 617
 // The BLTouch probe emulates a servo probe.
618 618
 // The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
619 619
 //#define BLTOUCH
620
+//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
620 621
 
621 622
 // Z Servo Probe, such as an endstop switch on a rotating arm.
622 623
 //#define Z_ENDSTOP_SERVO_NR 0

+ 1
- 0
Marlin/example_configurations/makibox/Configuration.h Bestand weergeven

@@ -562,6 +562,7 @@
562 562
 // The BLTouch probe emulates a servo probe.
563 563
 // The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
564 564
 //#define BLTOUCH
565
+//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
565 566
 
566 567
 // Z Servo Probe, such as an endstop switch on a rotating arm.
567 568
 //#define Z_ENDSTOP_SERVO_NR 0

+ 1
- 0
Marlin/example_configurations/tvrrug/Round2/Configuration.h Bestand weergeven

@@ -555,6 +555,7 @@
555 555
 // The BLTouch probe emulates a servo probe.
556 556
 // The default connector is SERVO 0. Set Z_ENDSTOP_SERVO_NR below to override.
557 557
 //#define BLTOUCH
558
+//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
558 559
 
559 560
 // Z Servo Probe, such as an endstop switch on a rotating arm.
560 561
 //#define Z_ENDSTOP_SERVO_NR 0

Laden…
Annuleren
Opslaan