Browse Source

Merge Redo Servo angles (PR#2554)

Richard Wackerbarth 10 years ago
parent
commit
819fa7216e

+ 4
- 4
Marlin/Conditionals.h View File

@@ -513,8 +513,7 @@
513 513
 
514 514
   #define HAS_BUZZER ((defined(BEEPER) && BEEPER >= 0) || defined(LCD_USE_I2C_BUZZER))
515 515
 
516
-
517
-  #if defined( NUM_SERVOS ) && (NUM_SERVOS > 0)
516
+  #if defined(NUM_SERVOS) && NUM_SERVOS > 0
518 517
     #ifndef X_ENDSTOP_SERVO_NR
519 518
       #define X_ENDSTOP_SERVO_NR -1
520 519
     #endif
@@ -524,8 +523,9 @@
524 523
     #ifndef Z_ENDSTOP_SERVO_NR
525 524
       #define Z_ENDSTOP_SERVO_NR -1
526 525
     #endif
527
-    #if (X_ENDSTOP_SERVO_NR >= 0) || (Y_ENDSTOP_SERVO_NR >= 0) || (Z_ENDSTOP_SERVO_NR >= 0)
528
-      #define SERVO_ENDSTOPS {X_ENDSTOP_SERVO_NR, Y_ENDSTOP_SERVO_NR, Z_ENDSTOP_SERVO_NR}
526
+    #if X_ENDSTOP_SERVO_NR >= 0 || Y_ENDSTOP_SERVO_NR >= 0 || Z_ENDSTOP_SERVO_NR >= 0
527
+      #define HAS_SERVO_ENDSTOPS true
528
+      #define SERVO_ENDSTOP_IDS { X_ENDSTOP_SERVO_NR, Y_ENDSTOP_SERVO_NR, Z_ENDSTOP_SERVO_NR }
529 529
     #endif
530 530
   #endif
531 531
 

+ 1
- 1
Marlin/Configuration.h View File

@@ -530,7 +530,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
530 530
   // If you want to still use the Z min endstop for homing, disable Z_SAFE_HOMING above. Eg; to park the head outside the bed area when homing with G28.
531 531
   // WARNING: The Z MIN endstop will need to set properly as it would without a Z PROBE to prevent head crashes and premature stopping during a print.
532 532
   // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
533
-  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
533
+  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES in the R/C Servo below.
534 534
   // RAMPS 1.3/1.4 boards may be able to use the 5V, Ground and the D32 pin in the Aux 4 section of the RAMPS board. Use 5V for powered sensors, otherwise connect to ground and D32
535 535
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.
536 536
   // The D32 pin in Aux 4 on RAMPS maps to the Arduino D32 pin. Z_PROBE_PIN is setting the pin to use on the Arduino. Since the D32 pin on the RAMPS maps to D32 on Arduino, this works.

+ 25
- 25
Marlin/Marlin_main.cpp View File

@@ -314,9 +314,9 @@ bool target_direction;
314 314
   };
315 315
 #endif
316 316
 
317
-#ifdef SERVO_ENDSTOPS
318
-  const int servo_endstops[] = SERVO_ENDSTOPS;
319
-  const int servo_endstop_angles[][2] = SERVO_ENDSTOP_ANGLES;
317
+#if HAS_SERVO_ENDSTOPS
318
+  const int servo_endstop_id[] = SERVO_ENDSTOP_IDS;
319
+  const int servo_endstop_angle[][2] = SERVO_ENDSTOP_ANGLES;
320 320
 #endif
321 321
 
322 322
 #ifdef BARICUDA
@@ -578,10 +578,10 @@ void servo_init() {
578 578
   #endif
579 579
 
580 580
   // Set position of Servo Endstops that are defined
581
-  #ifdef SERVO_ENDSTOPS
581
+  #if HAS_SERVO_ENDSTOPS
582 582
     for (int i = 0; i < 3; i++)
583
-      if (servo_endstops[i] >= 0)
584
-        servo[servo_endstops[i]].move(servo_endstop_angles[i][1]);
583
+      if (servo_endstop_id[i] >= 0)
584
+        servo[servo_endstop_id[i]].move(servo_endstop_angle[i][1]);
585 585
   #endif
586 586
 
587 587
 }
