瀏覽代碼

Update configs for new servo deactivation

Scott Lahteine 10 年之前
父節點
當前提交
391386dd94

+ 12
- 11
Marlin/Configuration.h 查看文件

767
 //
767
 //
768
 //#define NUM_SERVOS 3 // Servo index starts with 0 for M280 command
768
 //#define NUM_SERVOS 3 // Servo index starts with 0 for M280 command
769
 
769
 
770
-// If DEACTIVATE_SERVOS_AFTER_MOVE is defined, the servos will be turned on only during movement and then turned off to avoid jitter
771
-// SERVO_DEACTIVATION_DELAY is the delay to turn the servo off after powered on - depends on the servo speed; 300ms is good value, but you can try lower it.
772
-// If your servo does not reach the requested position, enlarge the time.
773
-// You MUST HAVE the SERVO_ENDSTOPS defined to use here a value higher than zero otherwise your code will not compile.
774
-//
775
-//#define DEACTIVATE_SERVOS_AFTER_MOVE
776
-
777
-#ifdef DEACTIVATE_SERVOS_AFTER_MOVE
778
-  #define SERVO_DEACTIVATION_DELAY 300
779
-#endif
780
-
781
 // Servo Endstops
770
 // Servo Endstops
782
 //
771
 //
783
 // This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes.
772
 // This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes.
786
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
775
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
787
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
776
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
788
 
777
 
778
+// Servo deactivation
779
+//
780
+// With this option servos are powered only during movement, then turned off to prevent jitter.
781
+//#define DEACTIVATE_SERVOS_AFTER_MOVE
782
+
783
+#ifdef DEACTIVATE_SERVOS_AFTER_MOVE
784
+  // Delay (in microseconds) before turning the servo off. This depends on the servo speed.
785
+  // 300ms is a good value but you can try less delay.
786
+  // If the servo can't reach the requested position, increase it.
787
+  #define SERVO_DEACTIVATION_DELAY 300
788
+#endif
789
+
789
 /**********************************************************************\
790
 /**********************************************************************\
790
  * Support for a filament diameter sensor
791
  * Support for a filament diameter sensor
791
  * Also allows adjustment of diameter at print time (vs  at slicing)
792
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 7
- 0
Marlin/SanityCheck.h 查看文件

85
   #endif
85
   #endif
86
 
86
 
87
   /**
87
   /**
88
+   * Servo deactivation depends on servo endstops
89
+   */
90
+  #if defined(DEACTIVATE_SERVOS_AFTER_MOVE) && !defined(SERVO_ENDSTOPS)
91
+    #error SERVO_ENDSTOPS is required for DEACTIVATE_SERVOS_AFTER_MOVE.
92
+  #endif
93
+
94
+  /**
88
    * Required LCD language
95
    * Required LCD language
89
    */
96
    */
90
   #if !defined(DOGLCD) && defined(ULTRA_LCD) && !defined(DISPLAY_CHARSET_HD44780_JAPAN) && !defined(DISPLAY_CHARSET_HD44780_WESTERN)&& !defined(DISPLAY_CHARSET_HD44780_CYRILLIC)
97
   #if !defined(DOGLCD) && defined(ULTRA_LCD) && !defined(DISPLAY_CHARSET_HD44780_JAPAN) && !defined(DISPLAY_CHARSET_HD44780_WESTERN)&& !defined(DISPLAY_CHARSET_HD44780_CYRILLIC)

+ 12
- 7
Marlin/configurator/config/Configuration.h 查看文件

503
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
503
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
504
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
504
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
505
 
505
 
506
-  //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk
507
-  //The value is the delay to turn the servo off after powered on - depends on the servo speed; 300ms is good value, but you can try lower it.
508
-  // You MUST HAVE the SERVO_ENDSTOPS defined to use here a value higher than zero otherwise your code will not compile.
509
-
510
-//  #define PROBE_SERVO_DEACTIVATION_DELAY 300
511
-
512
-
513
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
506
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
514
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
507
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
515
 
