zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Only init servo pins used for servos (#14589)

Browse source
This commit is contained in:
InsanityAutomation 2019-07-12 05:30:15 -04:00 committed by Scott Lahteine
parent 19b24a349c
commit f1eaed7e98
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Marlin/src/HAL/HAL_AVR/HAL.cpp
View file

@ -37,16 +37,16 @@
void HAL_init(void) {
// Init Servo Pins
#if PIN_EXISTS(SERVO0)
#if HAS_SERVO_0
OUT_WRITE(SERVO0_PIN, LOW);
#endif
#if PIN_EXISTS(SERVO1)
#if HAS_SERVO_1
OUT_WRITE(SERVO1_PIN, LOW);
#endif
#if PIN_EXISTS(SERVO2)
#if HAS_SERVO_2
OUT_WRITE(SERVO2_PIN, LOW);
#endif
#if PIN_EXISTS(SERVO3)
#if HAS_SERVO_3
OUT_WRITE(SERVO3_PIN, LOW);
#endif
}

8
Marlin/src/HAL/HAL_LPC1768/main.cpp
View file

@ -73,16 +73,16 @@ void HAL_init(void) {
#endif
// Init Servo Pins
#if PIN_EXISTS(SERVO0)
#if HAS_SERVO_0
OUT_WRITE(SERVO0_PIN, LOW);
#endif
#if PIN_EXISTS(SERVO1)
#if HAS_SERVO_1
OUT_WRITE(SERVO1_PIN, LOW);
#endif
#if PIN_EXISTS(SERVO2)
#if HAS_SERVO_2
OUT_WRITE(SERVO2_PIN, LOW);
#endif
#if PIN_EXISTS(SERVO3)
#if HAS_SERVO_3
OUT_WRITE(SERVO3_PIN, LOW);
#endif

10
Marlin/src/inc/Conditionals_post.h
View file

@ -1000,11 +1000,11 @@
#define HAS_CONTROLLER_FAN (PIN_EXISTS(CONTROLLER_FAN))
// Servos
#define HAS_SERVO_0 (PIN_EXISTS(SERVO0))
#define HAS_SERVO_1 (PIN_EXISTS(SERVO1))
#define HAS_SERVO_2 (PIN_EXISTS(SERVO2))
#define HAS_SERVO_3 (PIN_EXISTS(SERVO3))
#define HAS_SERVOS (defined(NUM_SERVOS) && NUM_SERVOS > 0)
#define HAS_SERVO_0 (PIN_EXISTS(SERVO0) && NUM_SERVOS > 0)
#define HAS_SERVO_1 (PIN_EXISTS(SERVO1) && NUM_SERVOS > 1)
#define HAS_SERVO_2 (PIN_EXISTS(SERVO2) && NUM_SERVOS > 2)
#define HAS_SERVO_3 (PIN_EXISTS(SERVO3) && NUM_SERVOS > 3)
#define HAS_SERVOS (NUM_SERVOS > 0)
#if HAS_SERVOS && !defined(Z_PROBE_SERVO_NR)
#define Z_PROBE_SERVO_NR -1