Browse Source

Merge Config cleanup (PR#2448)

Richard Wackerbarth 10 years ago
parent
commit
f7659f02bb

+ 12
- 11
Marlin/Configuration.h View File

@@ -767,17 +767,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
767 767
 //
768 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 770
 // Servo Endstops
782 771
 //
783 772
 // This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes.
@@ -786,6 +775,18 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
786 775
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
787 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 791
  * Support for a filament diameter sensor
791 792
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 7
- 0
Marlin/SanityCheck.h View File

@@ -85,6 +85,13 @@
85 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 95
    * Required LCD language
89 96
    */
90 97
   #if !defined(DOGLCD) && defined(ULTRA_LCD) && !defined(DISPLAY_CHARSET_HD44780_JAPAN) && !defined(DISPLAY_CHARSET_HD44780_WESTERN)&& !defined(DISPLAY_CHARSET_HD44780_CYRILLIC)

+ 33
- 27
Marlin/configurator/config/Configuration.h View File

@@ -205,21 +205,22 @@ Here are some standard links for getting your machine calibrated:
205 205
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
206 206
   #define K1 0.95 //smoothing factor within the PID
207 207
 
208
-// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
209
-// Ultimaker
210
-    #define  DEFAULT_Kp 22.2
211
-    #define  DEFAULT_Ki 1.08
212
-    #define  DEFAULT_Kd 114
213
-
214
-// MakerGear
215
-//    #define  DEFAULT_Kp 7.0
216
-//    #define  DEFAULT_Ki 0.1
217
-//    #define  DEFAULT_Kd 12
218
-
219
-// Mendel Parts V9 on 12V
220
-//    #define  DEFAULT_Kp 63.0
221
-//    #define  DEFAULT_Ki 2.25
222
-//    #define  DEFAULT_Kd 440
208
+  // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
209
+  // Ultimaker
210
+  #define  DEFAULT_Kp 22.2
211
+  #define  DEFAULT_Ki 1.08
212
+  #define  DEFAULT_Kd 114
213
+
214
+  // MakerGear
215
+  //#define  DEFAULT_Kp 7.0
216
+  //#define  DEFAULT_Ki 0.1
217
+  //#define  DEFAULT_Kd 12
218
+
219
+  // Mendel Parts V9 on 12V
220
+  //#define  DEFAULT_Kp 63.0
221
+  //#define  DEFAULT_Ki 2.25
222
+  //#define  DEFAULT_Kd 440
223
+
223 224
 #endif // PIDTEMP
224 225
 
225 226
 //===========================================================================
@@ -250,19 +251,19 @@ Here are some standard links for getting your machine calibrated:
250 251
 
251 252
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
252 253
 
253
-//120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
254
-//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
254
+  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
255
+  //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
255 256
   #define  DEFAULT_bedKp 10.00
256 257
   #define  DEFAULT_bedKi .023
257 258
   #define  DEFAULT_bedKd 305.4
258 259
 
259
-//120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
260
-//from pidautotune
260
+  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
261
+  //from pidautotune
261 262
   //#define  DEFAULT_bedKp 97.1
262 263
   //#define  DEFAULT_bedKi 1.41
263 264
   //#define  DEFAULT_bedKd 1675.16
264 265
 
265
-// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
266
+  // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
266 267
 #endif // PIDTEMPBED
267 268
 
268 269
 // @section extruder
@@ -503,13 +504,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
503 504
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
504 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 506
 
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 507
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
514 508
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
515 509
 
@@ -781,6 +775,18 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
781 775
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
782 776
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
783 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
+
784 790
 /**********************************************************************\
785 791
  * Support for a filament diameter sensor
786 792
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 12
- 7
Marlin/example_configurations/Felix/Configuration.h View File

@@ -486,13 +486,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
486 486
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
487 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 489
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
497 490
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
498 491
 
@@ -765,6 +758,18 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
765 758
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
766 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 774
  * Support for a filament diameter sensor
770 775
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 13
- 24
Marlin/example_configurations/Hephestos/Configuration.h View File

@@ -208,23 +208,7 @@ Here are some standard links for getting your machine calibrated:
208 208
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
209 209
   #define K1 0.95 //smoothing factor within the PID
210 210
 
211
-  // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
212
-  // Ultimaker
213
-  //#define  DEFAULT_Kp 22.2
214
-  //#define  DEFAULT_Ki 1.08
215
-  //#define  DEFAULT_Kd 114
216
-
217
-  // MakerGear
218
-  //#define  DEFAULT_Kp 7.0
219
-  //#define  DEFAULT_Ki 0.1
220
-  //#define  DEFAULT_Kd 12
221
-
222
-  // Mendel Parts V9 on 12V
223
-  //#define  DEFAULT_Kp 63.0
224
-  //#define  DEFAULT_Ki 2.25
225
-  //#define  DEFAULT_Kd 440
226
-
227
-  // Hephestos (i3)
211
+  // Hephestos i3
228 212
   #define  DEFAULT_Kp 23.05
229 213
   #define  DEFAULT_Ki 2.00
230 214
   #define  DEFAULT_Kd 66.47
@@ -512,13 +496,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
512 496
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
513 497
   //#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 498
 
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 499
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
523 500
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
524 501
 
@@ -790,6 +767,18 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
790 767
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
791 768
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
792 769
 
770
+// Servo deactivation
771
+//
772
+// With this option servos are powered only during movement, then turned off to prevent jitter.
773
+//#define DEACTIVATE_SERVOS_AFTER_MOVE
774
+
775
+#ifdef DEACTIVATE_SERVOS_AFTER_MOVE
776
+  // Delay (in microseconds) before turning the servo off. This depends on the servo speed.
777
+  // 300ms is a good value but you can try less delay.
778
+  // If the servo can't reach the requested position, increase it.
779
+  #define SERVO_DEACTIVATION_DELAY 300
780
+#endif
781
+
793 782
 /**********************************************************************\
794 783
  * Support for a filament diameter sensor
795 784
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 12
- 35
Marlin/example_configurations/K8200/Configuration.h View File

@@ -210,22 +210,6 @@ Here are some standard links for getting your machine calibrated:
210 210
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
211 211
   #define K1 0.95 //smoothing factor within the PID
212 212
 
213
-  // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
214
-  // Ultimaker
215
-  //#define  DEFAULT_Kp 22.2
216
-  //#define  DEFAULT_Ki 1.08
217
-  //#define  DEFAULT_Kd 114
218
-
219
-  // MakerGear
220
-  //#define  DEFAULT_Kp 7.0
221
-  //#define  DEFAULT_Ki 0.1
222
-  //#define  DEFAULT_Kd 12
223
-
224
-  // Mendel Parts V9 on 12V
225
-  //#define  DEFAULT_Kp 63.0
226
-  //#define  DEFAULT_Ki 2.25
227
-  //#define  DEFAULT_Kd 440
228
-
229 213
   // Vellemann K8200 Extruder - calculated with PID Autotune and tested
230 214
   #define  DEFAULT_Kp 24.29
231 215
   #define  DEFAULT_Ki 1.58
@@ -261,18 +245,6 @@ Here are some standard links for getting your machine calibrated:
261 245
 
262 246
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
263 247
 
264
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
265
-  //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
266
-  //#define  DEFAULT_bedKp 10.00
267
-  //#define  DEFAULT_bedKi .023
268
-  //#define  DEFAULT_bedKd 305.4
269
-
270
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
271
-  //from pidautotune
272
-  //#define  DEFAULT_bedKp 97.1
273
-  //#define  DEFAULT_bedKi 1.41
274
-  //#define  DEFAULT_bedKd 1675.16
275
-
276 248
   //Vellemann K8200 PCB heatbed with standard PCU at 60 degreesC - calculated with PID Autotune and tested
277 249
   //from pidautotune
278 250
   #define  DEFAULT_bedKp 341.88
@@ -520,13 +492,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
520 492
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
521 493
   //#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 494
 
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 495
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
531 496
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
532 497
 
@@ -798,6 +763,18 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
798 763
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
799 764
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
800 765
 
766
+// Servo deactivation
767
+//
768
+// With this option servos are powered only during movement, then turned off to prevent jitter.
769
+//#define DEACTIVATE_SERVOS_AFTER_MOVE
770
+
771
+#ifdef DEACTIVATE_SERVOS_AFTER_MOVE
772
+  // Delay (in microseconds) before turning the servo off. This depends on the servo speed.
773
+  // 300ms is a good value but you can try less delay.
774
+  // If the servo can't reach the requested position, increase it.
775
+  #define SERVO_DEACTIVATION_DELAY 300
776
+#endif
777
+
801 778
 /**********************************************************************\
802 779
  * Support for a filament diameter sensor
803 780
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 12
- 7
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h View File

@@ -504,13 +504,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
504 504
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
505 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 507
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
515 508
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
516 509
 
@@ -782,6 +775,18 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
782 775
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
783 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 791
  * Support for a filament diameter sensor
787 792
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 19
- 24
Marlin/example_configurations/RigidBot/Configuration.h View File

@@ -211,16 +211,6 @@ Here are some standard links for getting your machine calibrated:
211 211
   #define  DEFAULT_Ki 4.21      //Base DGlass3D/E3Dv6 = 0.85 ; RigidBot redesigned = 0.85
212 212
   #define  DEFAULT_Kd 88.41     //Base DGlass3D/E3Dv6 = 245  ; RigidBot redesigned = 76.55
213 213
 
214
-  // MakerGear
215
-  //#define  DEFAULT_Kp 7.0
216
-  //#define  DEFAULT_Ki 0.1
217
-  //#define  DEFAULT_Kd 12
218
-
219
-  // Mendel Parts V9 on 12V
220
-  //#define  DEFAULT_Kp 63.0
221
-  //#define  DEFAULT_Ki 2.25
222
-  //#define  DEFAULT_Kd 440
223
-
224 214
 #endif // PIDTEMP
225 215
 
226 216
 //===========================================================================
@@ -256,12 +246,6 @@ Here are some standard links for getting your machine calibrated:
256 246
   #define  DEFAULT_bedKi 66.5
257 247
   #define  DEFAULT_bedKd 480
258 248
 
259
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
260
-  //from pidautotune
261
-  //#define  DEFAULT_bedKp 97.1
262
-  //#define  DEFAULT_bedKi 1.41
263
-  //#define  DEFAULT_bedKd 1675.16
264
-
265 249
   // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
266 250
 #endif // PIDTEMPBED
267 251
 
@@ -503,13 +487,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
503 487
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
504 488
   //#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 489
 
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 490
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
514 491
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
515 492
 
@@ -710,6 +687,12 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
710 687
 //#define LCD_I2C_SAINSMART_YWROBOT
711 688
 
712 689
 // PANELOLU2 LCD with status LEDs, separate encoder and click inputs
690
+//
691
+// This uses the LiquidTWI2 library v1.2.3 or later ( https://github.com/lincomatic/LiquidTWI2 )
692
+// Make sure the LiquidTWI2 directory is placed in the Arduino or Sketchbook libraries subdirectory.
693
+// (v1.2.3 no longer requires you to define PANELOLU in the LiquidTWI2.h library header file)
694
+// Note: The PANELOLU2 encoder click input can either be directly connected to a pin
695
+//       (if BTN_ENC defined to != -1) or read through I2C (when BTN_ENC == -1).
713 696
 //#define LCD_I2C_PANELOLU2
714 697
 
715 698
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
@@ -782,6 +765,18 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
782 765
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
783 766
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
784 767
 
768
+// Servo deactivation
769
+//
770
+// With this option servos are powered only during movement, then turned off to prevent jitter.
771
+//#define DEACTIVATE_SERVOS_AFTER_MOVE
772
+
773
+#ifdef DEACTIVATE_SERVOS_AFTER_MOVE
774
+  // Delay (in microseconds) before turning the servo off. This depends on the servo speed.
775
+  // 300ms is a good value but you can try less delay.
776
+  // If the servo can't reach the requested position, increase it.
777
+  #define SERVO_DEACTIVATION_DELAY 300
778
+#endif
779
+
785 780
 /**********************************************************************\
786 781
  * Support for a filament diameter sensor
787 782
  * Also allows adjustment of diameter at print time (vs  at slicing)
@@ -818,4 +813,4 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
818 813
 #include "Configuration_adv.h"
819 814
 #include "thermistortables.h"
820 815
 
821
-#endif //CONFIGURATION_H
816
+#endif //CONFIGURATION_H

+ 13
- 41
Marlin/example_configurations/SCARA/Configuration.h View File

@@ -230,27 +230,6 @@ Here are some standard links for getting your machine calibrated:
230 230
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
231 231
   #define K1 0.95 //smoothing factor within the PID
232 232
 
233
-  // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
234
-  // Ultimaker
235
-  //#define  DEFAULT_Kp 22.2
236
-  //#define  DEFAULT_Ki 1.08
237
-  //#define  DEFAULT_Kd 114
238
-
239
-  // MakerGear
240
-  //#define  DEFAULT_Kp 7.0
241
-  //#define  DEFAULT_Ki 0.1
242
-  //#define  DEFAULT_Kd 12
243
-
244
-  // Mendel Parts V9 on 12V
245
-  //#define  DEFAULT_Kp 63.0
246
-  //#define  DEFAULT_Ki 2.25
247
-  //#define  DEFAULT_Kd 440
248
-  
249
-  // Jhead MK5: From Autotune
250
-  //#define  DEFAULT_Kp 20.92
251
-  //#define  DEFAULT_Ki 1.51
252
-  //#define  DEFAULT_Kd 72.34
253
-    
254 233
   // Merlin Hotend: From Autotune
255 234
   #define  DEFAULT_Kp 24.5
256 235
   #define  DEFAULT_Ki 1.72
@@ -286,24 +265,12 @@ Here are some standard links for getting your machine calibrated:
286 265
 
287 266
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
288 267
 
289
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
290
-  //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
291
-  //#define  DEFAULT_bedKp 10.00
292
-  //#define  DEFAULT_bedKi .023
293
-  //#define  DEFAULT_bedKd 305.4
294
-
295
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
296
-  //from pidautotune
297
-  //#define  DEFAULT_bedKp 97.1
298
-  //#define  DEFAULT_bedKi 1.41
299
-  //#define  DEFAULT_bedKd 1675.16
300
-
301 268
   //12v Heatbed Mk3 12V in parallel
302 269
   //from pidautotune
303 270
   #define  DEFAULT_bedKp 630.14
304 271
   #define  DEFAULT_bedKi 121.71
305 272
   #define  DEFAULT_bedKd 815.64
306
-    
273
+
307 274
   // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
308 275
 #endif // PIDTEMPBED
309 276
 
@@ -545,13 +512,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
545 512
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
546 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.
547 514
 
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 515
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
556 516
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
557 517
 
@@ -823,6 +783,18 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
823 783
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
824 784
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
825 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
+
826 798
 /**********************************************************************\
827 799
  * Support for a filament diameter sensor
828 800
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 12
- 23
Marlin/example_configurations/WITBOX/Configuration.h View File

@@ -208,22 +208,6 @@ Here are some standard links for getting your machine calibrated:
208 208
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
209 209
   #define K1 0.95 //smoothing factor within the PID
210 210
 
211
-  // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
212
-  // Ultimaker
213
-  //#define  DEFAULT_Kp 22.2
214
-  //#define  DEFAULT_Ki 1.08
215
-  //#define  DEFAULT_Kd 114
216
-
217
-  // MakerGear
218
-  //#define  DEFAULT_Kp 7.0
219
-  //#define  DEFAULT_Ki 0.1
220
-  //#define  DEFAULT_Kd 12
221
-
222
-  // Mendel Parts V9 on 12V
223
-  //#define  DEFAULT_Kp 63.0
224
-  //#define  DEFAULT_Ki 2.25
225
-  //#define  DEFAULT_Kd 440
226
-
227 211
   // Witbox
228 212
   #define  DEFAULT_Kp 22.2
229 213
   #define  DEFAULT_Ki 1.08
@@ -512,13 +496,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
512 496
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
513 497
   //#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 498
 
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 499
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
523 500
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
524 501
 
@@ -790,6 +767,18 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
790 767
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
791 768
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
792 769
 
770
+// Servo deactivation
771
+//
772
+// With this option servos are powered only during movement, then turned off to prevent jitter.
773
+//#define DEACTIVATE_SERVOS_AFTER_MOVE
774
+
775
+#ifdef DEACTIVATE_SERVOS_AFTER_MOVE
776
+  // Delay (in microseconds) before turning the servo off. This depends on the servo speed.
777
+  // 300ms is a good value but you can try less delay.
778
+  // If the servo can't reach the requested position, increase it.
779
+  #define SERVO_DEACTIVATION_DELAY 300
780
+#endif
781
+
793 782
 /**********************************************************************\
794 783
  * Support for a filament diameter sensor
795 784
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 33
- 27
Marlin/example_configurations/adafruit/ST7565/Configuration.h View File

@@ -205,21 +205,22 @@ Here are some standard links for getting your machine calibrated:
205 205
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
206 206
   #define K1 0.95 //smoothing factor within the PID
207 207
 
208
-// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
209
-// Ultimaker
210
-    #define  DEFAULT_Kp 22.2
211
-    #define  DEFAULT_Ki 1.08
212
-    #define  DEFAULT_Kd 114
213
-
214
-// MakerGear
215
-//    #define  DEFAULT_Kp 7.0
216
-//    #define  DEFAULT_Ki 0.1
217
-//    #define  DEFAULT_Kd 12
218
-
219
-// Mendel Parts V9 on 12V
220
-//    #define  DEFAULT_Kp 63.0
221
-//    #define  DEFAULT_Ki 2.25
222
-//    #define  DEFAULT_Kd 440
208
+  // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
209
+  // Ultimaker
210
+  #define  DEFAULT_Kp 22.2
211
+  #define  DEFAULT_Ki 1.08
212
+  #define  DEFAULT_Kd 114
213
+
214
+  // MakerGear
215
+  //#define  DEFAULT_Kp 7.0
216
+  //#define  DEFAULT_Ki 0.1
217
+  //#define  DEFAULT_Kd 12
218
+
219
+  // Mendel Parts V9 on 12V
220
+  //#define  DEFAULT_Kp 63.0
221
+  //#define  DEFAULT_Ki 2.25
222
+  //#define  DEFAULT_Kd 440
223
+
223 224
 #endif // PIDTEMP
224 225
 
225 226
 //===========================================================================
@@ -250,19 +251,19 @@ Here are some standard links for getting your machine calibrated:
250 251
 
251 252
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
252 253
 
253
-//120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
254
-//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
254
+  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
255
+  //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
255 256
   #define  DEFAULT_bedKp 10.00
256 257
   #define  DEFAULT_bedKi .023
257 258
   #define  DEFAULT_bedKd 305.4
258 259
 
259
-//120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
260
-//from pidautotune
260
+  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
261
+  //from pidautotune
261 262
   //#define  DEFAULT_bedKp 97.1
262 263
   //#define  DEFAULT_bedKi 1.41
263 264
   //#define  DEFAULT_bedKd 1675.16
264 265
 
265
-// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
266
+  // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
266 267
 #endif // PIDTEMPBED
267 268
 
268 269
 // @section extruder
@@ -503,13 +504,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
503 504
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
504 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 506
 
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 507
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
514 508
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
515 509
 
@@ -781,6 +775,18 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
781 775
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
782 776
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
783 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
+
784 790
 /**********************************************************************\
785 791
  * Support for a filament diameter sensor
786 792
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 12
- 7
Marlin/example_configurations/delta/biv2.5/Configuration.h View File

@@ -624,13 +624,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
624 624
     #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z
625 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 627
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
635 628
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
636 629
 
@@ -909,6 +902,18 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
909 902
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
910 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 918
  * Support for a filament diameter sensor
914 919
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 12
- 7
Marlin/example_configurations/delta/generic/Configuration.h View File

@@ -624,13 +624,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
624 624
     //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z
625 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 627
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
635 628
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
636 629
 
@@ -909,6 +902,18 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
909 902
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
910 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 918
  * Support for a filament diameter sensor
914 919
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 12
- 7
Marlin/example_configurations/delta/kossel_mini/Configuration.h View File

@@ -628,13 +628,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
628 628
     //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z
629 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 631
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
639 632
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
640 633
 
@@ -913,6 +906,18 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
913 906
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
914 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 922
  * Support for a filament diameter sensor
918 923
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 12
- 35
Marlin/example_configurations/delta/kossel_pro/Configuration.h View File

@@ -209,27 +209,11 @@ Here are some standard links for getting your machine calibrated:
209 209
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
210 210
   #define K1 0.95 //smoothing factor within the PID
211 211
 
212
-  // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
213
-  // Ultimaker
214
-  //#define  DEFAULT_Kp 22.2
215
-  //#define  DEFAULT_Ki 1.08
216
-  //#define  DEFAULT_Kd 114
217
-
218 212
   // Kossel Pro
219 213
   #define  DEFAULT_Kp 19.30
220 214
   #define  DEFAULT_Ki 3.51
221 215
   #define  DEFAULT_Kd 26.56
222 216
 
223
-  // MakerGear
224
-  //#define  DEFAULT_Kp 7.0
225
-  //#define  DEFAULT_Ki 0.1
226
-  //#define  DEFAULT_Kd 12
227
-
228
-  // Mendel Parts V9 on 12V
229
-  //#define  DEFAULT_Kp 63.0
230
-  //#define  DEFAULT_Ki 2.25
231
-  //#define  DEFAULT_Kd 440
232
-
233 217
 #endif // PIDTEMP
234 218
 
235 219
 //===========================================================================
@@ -266,18 +250,6 @@ Here are some standard links for getting your machine calibrated:
266 250
   #define  DEFAULT_bedKi 62.77
267 251
   #define  DEFAULT_bedKd 545.98
268 252
 
269
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
270
-  //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
271
-  //#define  DEFAULT_bedKp 10.00
272
-  //#define  DEFAULT_bedKi .023
273
-  //#define  DEFAULT_bedKd 305.4
274
-
275
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
276
-  //from pidautotune
277
-  //#define  DEFAULT_bedKp 97.1
278
-  //#define  DEFAULT_bedKi 1.41
279
-  //#define  DEFAULT_bedKd 1675.16
280
-
281 253
   // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
282 254
 #endif // PIDTEMPBED
283 255
 
@@ -641,13 +613,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
641 613
     #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z
642 614
   #endif
643 615
 
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 616
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
652 617
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
653 618
 
@@ -936,6 +901,18 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
936 901
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
937 902
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
938 903
 
904
+// Servo deactivation
905
+//
906
+// With this option servos are powered only during movement, then turned off to prevent jitter.
907
+//#define DEACTIVATE_SERVOS_AFTER_MOVE
908
+
909
+#ifdef DEACTIVATE_SERVOS_AFTER_MOVE
910
+  // Delay (in microseconds) before turning the servo off. This depends on the servo speed.
911
+  // 300ms is a good value but you can try less delay.
912
+  // If the servo can't reach the requested position, increase it.
913
+  #define SERVO_DEACTIVATION_DELAY 300
914
+#endif
915
+
939 916
 /**********************************************************************\
940 917
  * Support for a filament diameter sensor
941 918
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 12
- 7
Marlin/example_configurations/makibox/Configuration.h View File

@@ -507,13 +507,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
507 507
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
508 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 510
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
518 511
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
519 512
 
@@ -785,6 +778,18 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
785 778
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
786 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 794
  * Support for a filament diameter sensor
790 795
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 12
- 22
Marlin/example_configurations/tvrrug/Round2/Configuration.h View File

@@ -211,21 +211,6 @@ Here are some standard links for getting your machine calibrated:
211 211
   #define  DEFAULT_Ki 2.30
212 212
   #define  DEFAULT_Kd 68.15
213 213
 
214
-  // Ultimaker
215
-  //#define  DEFAULT_Kp 22.2
216
-  //#define  DEFAULT_Ki 1.08
217
-  //#define  DEFAULT_Kd 114
218
-
219
-  // MakerGear
220
-  //#define  DEFAULT_Kp 7.0
221
-  //#define  DEFAULT_Ki 0.1
222
-  //#define  DEFAULT_Kd 12
223
-
224
-  // Mendel Parts V9 on 12V
225
-  //#define  DEFAULT_Kp 63.0
226
-  //#define  DEFAULT_Ki 2.25
227
-  //#define  DEFAULT_Kd 440
228
-
229 214
 #endif // PIDTEMP
230 215
 
231 216
 //===========================================================================
@@ -509,13 +494,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
509 494
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
510 495
   //#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 496
 
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 497
 //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
520 498
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
521 499
 
@@ -791,6 +769,18 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
791 769
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
792 770
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
793 771
 
772
+// Servo deactivation
773
+//
774
+// With this option servos are powered only during movement, then turned off to prevent jitter.
775
+//#define DEACTIVATE_SERVOS_AFTER_MOVE
776
+
777
+#ifdef DEACTIVATE_SERVOS_AFTER_MOVE
778
+  // Delay (in microseconds) before turning the servo off. This depends on the servo speed.
779
+  // 300ms is a good value but you can try less delay.
780
+  // If the servo can't reach the requested position, increase it.
781
+  #define SERVO_DEACTIVATION_DELAY 300
782
+#endif
783
+
794 784
 /**********************************************************************\
795 785
  * Support for a filament diameter sensor
796 786
  * Also allows adjustment of diameter at print time (vs  at slicing)

+ 2
- 2
Marlin/servo.cpp View File

@@ -35,8 +35,8 @@
35 35
 
36 36
  write()     - Sets the servo angle in degrees.  (invalid angle that is valid as pulse in microseconds is treated as microseconds)
37 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 40
  read()      - Gets the last written servo pulse width as an angle between 0 and 180.
41 41
  readMicroseconds()   - Gets the last written servo pulse width in microseconds. (was read_us() in first release)
42 42
  attached()  - Returns true if there is a servo attached.

+ 1
- 1
Marlin/servo.h View File

@@ -41,7 +41,7 @@
41 41
    attached()  - Returns true if there is a servo attached.
42 42
    detach()    - Stops an attached servos from pulsing its i/o pin.
43 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 47
 #ifndef servo_h

Loading…
Cancel
Save