508
 
781
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
774
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
782
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
775
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
783
 
776
 
777
+// Servo deactivation
778
+//
779
+// With this option servos are powered only during movement, then turned off to prevent jitter.
780
+//#define DEACTIVATE_SERVOS_AFTER_MOVE
781
+
782
+#ifdef DEACTIVATE_SERVOS_AFTER_MOVE
783
+  // Delay (in microseconds) before turning the servo off. This depends on the servo speed.
784
+  // 300ms is a good value but you can try less delay.
785
+  // If the servo can't reach the requested position, increase it.
786
+  #define SERVO_DEACTIVATION_DELAY 300
787
+#endif
788
+
784
 /**********************************************************************\
789
 /**********************************************************************\
785
  * Support for a filament diameter sensor
790
  * Support for a filament diameter sensor
786
  * Also allows adjustment of diameter at print time (vs  at slicing)
791
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 12
- 7
Marlin/example_configurations/Felix/Configuration.h 查看文件

486
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
486
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
487
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
487
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
488
 
488
 
489
-  //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk
490
-  //The value is the delay to turn the servo off after powered on - depends on the servo speed; 300ms is good value, but you can try lower it.
491
-  // You MUST HAVE the SERVO_ENDSTOPS defined to use here a value higher than zero otherwise your code will not compile.
492
-
493
-//  #define PROBE_SERVO_DEACTIVATION_DELAY 300
494
-
495
-
496
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
489
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
497
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
490
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
498
 
491
 
765
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
758
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
766
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
759
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
767
 
760
 
761
+// Servo deactivation
762
+//
763
+// With this option servos are powered only during movement, then turned off to prevent jitter.
764
+//#define DEACTIVATE_SERVOS_AFTER_MOVE
765
+
766
+#ifdef DEACTIVATE_SERVOS_AFTER_MOVE
767
+  // Delay (in microseconds) before turning the servo off. This depends on the servo speed.
768
+  // 300ms is a good value but you can try less delay.
769
+  // If the servo can't reach the requested position, increase it.
770
+  #define SERVO_DEACTIVATION_DELAY 300
771
+#endif
772
+
768
 /**********************************************************************\
773
 /**********************************************************************\
769
  * Support for a filament diameter sensor
774
  * Support for a filament diameter sensor
770
  * Also allows adjustment of diameter at print time (vs  at slicing)
775
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 12
- 7
Marlin/example_configurations/Hephestos/Configuration.h 查看文件

512
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
512
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
513
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
513
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
514
 
514
 
515
-  //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk
516
-  //The value is the delay to turn the servo off after powered on - depends on the servo speed; 300ms is good value, but you can try lower it.
517
-  // You MUST HAVE the SERVO_ENDSTOPS defined to use here a value higher than zero otherwise your code will not compile.
518
-
519
-//  #define PROBE_SERVO_DEACTIVATION_DELAY 300
520
-
521
-
522
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
515
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
523
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
516
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
524
 
517
 
790
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
783
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
791
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
784
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
792
 
785
 
786
+// Servo deactivation
787
+//
788
+// With this option servos are powered only during movement, then turned off to prevent jitter.
789
+//#define DEACTIVATE_SERVOS_AFTER_MOVE
790
+
791
+#ifdef DEACTIVATE_SERVOS_AFTER_MOVE
792
+  // Delay (in microseconds) before turning the servo off. This depends on the servo speed.
793
+  // 300ms is a good value but you can try less delay.
794
+  // If the servo can't reach the requested position, increase it.
795
+  #define SERVO_DEACTIVATION_DELAY 300
796
+#endif
797
+
793
 /**********************************************************************\
798
 /**********************************************************************\
794
  * Support for a filament diameter sensor
799
  * Support for a filament diameter sensor
795
  * Also allows adjustment of diameter at print time (vs  at slicing)
800
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 12
- 7
Marlin/example_configurations/K8200/Configuration.h 查看文件

520
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
520
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
521
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
521
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
522
 
522
 
523
-  //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk
524
-  //The value is the delay to turn the servo off after powered on - depends on the servo speed; 300ms is good value, but you can try lower it.
525
-  // You MUST HAVE the SERVO_ENDSTOPS defined to use here a value higher than zero otherwise your code will not compile.
526
-
527
-//  #define PROBE_SERVO_DEACTIVATION_DELAY 300
528
-
529
-
530
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
523
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
531
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
524
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
532
 
525
 
798
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
791
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
799
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
792
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
800
 
793
 
794
+// Servo deactivation
795
+//
796
+// With this option servos are powered only during movement, then turned off to prevent jitter.
797
+//#define DEACTIVATE_SERVOS_AFTER_MOVE
798
+
799
+#ifdef DEACTIVATE_SERVOS_AFTER_MOVE
800
+  // Delay (in microseconds) before turning the servo off. This depends on the servo speed.
801
+  // 300ms is a good value but you can try less delay.
802
+  // If the servo can't reach the requested position, increase it.
803
+  #define SERVO_DEACTIVATION_DELAY 300
804
+#endif
805
+
801
 /**********************************************************************\
806
 /**********************************************************************\
802
  * Support for a filament diameter sensor
807
  * Support for a filament diameter sensor
803
  * Also allows adjustment of diameter at print time (vs  at slicing)
808
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 12
- 7
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h 查看文件

504
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
504
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
505
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
505
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
506
 
506
 
507
-  //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk
508
-  //The value is the delay to turn the servo off after powered on - depends on the servo speed; 300ms is good value, but you can try lower it.
509
-  // You MUST HAVE the SERVO_ENDSTOPS defined to use here a value higher than zero otherwise your code will not compile.
510
-
511
-//  #define PROBE_SERVO_DEACTIVATION_DELAY 300
512
-
513
-
514
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
507
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
515
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
508
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
516
 
509
 
782
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
775
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
783
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
776
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
784
 
777
 
778
+// Servo deactivation
779
+//
780
+// With this option servos are powered only during movement, then turned off to prevent jitter.
781
+//#define DEACTIVATE_SERVOS_AFTER_MOVE
782
+
783
+#ifdef DEACTIVATE_SERVOS_AFTER_MOVE
784
+  // Delay (in microseconds) before turning the servo off. This depends on the servo speed.
785
+  // 300ms is a good value but you can try less delay.
786
+  // If the servo can't reach the requested position, increase it.
787
+  #define SERVO_DEACTIVATION_DELAY 300
788
+#endif
789
+
785
 /**********************************************************************\
790
 /**********************************************************************\
786
  * Support for a filament diameter sensor
791
  * Support for a filament diameter sensor
787
  * Also allows adjustment of diameter at print time (vs  at slicing)
792
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 12
- 7
Marlin/example_configurations/RigidBot/Configuration.h 查看文件

503
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
503
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
504
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
504
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
505
 
505
 
506
-  //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk
507
-  //The value is the delay to turn the servo off after powered on - depends on the servo speed; 300ms is good value, but you can try lower it.
508
-  // You MUST HAVE the SERVO_ENDSTOPS defined to use here a value higher than zero otherwise your code will not compile.
509
-
510
-//  #define PROBE_SERVO_DEACTIVATION_DELAY 300
511
-
512
-
513
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
506
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
514
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
507
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
515
 
508
 
782
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
775
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
783
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
776
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
784
 
777
 
778
+// Servo deactivation
779
+//
780
+// With this option servos are powered only during movement, then turned off to prevent jitter.
781
+//#define DEACTIVATE_SERVOS_AFTER_MOVE
782
+
783
+#ifdef DEACTIVATE_SERVOS_AFTER_MOVE
784
+  // Delay (in microseconds) before turning the servo off. This depends on the servo speed.
785
+  // 300ms is a good value but you can try less delay.
786
+  // If the servo can't reach the requested position, increase it.
787
+  #define SERVO_DEACTIVATION_DELAY 300
788
+#endif
789
+
785
 /**********************************************************************\
790
 /**********************************************************************\
786
  * Support for a filament diameter sensor
791
  * Support for a filament diameter sensor
787
  * Also allows adjustment of diameter at print time (vs  at slicing)
792
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 12
- 7
Marlin/example_configurations/SCARA/Configuration.h 查看文件

545
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
545
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
546
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
546
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
547
 
547
 
548
-  //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk
549
-  //The value is the delay to turn the servo off after powered on - depends on the servo speed; 300ms is good value, but you can try lower it.
550
-  // You MUST HAVE the SERVO_ENDSTOPS defined to use here a value higher than zero otherwise your code will not compile.
551
-
552
-//  #define PROBE_SERVO_DEACTIVATION_DELAY 300
553
-
554
-
555
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
548
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
556
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
549
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
557
 
550
 
823
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
816
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
824
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
817
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
825
 
818
 
819
+// Servo deactivation
820
+//
821
+// With this option servos are powered only during movement, then turned off to prevent jitter.
822
+//#define DEACTIVATE_SERVOS_AFTER_MOVE
823
+
824
+#ifdef DEACTIVATE_SERVOS_AFTER_MOVE
825
+  // Delay (in microseconds) before turning the servo off. This depends on the servo speed.
826
+  // 300ms is a good value but you can try less delay.
827
+  // If the servo can't reach the requested position, increase it.
828
+  #define SERVO_DEACTIVATION_DELAY 300
829
+#endif
830
+
826
 /**********************************************************************\
831
 /**********************************************************************\
827
  * Support for a filament diameter sensor
832
  * Support for a filament diameter sensor
828
  * Also allows adjustment of diameter at print time (vs  at slicing)
833
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 12
- 7
Marlin/example_configurations/WITBOX/Configuration.h 查看文件

512
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
512
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
513
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
513
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
514
 
514
 
515
-  //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk
516
-  //The value is the delay to turn the servo off after powered on - depends on the servo speed; 300ms is good value, but you can try lower it.
517
-  // You MUST HAVE the SERVO_ENDSTOPS defined to use here a value higher than zero otherwise your code will not compile.
518
-
519
-//  #define PROBE_SERVO_DEACTIVATION_DELAY 300
520
-
521
-
522
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
515
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
523
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
516
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
524
 
517
 
790
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
783
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
791
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
784
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
792
 
785
 
786
+// Servo deactivation
787
+//
788
+// With this option servos are powered only during movement, then turned off to prevent jitter.
789
+//#define DEACTIVATE_SERVOS_AFTER_MOVE
790
+
791
+#ifdef DEACTIVATE_SERVOS_AFTER_MOVE
792
+  // Delay (in microseconds) before turning the servo off. This depends on the servo speed.
793
+  // 300ms is a good value but you can try less delay.
794
+  // If the servo can't reach the requested position, increase it.
795
+  #define SERVO_DEACTIVATION_DELAY 300
796
+#endif
797
+
793
 /**********************************************************************\
798
 /**********************************************************************\
794
  * Support for a filament diameter sensor
799
  * Support for a filament diameter sensor
795
  * Also allows adjustment of diameter at print time (vs  at slicing)
800
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 12
- 7
Marlin/example_configurations/adafruit/ST7565/Configuration.h 查看文件

503
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
503
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
504
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
504
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
505
 
505
 
506
-  //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk
507
-  //The value is the delay to turn the servo off after powered on - depends on the servo speed; 300ms is good value, but you can try lower it.
508
-  // You MUST HAVE the SERVO_ENDSTOPS defined to use here a value higher than zero otherwise your code will not compile.
509
-
510
-//  #define PROBE_SERVO_DEACTIVATION_DELAY 300
511
-
512
-
513
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
506
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
514
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
507
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
515
 
508
 
781
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
774
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
782
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
775
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
783
 
776
 
777
+// Servo deactivation
778
+//
779
+// With this option servos are powered only during movement, then turned off to prevent jitter.
780
+//#define DEACTIVATE_SERVOS_AFTER_MOVE
781
+
782
+#ifdef DEACTIVATE_SERVOS_AFTER_MOVE
783
+  // Delay (in microseconds) before turning the servo off. This depends on the servo speed.
784
+  // 300ms is a good value but you can try less delay.
785
+  // If the servo can't reach the requested position, increase it.
786
+  #define SERVO_DEACTIVATION_DELAY 300
787
+#endif
788
+
784
 /**********************************************************************\
789
 /**********************************************************************\
785
  * Support for a filament diameter sensor
790
  * Support for a filament diameter sensor
786
  * Also allows adjustment of diameter at print time (vs  at slicing)
791
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 12
- 7
Marlin/example_configurations/delta/biv2.5/Configuration.h 查看文件

624
     #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z
624
     #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z
625
   #endif
625
   #endif
626
 
626
 
627
-  //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk
628
-  //The value is the delay to turn the servo off after powered on - depends on the servo speed; 300ms is good value, but you can try lower it.
629
-  // You MUST HAVE the SERVO_ENDSTOPS defined to use here a value higher than zero otherwise your code will not compile.
630
-
631
-//  #define PROBE_SERVO_DEACTIVATION_DELAY 300
632
-
633
-
634
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
627
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
635
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
628
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
636
 
629
 
909
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
902
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
910
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
903
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
911
 
904
 
905
+// Servo deactivation
906
+//
907
+// With this option servos are powered only during movement, then turned off to prevent jitter.
908
+//#define DEACTIVATE_SERVOS_AFTER_MOVE
909
+
910
+#ifdef DEACTIVATE_SERVOS_AFTER_MOVE
911
+  // Delay (in microseconds) before turning the servo off. This depends on the servo speed.
912
+  // 300ms is a good value but you can try less delay.
913
+  // If the servo can't reach the requested position, increase it.
914
+  #define SERVO_DEACTIVATION_DELAY 300
915
+#endif
916
+
912
 /**********************************************************************\
917
 /**********************************************************************\
913
  * Support for a filament diameter sensor
918
  * Support for a filament diameter sensor
914
  * Also allows adjustment of diameter at print time (vs  at slicing)
919
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 12
- 7
Marlin/example_configurations/delta/generic/Configuration.h 查看文件

624
     //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z
624
     //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z
625
   #endif
625
   #endif
626
 
626
 
627
-  //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk
628
-  //The value is the delay to turn the servo off after powered on - depends on the servo speed; 300ms is good value, but you can try lower it.
629
-  // You MUST HAVE the SERVO_ENDSTOPS defined to use here a value higher than zero otherwise your code will not compile.
630
-
631
-//  #define PROBE_SERVO_DEACTIVATION_DELAY 300
632
-
633
-
634
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
627
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
635
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
628
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
636
 
629
 
909
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
902
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
910
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
903
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
911
 
904
 
905
+// Servo deactivation
906
+//
907
+// With this option servos are powered only during movement, then turned off to prevent jitter.
908
+//#define DEACTIVATE_SERVOS_AFTER_MOVE
909
+
910
+#ifdef DEACTIVATE_SERVOS_AFTER_MOVE
911
+  // Delay (in microseconds) before turning the servo off. This depends on the servo speed.
912
+  // 300ms is a good value but you can try less delay.
913
+  // If the servo can't reach the requested position, increase it.
914
+  #define SERVO_DEACTIVATION_DELAY 300
915
+#endif
916
+
912
 /**********************************************************************\
917
 /**********************************************************************\
913
  * Support for a filament diameter sensor
918
  * Support for a filament diameter sensor
914
  * Also allows adjustment of diameter at print time (vs  at slicing)
919
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 12
- 7
Marlin/example_configurations/delta/kossel_mini/Configuration.h 查看文件

628
     //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z
628
     //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z
629
   #endif
629
   #endif
630
 
630
 
631
-  //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk
632
-  //The value is the delay to turn the servo off after powered on - depends on the servo speed; 300ms is good value, but you can try lower it.
633
-  // You MUST HAVE the SERVO_ENDSTOPS defined to use here a value higher than zero otherwise your code will not compile.
634
-
635
-//  #define PROBE_SERVO_DEACTIVATION_DELAY 300
636
-
637
-
638
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
631
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
639
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
632
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
640
 
633
 
913
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
906
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
914
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
907
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
915
 
908
 
909
+// Servo deactivation
910
+//
911
+// With this option servos are powered only during movement, then turned off to prevent jitter.
912
+//#define DEACTIVATE_SERVOS_AFTER_MOVE
913
+
914
+#ifdef DEACTIVATE_SERVOS_AFTER_MOVE
915
+  // Delay (in microseconds) before turning the servo off. This depends on the servo speed.
916
+  // 300ms is a good value but you can try less delay.
917
+  // If the servo can't reach the requested position, increase it.
918
+  #define SERVO_DEACTIVATION_DELAY 300
919
+#endif
920
+
916
 /**********************************************************************\
921
 /**********************************************************************\
917
  * Support for a filament diameter sensor
922
  * Support for a filament diameter sensor
918
  * Also allows adjustment of diameter at print time (vs  at slicing)
923
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 12
- 7
Marlin/example_configurations/delta/kossel_pro/Configuration.h 查看文件

641
     #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z
641
     #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z
642
   #endif
642
   #endif
643
 
643
 
644
-  //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk
645
-  //The value is the delay to turn the servo off after powered on - depends on the servo speed; 300ms is good value, but you can try lower it.
646
-  // You MUST HAVE the SERVO_ENDSTOPS defined to use here a value higher than zero otherwise your code will not compile.
647
-
648
-//  #define PROBE_SERVO_DEACTIVATION_DELAY 300
649
-
650
-
651
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
644
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
652
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
645
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
653
 
646
 
936
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
929
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
937
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
930
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
938
 
931
 
932
+// Servo deactivation
933
+//
934
+// With this option servos are powered only during movement, then turned off to prevent jitter.
935
+//#define DEACTIVATE_SERVOS_AFTER_MOVE
936
+
937
+#ifdef DEACTIVATE_SERVOS_AFTER_MOVE
938
+  // Delay (in microseconds) before turning the servo off. This depends on the servo speed.
939
+  // 300ms is a good value but you can try less delay.
940
+  // If the servo can't reach the requested position, increase it.
941
+  #define SERVO_DEACTIVATION_DELAY 300
942
+#endif
943
+
939
 /**********************************************************************\
944
 /**********************************************************************\
940
  * Support for a filament diameter sensor
945
  * Support for a filament diameter sensor
941
  * Also allows adjustment of diameter at print time (vs  at slicing)
946
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 12
- 7
Marlin/example_configurations/makibox/Configuration.h 查看文件

507
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
507
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
508
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
508
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
509
 
509
 
510
-  //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk
511
-  //The value is the delay to turn the servo off after powered on - depends on the servo speed; 300ms is good value, but you can try lower it.
512
-  // You MUST HAVE the SERVO_ENDSTOPS defined to use here a value higher than zero otherwise your code will not compile.
513
-
514
-//  #define PROBE_SERVO_DEACTIVATION_DELAY 300
515
-
516
-
517
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
510
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
518
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
511
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
519
 
512
 
785
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
778
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
786
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
779
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
787
 
780
 
781
+// Servo deactivation
782
+//
783
+// With this option servos are powered only during movement, then turned off to prevent jitter.
784
+//#define DEACTIVATE_SERVOS_AFTER_MOVE
785
+
786
+#ifdef DEACTIVATE_SERVOS_AFTER_MOVE
787
+  // Delay (in microseconds) before turning the servo off. This depends on the servo speed.
788
+  // 300ms is a good value but you can try less delay.
789
+  // If the servo can't reach the requested position, increase it.
790
+  #define SERVO_DEACTIVATION_DELAY 300
791
+#endif
792
+
788
 /**********************************************************************\
793
 /**********************************************************************\
789
  * Support for a filament diameter sensor
794
  * Support for a filament diameter sensor
790
  * Also allows adjustment of diameter at print time (vs  at slicing)
795
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 12
- 7
Marlin/example_configurations/tvrrug/Round2/Configuration.h 查看文件

509
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
509
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
510
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
510
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
511
 
511
 
512
-  //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk
513
-  //The value is the delay to turn the servo off after powered on - depends on the servo speed; 300ms is good value, but you can try lower it.
514
-  // You MUST HAVE the SERVO_ENDSTOPS defined to use here a value higher than zero otherwise your code will not compile.
515
-
516
-//  #define PROBE_SERVO_DEACTIVATION_DELAY 300
517
-
518
-
519
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
512
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
520
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
513
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
521
 
514
 
791
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
784
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
792
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
785
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
793
 
786
 
787
+// Servo deactivation
788
+//
789
+// With this option servos are powered only during movement, then turned off to prevent jitter.
790
+//#define DEACTIVATE_SERVOS_AFTER_MOVE
791
+
792
+#ifdef DEACTIVATE_SERVOS_AFTER_MOVE
793
+  // Delay (in microseconds) before turning the servo off. This depends on the servo speed.
794
+  // 300ms is a good value but you can try less delay.
795
+  // If the servo can't reach the requested position, increase it.
796
+  #define SERVO_DEACTIVATION_DELAY 300
797
+#endif
798
+
794
 /**********************************************************************\
799
 /**********************************************************************\
795
  * Support for a filament diameter sensor
800
  * Support for a filament diameter sensor
796
  * Also allows adjustment of diameter at print time (vs  at slicing)
801
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 2
- 2
Marlin/servo.cpp 查看文件

35
 
35
 
36
  write()     - Sets the servo angle in degrees.  (invalid angle that is valid as pulse in microseconds is treated as microseconds)
36
  write()     - Sets the servo angle in degrees.  (invalid angle that is valid as pulse in microseconds is treated as microseconds)
37
  writeMicroseconds() - Sets the servo pulse width in microseconds
37
  writeMicroseconds() - Sets the servo pulse width in microseconds
38
- move(pin, angel) - Sequence of attach(pin), write(angel),
39
-                    if DEACTIVATE_SERVOS_AFTER_MOVE is defined waits SERVO_DEACTIVATION_DELAY, than detaches.
38
+ move(pin, angel) - Sequence of attach(pin), write(angel).
39
+                    With DEACTIVATE_SERVOS_AFTER_MOVE it waits SERVO_DEACTIVATION_DELAY and detaches.
40
  read()      - Gets the last written servo pulse width as an angle between 0 and 180.
40
  read()      - Gets the last written servo pulse width as an angle between 0 and 180.
41
  readMicroseconds()   - Gets the last written servo pulse width in microseconds. (was read_us() in first release)
41
  readMicroseconds()   - Gets the last written servo pulse width in microseconds. (was read_us() in first release)
42
  attached()  - Returns true if there is a servo attached.
42
  attached()  - Returns true if there is a servo attached.

+ 1
- 1
Marlin/servo.h 查看文件

41
    attached()  - Returns true if there is a servo attached.
41
    attached()  - Returns true if there is a servo attached.
42
    detach()    - Stops an attached servos from pulsing its i/o pin.
42
    detach()    - Stops an attached servos from pulsing its i/o pin.
43
    move(pin, angel) - Sequence of attach(pin), write(angel),
43
    move(pin, angel) - Sequence of attach(pin), write(angel),
44
-                      if DEACTIVATE_SERVOS_AFTER_MOVE is defined waits SERVO_DEACTIVATION_DELAY, than detaches.
44
+                      With DEACTIVATE_SERVOS_AFTER_MOVE it waits SERVO_DEACTIVATION_DELAY and detaches.
45
  */
45
  */
46
 
46
 
47
 #ifndef servo_h
47
 #ifndef servo_h

Loading…
取消
儲存