@@ -1322,10 +1322,10 @@ static void setup_for_endstop_move() {
1322 1322
 
1323 1323
   static void deploy_z_probe() {
1324 1324
 
1325
-    #ifdef SERVO_ENDSTOPS
1325
+    #if HAS_SERVO_ENDSTOPS
1326 1326
 
1327 1327
       // Engage Z Servo endstop if enabled
1328
-      if (servo_endstops[Z_AXIS] >= 0) servo[servo_endstops[Z_AXIS]].move(servo_endstop_angles[Z_AXIS][0]);
1328
+      if (servo_endstop_id[Z_AXIS] >= 0) servo[servo_endstop_id[Z_AXIS]].move(servo_endstop_angle[Z_AXIS][0]);
1329 1329
 
1330 1330
     #elif defined(Z_PROBE_ALLEN_KEY)
1331 1331
       feedrate = Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE;
@@ -1412,10 +1412,10 @@ static void setup_for_endstop_move() {
1412 1412
 
1413 1413
   static void stow_z_probe(bool doRaise=true) {
1414 1414
 
1415
-    #ifdef SERVO_ENDSTOPS
1415
+    #if HAS_SERVO_ENDSTOPS
1416 1416
 
1417 1417
       // Retract Z Servo endstop if enabled
1418
-      if (servo_endstops[Z_AXIS] >= 0) {
1418
+      if (servo_endstop_id[Z_AXIS] >= 0) {
1419 1419
 
1420 1420
         #if Z_RAISE_AFTER_PROBING > 0
1421 1421
           if (doRaise) {
@@ -1425,7 +1425,7 @@ static void setup_for_endstop_move() {
1425 1425
         #endif
1426 1426
 
1427 1427
         // Change the Z servo angle
1428
-        servo[servo_endstops[Z_AXIS]].move(servo_endstop_angles[Z_AXIS][1]);
1428
+        servo[servo_endstop_id[Z_AXIS]].move(servo_endstop_angle[Z_AXIS][1]);
1429 1429
       }
1430 1430
 
1431 1431
     #elif defined(Z_PROBE_ALLEN_KEY)
@@ -1676,10 +1676,10 @@ static void homeaxis(AxisEnum axis) {
1676 1676
 
1677 1677
     #endif
1678 1678
 
1679
-    #ifdef SERVO_ENDSTOPS
1679
+    #if HAS_SERVO_ENDSTOPS
1680 1680
       // Engage Servo endstop if enabled
1681
-      if (axis != Z_AXIS && servo_endstops[axis] >= 0)
1682
-        servo[servo_endstops[axis]].move(servo_endstop_angles[axis][0]);
1681
+      if (axis != Z_AXIS && servo_endstop_id[axis] >= 0)
1682
+        servo[servo_endstop_id[axis]].move(servo_endstop_angle[axis][0]);
1683 1683
     #endif
1684 1684
 
1685 1685
     // Set a flag for Z motor locking
@@ -1778,10 +1778,10 @@ static void homeaxis(AxisEnum axis) {
1778 1778
     #endif
1779 1779
 
1780 1780
     {
1781
-      #ifdef SERVO_ENDSTOPS
1781
+      #if HAS_SERVO_ENDSTOPS
1782 1782
         // Retract Servo endstop if enabled
1783
-        if (servo_endstops[axis] >= 0)
1784
-          servo[servo_endstops[axis]].move(servo_endstop_angles[axis][1]);
1783
+        if (servo_endstop_id[axis] >= 0)
1784
+          servo[servo_endstop_id[axis]].move(servo_endstop_angle[axis][1]);
1785 1785
       #endif
1786 1786
     }
1787 1787
 
@@ -2778,7 +2778,7 @@ inline void gcode_G28() {
2778 2778
         //      added here, it could be seen as a compensating factor for the Z probe.
2779 2779
         //
2780 2780
         current_position[Z_AXIS] = -zprobe_zoffset + (z_tmp - real_z)
2781
-          #if defined(SERVO_ENDSTOPS) || ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED)
2781
+          #if HAS_SERVO_ENDSTOPS || ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED)
2782 2782
              + Z_RAISE_AFTER_PROBING
2783 2783
           #endif
2784 2784
           ;
@@ -4570,9 +4570,9 @@ inline void gcode_M303() {
4570 4570
  */
4571 4571
 inline void gcode_M400() { st_synchronize(); }
4572 4572
 
4573
-#if defined(ENABLE_AUTO_BED_LEVELING) && !defined(Z_PROBE_SLED) && (defined(SERVO_ENDSTOPS) || defined(Z_PROBE_ALLEN_KEY))
4573
+#if defined(ENABLE_AUTO_BED_LEVELING) && !defined(Z_PROBE_SLED) && (HAS_SERVO_ENDSTOPS || defined(Z_PROBE_ALLEN_KEY))
4574 4574
 
4575
-  #ifdef SERVO_ENDSTOPS
4575
+  #if HAS_SERVO_ENDSTOPS
4576 4576
     void raise_z_for_servo() {
4577 4577
       float zpos = current_position[Z_AXIS], z_dest = Z_RAISE_BEFORE_HOMING;
4578 4578
       z_dest += axis_known_position[Z_AXIS] ? zprobe_zoffset : zpos;
@@ -4584,7 +4584,7 @@ inline void gcode_M400() { st_synchronize(); }
4584 4584
    * M401: Engage Z Servo endstop if available
4585 4585
    */
4586 4586
   inline void gcode_M401() {
4587
-    #ifdef SERVO_ENDSTOPS
4587
+    #if HAS_SERVO_ENDSTOPS
4588 4588
       raise_z_for_servo();
4589 4589
     #endif
4590 4590
     deploy_z_probe();
@@ -4594,13 +4594,13 @@ inline void gcode_M400() { st_synchronize(); }
4594 4594
    * M402: Retract Z Servo endstop if enabled
4595 4595
    */
4596 4596
   inline void gcode_M402() {
4597
-    #ifdef SERVO_ENDSTOPS
4597
+    #if HAS_SERVO_ENDSTOPS
4598 4598
       raise_z_for_servo();
4599 4599
     #endif
4600 4600
     stow_z_probe(false);
4601 4601
   }
4602 4602
 
4603
-#endif // ENABLE_AUTO_BED_LEVELING && (SERVO_ENDSTOPS || Z_PROBE_ALLEN_KEY) && !Z_PROBE_SLED
4603
+#endif // ENABLE_AUTO_BED_LEVELING && (HAS_SERVO_ENDSTOPS || Z_PROBE_ALLEN_KEY) && !Z_PROBE_SLED
4604 4604
 
4605 4605
 #ifdef FILAMENT_SENSOR
4606 4606
 
@@ -5645,14 +5645,14 @@ void process_next_command() {
5645 5645
         gcode_M400();
5646 5646
         break;
5647 5647
 
5648
-      #if defined(ENABLE_AUTO_BED_LEVELING) && (defined(SERVO_ENDSTOPS) || defined(Z_PROBE_ALLEN_KEY)) && !defined(Z_PROBE_SLED)
5648
+      #if defined(ENABLE_AUTO_BED_LEVELING) && (HAS_SERVO_ENDSTOPS || defined(Z_PROBE_ALLEN_KEY)) && !defined(Z_PROBE_SLED)
5649 5649
         case 401:
5650 5650
           gcode_M401();
5651 5651
           break;
5652 5652
         case 402:
5653 5653
           gcode_M402();
5654 5654
           break;
5655
-      #endif // ENABLE_AUTO_BED_LEVELING && (SERVO_ENDSTOPS || Z_PROBE_ALLEN_KEY) && !Z_PROBE_SLED
5655
+      #endif // ENABLE_AUTO_BED_LEVELING && (HAS_SERVO_ENDSTOPS || Z_PROBE_ALLEN_KEY) && !Z_PROBE_SLED
5656 5656
 
5657 5657
       #ifdef FILAMENT_SENSOR
5658 5658
         case 404:  //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or display nominal filament width

+ 1
- 1
Marlin/SanityCheck.h View File

@@ -98,7 +98,7 @@
98 98
   /**
99 99
    * Servo deactivation depends on servo endstops
100 100
    */
101
-  #if defined(DEACTIVATE_SERVOS_AFTER_MOVE) && !defined(SERVO_ENDSTOPS)
101
+  #if defined(DEACTIVATE_SERVOS_AFTER_MOVE) && !HAS_SERVO_ENDSTOPS
102 102
     #error At least one of the ?_ENDSTOP_SERVO_NR is required for DEACTIVATE_SERVOS_AFTER_MOVE.
103 103
   #endif
104 104
 

+ 1
- 1
Marlin/configurator/config/Configuration.h View File

@@ -530,7 +530,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
530 530
   // If you want to still use the Z min endstop for homing, disable Z_SAFE_HOMING above. Eg; to park the head outside the bed area when homing with G28.
531 531
   // WARNING: The Z MIN endstop will need to set properly as it would without a Z PROBE to prevent head crashes and premature stopping during a print.
532 532
   // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
533
-  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
533
+  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES in the R/C Servo below.
534 534
   // RAMPS 1.3/1.4 boards may be able to use the 5V, Ground and the D32 pin in the Aux 4 section of the RAMPS board. Use 5V for powered sensors, otherwise connect to ground and D32
535 535
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.
536 536
   // The D32 pin in Aux 4 on RAMPS maps to the Arduino D32 pin. Z_PROBE_PIN is setting the pin to use on the Arduino. Since the D32 pin on the RAMPS maps to D32 on Arduino, this works.

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

@@ -512,7 +512,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
512 512
   // If you want to still use the Z min endstop for homing, disable Z_SAFE_HOMING above. Eg; to park the head outside the bed area when homing with G28.
513 513
   // WARNING: The Z MIN endstop will need to set properly as it would without a Z PROBE to prevent head crashes and premature stopping during a print.
514 514
   // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
515
-  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
515
+  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES in the R/C Servo below.
516 516
   // RAMPS 1.3/1.4 boards may be able to use the 5V, Ground and the D32 pin in the Aux 4 section of the RAMPS board. Use 5V for powered sensors, otherwise connect to ground and D32
517 517
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.
518 518
   // The D32 pin in Aux 4 on RAMPS maps to the Arduino D32 pin. Z_PROBE_PIN is setting the pin to use on the Arduino. Since the D32 pin on the RAMPS maps to D32 on Arduino, this works.

+ 1
- 1
Marlin/example_configurations/Felix/Configuration_DUAL.h View File

@@ -473,7 +473,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
473 473
   // If you want to still use the Z min endstop for homing, disable Z_SAFE_HOMING above. Eg; to park the head outside the bed area when homing with G28.
474 474
   // WARNING: The Z MIN endstop will need to set properly as it would without a Z PROBE to prevent head crashes and premature stopping during a print.
475 475
   // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
476
-  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
476
+  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES in the R/C Servo below.
477 477
   // RAMPS 1.3/1.4 boards may be able to use the 5V, Ground and the D32 pin in the Aux 4 section of the RAMPS board. Use 5V for powered sensors, otherwise connect to ground and D32
478 478
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.
479 479
   // The D32 pin in Aux 4 on RAMPS maps to the Arduino D32 pin. Z_PROBE_PIN is setting the pin to use on the Arduino. Since the D32 pin on the RAMPS maps to D32 on Arduino, this works.

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

@@ -522,7 +522,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
522 522
   // If you want to still use the Z min endstop for homing, disable Z_SAFE_HOMING above. Eg; to park the head outside the bed area when homing with G28.
523 523
   // WARNING: The Z MIN endstop will need to set properly as it would without a Z PROBE to prevent head crashes and premature stopping during a print.
524 524
   // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
525
-  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
525
+  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES in the R/C Servo below.
526 526
   // RAMPS 1.3/1.4 boards may be able to use the 5V, Ground and the D32 pin in the Aux 4 section of the RAMPS board. Use 5V for powered sensors, otherwise connect to ground and D32
527 527
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.
528 528
   // The D32 pin in Aux 4 on RAMPS maps to the Arduino D32 pin. Z_PROBE_PIN is setting the pin to use on the Arduino. Since the D32 pin on the RAMPS maps to D32 on Arduino, this works.

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

@@ -518,7 +518,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
518 518
   // If you want to still use the Z min endstop for homing, disable Z_SAFE_HOMING above. Eg; to park the head outside the bed area when homing with G28.
519 519
   // WARNING: The Z MIN endstop will need to set properly as it would without a Z PROBE to prevent head crashes and premature stopping during a print.
520 520
   // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
521
-  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
521
+  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES in the R/C Servo below.
522 522
   // RAMPS 1.3/1.4 boards may be able to use the 5V, Ground and the D32 pin in the Aux 4 section of the RAMPS board. Use 5V for powered sensors, otherwise connect to ground and D32
523 523
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.
524 524
   // The D32 pin in Aux 4 on RAMPS maps to the Arduino D32 pin. Z_PROBE_PIN is setting the pin to use on the Arduino. Since the D32 pin on the RAMPS maps to D32 on Arduino, this works.

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

@@ -530,7 +530,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
530 530
   // If you want to still use the Z min endstop for homing, disable Z_SAFE_HOMING above. Eg; to park the head outside the bed area when homing with G28.
531 531
   // WARNING: The Z MIN endstop will need to set properly as it would without a Z PROBE to prevent head crashes and premature stopping during a print.
532 532
   // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
533
-  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
533
+  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES in the R/C Servo below.
534 534
   // RAMPS 1.3/1.4 boards may be able to use the 5V, Ground and the D32 pin in the Aux 4 section of the RAMPS board. Use 5V for powered sensors, otherwise connect to ground and D32
535 535
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.
536 536
   // The D32 pin in Aux 4 on RAMPS maps to the Arduino D32 pin. Z_PROBE_PIN is setting the pin to use on the Arduino. Since the D32 pin on the RAMPS maps to D32 on Arduino, this works.

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

@@ -510,7 +510,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
510 510
   // If you want to still use the Z min endstop for homing, disable Z_SAFE_HOMING above. Eg; to park the head outside the bed area when homing with G28.
511 511
   // WARNING: The Z MIN endstop will need to set properly as it would without a Z PROBE to prevent head crashes and premature stopping during a print.
512 512
   // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
513
-  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
513
+  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES in the R/C Servo below.
514 514
   // RAMPS 1.3/1.4 boards may be able to use the 5V, Ground and the D32 pin in the Aux 4 section of the RAMPS board. Use 5V for powered sensors, otherwise connect to ground and D32
515 515
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.
516 516
   // The D32 pin in Aux 4 on RAMPS maps to the Arduino D32 pin. Z_PROBE_PIN is setting the pin to use on the Arduino. Since the D32 pin on the RAMPS maps to D32 on Arduino, this works.

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

@@ -538,7 +538,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
538 538
   // If you want to still use the Z min endstop for homing, disable Z_SAFE_HOMING above. Eg; to park the head outside the bed area when homing with G28.
539 539
   // WARNING: The Z MIN endstop will need to set properly as it would without a Z PROBE to prevent head crashes and premature stopping during a print.
540 540
   // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
541
-  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
541
+  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES in the R/C Servo below.
542 542
   // RAMPS 1.3/1.4 boards may be able to use the 5V, Ground and the D32 pin in the Aux 4 section of the RAMPS board. Use 5V for powered sensors, otherwise connect to ground and D32
543 543
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.
544 544
   // The D32 pin in Aux 4 on RAMPS maps to the Arduino D32 pin. Z_PROBE_PIN is setting the pin to use on the Arduino. Since the D32 pin on the RAMPS maps to D32 on Arduino, this works.

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

@@ -522,7 +522,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
522 522
   // If you want to still use the Z min endstop for homing, disable Z_SAFE_HOMING above. Eg; to park the head outside the bed area when homing with G28.
523 523
   // WARNING: The Z MIN endstop will need to set properly as it would without a Z PROBE to prevent head crashes and premature stopping during a print.
524 524
   // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
525
-  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
525
+  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES in the R/C Servo below.
526 526
   // RAMPS 1.3/1.4 boards may be able to use the 5V, Ground and the D32 pin in the Aux 4 section of the RAMPS board. Use 5V for powered sensors, otherwise connect to ground and D32
527 527
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.
528 528
   // The D32 pin in Aux 4 on RAMPS maps to the Arduino D32 pin. Z_PROBE_PIN is setting the pin to use on the Arduino. Since the D32 pin on the RAMPS maps to D32 on Arduino, this works.

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

@@ -530,7 +530,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
530 530
   // If you want to still use the Z min endstop for homing, disable Z_SAFE_HOMING above. Eg; to park the head outside the bed area when homing with G28.
531 531
   // WARNING: The Z MIN endstop will need to set properly as it would without a Z PROBE to prevent head crashes and premature stopping during a print.
532 532
   // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
533
-  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
533
+  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES in the R/C Servo below.
534 534
   // RAMPS 1.3/1.4 boards may be able to use the 5V, Ground and the D32 pin in the Aux 4 section of the RAMPS board. Use 5V for powered sensors, otherwise connect to ground and D32
535 535
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.
536 536
   // The D32 pin in Aux 4 on RAMPS maps to the Arduino D32 pin. Z_PROBE_PIN is setting the pin to use on the Arduino. Since the D32 pin on the RAMPS maps to D32 on Arduino, this works.

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

@@ -650,7 +650,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
650 650
   // If you want to still use the Z min endstop for homing, disable Z_SAFE_HOMING above. Eg; to park the head outside the bed area when homing with G28.
651 651
   // WARNING: The Z MIN endstop will need to set properly as it would without a Z PROBE to prevent head crashes and premature stopping during a print.
652 652
   // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
653
-  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
653
+  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES in the R/C Servo below.
654 654
   // RAMPS 1.3/1.4 boards may be able to use the 5V, Ground and the D32 pin in the Aux 4 section of the RAMPS board. Use 5V for powered sensors, otherwise connect to ground and D32
655 655
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.
656 656
   // The D32 pin in Aux 4 on RAMPS maps to the Arduino D32 pin. Z_PROBE_PIN is setting the pin to use on the Arduino. Since the D32 pin on the RAMPS maps to D32 on Arduino, this works.

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

@@ -650,7 +650,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
650 650
   // If you want to still use the Z min endstop for homing, disable Z_SAFE_HOMING above. Eg; to park the head outside the bed area when homing with G28.
651 651
   // WARNING: The Z MIN endstop will need to set properly as it would without a Z PROBE to prevent head crashes and premature stopping during a print.
652 652
   // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
653
-  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
653
+  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES in the R/C Servo below.
654 654
   // RAMPS 1.3/1.4 boards may be able to use the 5V, Ground and the D32 pin in the Aux 4 section of the RAMPS board. Use 5V for powered sensors, otherwise connect to ground and D32
655 655
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.
656 656
   // The D32 pin in Aux 4 on RAMPS maps to the Arduino D32 pin. Z_PROBE_PIN is setting the pin to use on the Arduino. Since the D32 pin on the RAMPS maps to D32 on Arduino, this works.

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

@@ -654,7 +654,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
654 654
   // If you want to still use the Z min endstop for homing, disable Z_SAFE_HOMING above. Eg; to park the head outside the bed area when homing with G28.
655 655
   // WARNING: The Z MIN endstop will need to set properly as it would without a Z PROBE to prevent head crashes and premature stopping during a print.
656 656
   // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
657
-  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
657
+  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES in the R/C Servo below.
658 658
   // RAMPS 1.3/1.4 boards may be able to use the 5V, Ground and the D32 pin in the Aux 4 section of the RAMPS board. Use 5V for powered sensors, otherwise connect to ground and D32
659 659
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.
660 660
   // The D32 pin in Aux 4 on RAMPS maps to the Arduino D32 pin. Z_PROBE_PIN is setting the pin to use on the Arduino. Since the D32 pin on the RAMPS maps to D32 on Arduino, this works.

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

@@ -639,7 +639,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
639 639
   // If you want to still use the Z min endstop for homing, disable Z_SAFE_HOMING above. Eg; to park the head outside the bed area when homing with G28.
640 640
   // WARNING: The Z MIN endstop will need to set properly as it would without a Z PROBE to prevent head crashes and premature stopping during a print.
641 641
   // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
642
-  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
642
+  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES in the R/C Servo below.
643 643
   // RAMPS 1.3/1.4 boards may be able to use the 5V, Ground and the D32 pin in the Aux 4 section of the RAMPS board. Use 5V for powered sensors, otherwise connect to ground and D32
644 644
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.
645 645
   // The D32 pin in Aux 4 on RAMPS maps to the Arduino D32 pin. Z_PROBE_PIN is setting the pin to use on the Arduino. Since the D32 pin on the RAMPS maps to D32 on Arduino, this works.

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

@@ -533,7 +533,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
533 533
   // If you want to still use the Z min endstop for homing, disable Z_SAFE_HOMING above. Eg; to park the head outside the bed area when homing with G28.
534 534
   // WARNING: The Z MIN endstop will need to set properly as it would without a Z PROBE to prevent head crashes and premature stopping during a print.
535 535
   // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
536
-  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
536
+  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES in the R/C Servo below.
537 537
   // RAMPS 1.3/1.4 boards may be able to use the 5V, Ground and the D32 pin in the Aux 4 section of the RAMPS board. Use 5V for powered sensors, otherwise connect to ground and D32
538 538
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.
539 539
   // The D32 pin in Aux 4 on RAMPS maps to the Arduino D32 pin. Z_PROBE_PIN is setting the pin to use on the Arduino. Since the D32 pin on the RAMPS maps to D32 on Arduino, this works.

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

@@ -520,7 +520,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
520 520
   // If you want to still use the Z min endstop for homing, disable Z_SAFE_HOMING above. Eg; to park the head outside the bed area when homing with G28.
521 521
   // WARNING: The Z MIN endstop will need to set properly as it would without a Z PROBE to prevent head crashes and premature stopping during a print.
522 522
   // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
523
-  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
523
+  // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES in the R/C Servo below.
524 524
   // RAMPS 1.3/1.4 boards may be able to use the 5V, Ground and the D32 pin in the Aux 4 section of the RAMPS board. Use 5V for powered sensors, otherwise connect to ground and D32
525 525
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.
526 526
   // The D32 pin in Aux 4 on RAMPS maps to the Arduino D32 pin. Z_PROBE_PIN is setting the pin to use on the Arduino. Since the D32 pin on the RAMPS maps to D32 on Arduino, this works.

Loading…
Cancel
Save