Explorar el Código

Spacing and spelling

Scott Lahteine hace 10 años
padre
commit
c065da52ec

+ 1
- 1
Marlin/Configuration.h Ver fichero

@@ -503,7 +503,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
503 503
   // If you would like to use both a Z PROBE and a Z MIN endstop together or just a Z PROBE with a custom pin, uncomment #define Z_PROBE_ENDSTOP and read the instructions below.
504 504
   // 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.
505 505
   // 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.
506
-  // To use a separte Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
506
+  // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
507 507
   // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, SERVO_ENDSTOPS and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
508 508
   // 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
509 509
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.

+ 2
- 3
Marlin/MarlinSerial.cpp Ver fichero

@@ -287,7 +287,6 @@ MarlinSerial MSerial;
287 287
 #endif // !AT90USB
288 288
 
289 289
 // For AT90USB targets use the UART for BT interfacing
290
-#if defined(AT90USB) && defined (BTENABLED)
291
-   HardwareSerial bt;
290
+#if defined(AT90USB) && defined(BTENABLED)
291
+  HardwareSerial bt;
292 292
 #endif
293
-

+ 2
- 2
Marlin/MarlinSerial.h Ver fichero

@@ -153,8 +153,8 @@ extern MarlinSerial MSerial;
153 153
 #endif // !AT90USB
154 154
 
155 155
 // Use the UART for BT in AT90USB configurations
156
-#if defined(AT90USB) && defined (BTENABLED)
157
-   extern HardwareSerial bt;
156
+#if defined(AT90USB) && defined(BTENABLED)
157
+  extern HardwareSerial bt;
158 158
 #endif
159 159
 
160 160
 #endif

+ 3
- 3
Marlin/Marlin_main.cpp Ver fichero

@@ -2776,13 +2776,13 @@ inline void gcode_M42() {
2776 2776
 
2777 2777
 #if defined(ENABLE_AUTO_BED_LEVELING) && defined(Z_PROBE_REPEATABILITY_TEST)
2778 2778
 
2779
-  // This is redudant since the SanityCheck.h already checks for a valid Z_PROBE_PIN, but here for clarity.
2779
+  // This is redundant since the SanityCheck.h already checks for a valid Z_PROBE_PIN, but here for clarity.
2780 2780
   #ifdef Z_PROBE_ENDSTOP
2781 2781
     #if !HAS_Z_PROBE
2782
-      #error "You must have a Z_PROBE_PIN defined in order to enable calculation of Z-Probe repeatability."
2782
+      #error You must define Z_PROBE_PIN to enable Z-Probe repeatability calculation.
2783 2783
     #endif
2784 2784
   #elif !HAS_Z_MIN
2785
-    #error "You must have a Z_MIN_PIN defined in order to enable calculation of Z-Probe repeatability."
2785
+    #error You must define Z_MIN_PIN to enable Z-Probe repeatability calculation.
2786 2786
   #endif
2787 2787
 
2788 2788
   /**

+ 1
- 1
Marlin/SanityCheck.h Ver fichero

@@ -100,7 +100,7 @@
100 100
      * Require a Z Min pin
101 101
      */
102 102
     #if Z_MIN_PIN == -1
103
-      #if Z_PROBE_PIN == -1 || (! defined (Z_PROBE_ENDSTOP) || defined (DISABLE_Z_PROBE_ENDSTOP)) // It's possible for someone to set a pin for the Z Probe, but not enable it.
103
+      #if Z_PROBE_PIN == -1 || (!defined(Z_PROBE_ENDSTOP) || defined(DISABLE_Z_PROBE_ENDSTOP)) // It's possible for someone to set a pin for the Z Probe, but not enable it.
104 104
         #ifdef Z_PROBE_REPEATABILITY_TEST
105 105
           #error You must have a Z_MIN or Z_PROBE endstop to enable Z_PROBE_REPEATABILITY_TEST.
106 106
         #else

+ 1
- 1
Marlin/Servo.h Ver fichero

@@ -123,7 +123,7 @@ class Servo {
123 123
     int read();                        // returns current pulse width as an angle between 0 and 180 degrees
124 124
     int readMicroseconds();            // returns current pulse width in microseconds for this servo (was read_us() in first release)
125 125
     bool attached();                   // return true if this servo is attached, otherwise false
126
-    #if defined (ENABLE_AUTO_BED_LEVELING) && (PROBE_SERVO_DEACTIVATION_DELAY > 0)
126
+    #if defined(ENABLE_AUTO_BED_LEVELING) && PROBE_SERVO_DEACTIVATION_DELAY > 0
127 127
       int pin;                           // store the hardware pin of the servo
128 128
     #endif
129 129
   private:

+ 1
- 1
Marlin/configurator/config/Configuration.h Ver fichero

@@ -523,7 +523,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
523 523
   // If you would like to use both a Z PROBE and a Z MIN endstop together or just a Z PROBE with a custom pin, uncomment #define Z_PROBE_ENDSTOP and read the instructions below.
524 524
   // 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.
525 525
   // 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.
526
-  // To use a separte Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
526
+  // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
527 527
   // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, SERVO_ENDSTOPS and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
528 528
   // 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
529 529
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.

+ 1
- 1
Marlin/example_configurations/Felix/Configuration.h Ver fichero

@@ -473,7 +473,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
473 473
   // If you would like to use both a Z PROBE and a Z MIN endstop together or just a Z PROBE with a custom pin, uncomment #define Z_PROBE_ENDSTOP and read the instructions below.
474 474
   // 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.
475 475
   // 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.
476
-  // To use a separte Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
476
+  // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
477 477
   // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, SERVO_ENDSTOPS and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
478 478
   // 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
479 479
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.

+ 1
- 1
Marlin/example_configurations/Felix/Configuration_DUAL.h Ver fichero

@@ -473,7 +473,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
473 473
   // If you would like to use both a Z PROBE and a Z MIN endstop together or just a Z PROBE with a custom pin, uncomment #define Z_PROBE_ENDSTOP and read the instructions below.
474 474
   // 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.
475 475
   // 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.
476
-  // To use a separte Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
476
+  // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
477 477
   // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, SERVO_ENDSTOPS and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
478 478
   // 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
479 479
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.

+ 1
- 1
Marlin/example_configurations/Hephestos/Configuration.h Ver fichero

@@ -496,7 +496,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
496 496
   // If you would like to use both a Z PROBE and a Z MIN endstop together or just a Z PROBE with a custom pin, uncomment #define Z_PROBE_ENDSTOP and read the instructions below.
497 497
   // 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.
498 498
   // 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.
499
-  // To use a separte Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
499
+  // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
500 500
   // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, SERVO_ENDSTOPS and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
501 501
   // 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
502 502
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.

+ 1
- 1
Marlin/example_configurations/K8200/Configuration.h Ver fichero

@@ -501,7 +501,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
501 501
   // If you would like to use both a Z PROBE and a Z MIN endstop together or just a Z PROBE with a custom pin, uncomment #define Z_PROBE_ENDSTOP and read the instructions below.
502 502
   // 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.
503 503
   // 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.
504
-  // To use a separte Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
504
+  // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
505 505
   // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, SERVO_ENDSTOPS and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
506 506
   // 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
507 507
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.

+ 1
- 1
Marlin/example_configurations/SCARA/Configuration.h Ver fichero

@@ -525,7 +525,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
525 525
   // If you would like to use both a Z PROBE and a Z MIN endstop together or just a Z PROBE with a custom pin, uncomment #define Z_PROBE_ENDSTOP and read the instructions below.
526 526
   // 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.
527 527
   // 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.
528
-  // To use a separte Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
528
+  // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
529 529
   // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, SERVO_ENDSTOPS and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
530 530
   // 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
531 531
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.

+ 1
- 1
Marlin/example_configurations/WITBOX/Configuration.h Ver fichero

@@ -495,7 +495,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
495 495
   // If you would like to use both a Z PROBE and a Z MIN endstop together or just a Z PROBE with a custom pin, uncomment #define Z_PROBE_ENDSTOP and read the instructions below.
496 496
   // 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.
497 497
   // 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.
498
-  // To use a separte Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
498
+  // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
499 499
   // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, SERVO_ENDSTOPS and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
500 500
   // 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
501 501
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.

+ 1
- 1
Marlin/example_configurations/delta/generic/Configuration.h Ver fichero

@@ -541,7 +541,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
541 541
   // If you would like to use both a Z PROBE and a Z MIN endstop together or just a Z PROBE with a custom pin, uncomment #define Z_PROBE_ENDSTOP and read the instructions below.
542 542
   // 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.
543 543
   // 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.
544
-  // To use a separte Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
544
+  // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
545 545
   // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, SERVO_ENDSTOPS and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
546 546
   // 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
547 547
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.

+ 1
- 1
Marlin/example_configurations/delta/kossel_mini/Configuration.h Ver fichero

@@ -545,7 +545,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
545 545
   // If you would like to use both a Z PROBE and a Z MIN endstop together or just a Z PROBE with a custom pin, uncomment #define Z_PROBE_ENDSTOP and read the instructions below.
546 546
   // 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.
547 547
   // 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.
548
-  // To use a separte Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
548
+  // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
549 549
   // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, SERVO_ENDSTOPS and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
550 550
   // 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
551 551
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.

+ 1
- 1
Marlin/example_configurations/makibox/Configuration.h Ver fichero

@@ -493,7 +493,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
493 493
   // If you would like to use both a Z PROBE and a Z MIN endstop together or just a Z PROBE with a custom pin, uncomment #define Z_PROBE_ENDSTOP and read the instructions below.
494 494
   // 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.
495 495
   // 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.
496
-  // To use a separte Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
496
+  // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
497 497
   // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, SERVO_ENDSTOPS and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
498 498
   // 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
499 499
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.

+ 1
- 1
Marlin/example_configurations/tvrrug/Round2/Configuration.h Ver fichero

@@ -495,7 +495,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
495 495
   // If you would like to use both a Z PROBE and a Z MIN endstop together or just a Z PROBE with a custom pin, uncomment #define Z_PROBE_ENDSTOP and read the instructions below.
496 496
   // 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.
497 497
   // 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.
498
-  // To use a separte Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
498
+  // To use a separate Z PROBE endstop, you must have a Z_PROBE_PIN defined in the pins.h file for your control board.
499 499
   // If you are using a servo based Z PROBE, you will need to enable NUM_SERVOS, SERVO_ENDSTOPS and SERVO_ENDSTOPS_ANGLES in the R/C Servo below.
500 500
   // 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
501 501
   // for normally closed configuration and 5V and D32 for normally open configurations. Normally closed configuration is advised and assumed.

+ 5
- 5
Marlin/fastio.h Ver fichero

@@ -91,7 +91,7 @@
91 91
 	added as necessary or if I feel like it- not a comprehensive list!
92 92
 */
93 93
 
94
-#if defined (__AVR_ATmega168__) || defined (__AVR_ATmega328__) || defined (__AVR_ATmega328P__)
94
+#if defined(__AVR_ATmega168__) || defined(__AVR_ATmega328__) || defined(__AVR_ATmega328P__)
95 95
 // UART
96 96
 #define	RXD					DIO0
97 97
 #define	TXD					DIO1
@@ -426,7 +426,7 @@ pins
426 426
 #define PD7_PWM			NULL
427 427
 #endif	/*	_AVR_ATmega{168,328,328P}__ */
428 428
 
429
-#if defined (__AVR_ATmega644__) || defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644PA__) || defined (__AVR_ATmega1284P__)
429
+#if defined(__AVR_ATmega644__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644PA__) || defined(__AVR_ATmega1284P__)
430 430
 // UART
431 431
 #define	RXD					DIO8
432 432
 #define	TXD					DIO9
@@ -929,7 +929,7 @@ pins
929 929
 #define PD7_PWM			OCR2A
930 930
 #endif	/*	_AVR_ATmega{644,644P,644PA}__ */
931 931
 
932
-#if defined (__AVR_ATmega1280__) || defined (__AVR_ATmega2560__)
932
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
933 933
 // UART
934 934
 #define	RXD					DIO0
935 935
 #define	TXD					DIO1
@@ -2024,7 +2024,7 @@ pins
2024 2024
 
2025 2025
 #endif
2026 2026
 
2027
-#if defined (__AVR_AT90USB1287__) || defined (__AVR_AT90USB1286__) || defined (__AVR_AT90USB646__) || defined(__AVR_AT90USB647__)
2027
+#if defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__)
2028 2028
 // SPI
2029 2029
 #define	SCK					DIO9
2030 2030
 #define	MISO				DIO11
@@ -3322,7 +3322,7 @@ Teensy   28 29 30 31 32 33 34 35 20 21 22 23 24 25 26 27 10 11 12 13 14 15 16 17
3322 3322
 #endif // __AVR_AT90usbxxx__
3323 3323
 
3324 3324
 
3325
-#if defined (__AVR_ATmega1281__) || defined (__AVR_ATmega2561__)
3325
+#if defined(__AVR_ATmega1281__) || defined(__AVR_ATmega2561__)
3326 3326
 // UART
3327 3327
 #define	RXD					DIO0
3328 3328
 #define	TXD					DIO1

+ 6
- 3
Marlin/pins.h Ver fichero

@@ -187,7 +187,7 @@
187 187
   #define Z_MIN_PIN          -1
188 188
 #endif
189 189
 
190
-#if defined (DISABLE_Z_PROBE_ENDSTOP) || ! defined (Z_PROBE_ENDSTOP) // Allow code to compile regardless of Z_PROBE_ENDSTOP setting.
190
+#if defined(DISABLE_Z_PROBE_ENDSTOP) || !defined(Z_PROBE_ENDSTOP) // Allow code to compile regardless of Z_PROBE_ENDSTOP setting.
191 191
   #define Z_PROBE_PIN        -1
192 192
 #endif
193 193
 
@@ -220,8 +220,11 @@
220 220
   #define Z_MIN_PIN          -1
221 221
 #endif
222 222
 
223
-#define SENSITIVE_PINS { 0, 1, X_STEP_PIN, X_DIR_PIN, X_ENABLE_PIN, X_MIN_PIN, X_MAX_PIN, Y_STEP_PIN, Y_DIR_PIN, Y_ENABLE_PIN, Y_MIN_PIN, Y_MAX_PIN, Z_STEP_PIN, Z_DIR_PIN, Z_ENABLE_PIN, Z_MIN_PIN, Z_MAX_PIN, Z_PROBE_PIN, PS_ON_PIN, \
224
-                        HEATER_BED_PIN, FAN_PIN, \
223
+#define SENSITIVE_PINS { 0, 1,
224
+                        X_STEP_PIN, X_DIR_PIN, X_ENABLE_PIN, X_MIN_PIN, X_MAX_PIN, \
225
+                        Y_STEP_PIN, Y_DIR_PIN, Y_ENABLE_PIN, Y_MIN_PIN, Y_MAX_PIN, \
226
+                        Z_STEP_PIN, Z_DIR_PIN, Z_ENABLE_PIN, Z_MIN_PIN, Z_MAX_PIN, Z_PROBE_PIN, \
227
+                        PS_ON_PIN, HEATER_BED_PIN, FAN_PIN, \
225 228
                         _E0_PINS _E1_PINS _E2_PINS _E3_PINS \
226 229
                         analogInputToDigitalPin(TEMP_BED_PIN) \
227 230
                        }

+ 3
- 3
Marlin/pins_RAMPS_13.h Ver fichero

@@ -62,12 +62,12 @@
62 62
   #define FILWIDTH_PIN        5
63 63
 #endif
64 64
 
65
-#if defined(Z_PROBE_ENDSTOP)
65
+#ifdef Z_PROBE_ENDSTOP
66 66
   // Define a pin to use as the signal pin on Arduino for the Z_PROBE endstop.
67
- #define Z_PROBE_PIN 32
67
+  #define Z_PROBE_PIN 32
68 68
 #endif
69 69
 
70
-#if defined(FILAMENT_RUNOUT_SENSOR)
70
+#ifdef FILAMENT_RUNOUT_SENSOR
71 71
   // define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector
72 72
   #define FILRUNOUT_PIN        4
73 73
 #endif

Loading…
Cancelar
Guardar