melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Define servo pins just like other pins

Browse Source
This commit is contained in:
Scott Lahteine 2015-08-02 19:22:30 -07:00 committed by Richard Wackerbarth
parent 4b9d5cd352
commit 56702e7bb9
8 changed files with 21 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Marlin/pins_AZTEEG_X3_PRO.h
View File

@ -76,23 +76,7 @@
//on a Delta with 1 servo. Running through the Z servo endstop in code. //on a Delta with 1 servo. Running through the Z servo endstop in code.
//Physical wire attachment was done on EXT1 on the GND, 5V, and D47 pins. //Physical wire attachment was done on EXT1 on the GND, 5V, and D47 pins.
// //
#undef SERVO0_PIN #define SERVO0_PIN 47
#undef SERVO1_PIN
#undef SERVO2_PIN
#undef SERVO3_PIN
#if HAS_SERVOS
#define SERVO0_PIN 47
#if NUM_SERVOS > 1
#define SERVO1_PIN -1
#if NUM_SERVOS > 2
#define SERVO2_PIN -1
#if NUM_SERVOS > 3
#define SERVO3_PIN -1
#endif
#endif
#endif
#endif
//LCD Pins// //LCD Pins//

16
Marlin/pins_MEGACONTROLLER.h
View File

@ -10,18 +10,10 @@
#error Mega Controller supports up to 2 extruders. Comment this line to keep going. #error Mega Controller supports up to 2 extruders. Comment this line to keep going.
#endif #endif
#ifdef NUM_SERVOS #define SERVO0_PIN 30
#define SERVO0_PIN 30 #define SERVO1_PIN 31
#if NUM_SERVOS > 1 #define SERVO2_PIN 32
#define SERVO1_PIN 31 #define SERVO3_PIN 33
#if NUM_SERVOS > 2
#define SERVO2_PIN 32
#if NUM_SERVOS > 3
#define SERVO3_PIN 33
#endif
#endif
#endif
#endif // NUM_SERVOS
#define X_STEP_PIN 62//A8 #define X_STEP_PIN 62//A8
#define X_DIR_PIN 63//A9 #define X_DIR_PIN 63//A9

16
Marlin/pins_MEGATRONICS_3.h
View File

@ -14,18 +14,10 @@
#endif #endif
// Servo support // Servo support
#if HAS_SERVOS #define SERVO0_PIN 46 //AUX3-6
#define SERVO0_PIN 46 //AUX3-6 #define SERVO1_PIN 47 //AUX3-5
#if NUM_SERVOS > 1 #define SERVO2_PIN 48 //AUX3-4
#define SERVO1_PIN 47 //AUX3-5 #define SERVO2_PIN 49 //AUX3-3
#if NUM_SERVOS > 2
#define SERVO2_PIN 48 //AUX3-4
#if NUM_SERVOS > 3
#define SERVO2_PIN 49 //AUX3-3
#endif
#endif
#endif
#endif
#define X_STEP_PIN 58 #define X_STEP_PIN 58
#define X_DIR_PIN 57 #define X_DIR_PIN 57

16
Marlin/pins_RAMBO.h
View File

@ -9,18 +9,10 @@
#define LARGE_FLASH true #define LARGE_FLASH true
// Servo support // Servo support
#if HAS_SERVOS #define SERVO0_PIN 22 // Motor header MX1
#define SERVO0_PIN 22 //motor header MX1 #define SERVO1_PIN 23 // Motor header MX2
#if NUM_SERVOS > 1 #define SERVO2_PIN 24 // Motor header MX3
#define SERVO1_PIN 23 //Motor header MX2 #define SERVO2_PIN 5 // PWM header pin 5
#if NUM_SERVOS > 2
#define SERVO2_PIN 24 //Motor header MX3
#if NUM_SERVOS > 3
#define SERVO2_PIN 5 //pwm header pin 5
#endif
#endif
#endif
#endif
#if ENABLED(Z_PROBE_SLED) #if ENABLED(Z_PROBE_SLED)
#define SLED_PIN -1 #define SLED_PIN -1

18
Marlin/pins_RAMPS_13.h
View File

@ -18,6 +18,11 @@
#define LARGE_FLASH true #define LARGE_FLASH true
#define SERVO0_PIN 11
#define SERVO1_PIN 6
#define SERVO2_PIN 5
#define SERVO3_PIN 4
#define X_STEP_PIN 54 #define X_STEP_PIN 54
#define X_DIR_PIN 55 #define X_DIR_PIN 55
#define X_ENABLE_PIN 38 #define X_ENABLE_PIN 38
@ -122,19 +127,6 @@
#define TEMP_BED_PIN 14 // ANALOG NUMBERING #define TEMP_BED_PIN 14 // ANALOG NUMBERING
#if HAS_SERVOS
#define SERVO0_PIN 11
#if NUM_SERVOS > 1
#define SERVO1_PIN 6
#if NUM_SERVOS > 2
#define SERVO2_PIN 5
#if NUM_SERVOS > 3
#define SERVO3_PIN 4
#endif
#endif
#endif
#endif
#if ENABLED(Z_PROBE_SLED) #if ENABLED(Z_PROBE_SLED)
#define SLED_PIN -1 #define SLED_PIN -1
#endif #endif

13
Marlin/pins_SANGUINOLOLU_11.h
View File

@ -37,19 +37,6 @@
#define SLED_PIN -1 #define SLED_PIN -1
#endif #endif
#if HAS_SERVOS
#define SERVO0_PIN -1
#if NUM_SERVOS > 1
#define SERVO1_PIN -1
#if NUM_SERVOS > 2
#define SERVO2_PIN -1
#if NUM_SERVOS > 3
#define SERVO3_PIN -1
#endif
#endif
#endif
#endif
#define PS_ON_PIN -1 #define PS_ON_PIN -1
#define KILL_PIN -1 #define KILL_PIN -1

4
Marlin/pins_SAV_MKI.h
View File

@ -108,6 +108,4 @@
#define HOME_PIN EXT_AUX_A4_IO #define HOME_PIN EXT_AUX_A4_IO
#endif // SAV_3DLCD || SAV_3DGLCD #endif // SAV_3DLCD || SAV_3DGLCD
#if HAS_SERVOS #define SERVO0_PIN 41 // In teensy's pin definition for pinMode (in servo.cpp)
#define SERVO0_PIN 41 // In teensy's pin definition for pinMode (in servo.cpp)
#endif

3
Marlin/pins_ULTIMAKER.h
View File

@ -8,6 +8,8 @@
#define LARGE_FLASH true #define LARGE_FLASH true
#define SERVO0_PIN 13 // untested
#define X_STEP_PIN 25 #define X_STEP_PIN 25
#define X_DIR_PIN 23 #define X_DIR_PIN 23
#define X_MIN_PIN 22 #define X_MIN_PIN 22
@ -53,7 +55,6 @@
#define PS_ON_PIN 12 #define PS_ON_PIN 12
#define KILL_PIN -1 #define KILL_PIN -1
#define SUICIDE_PIN 54 //PIN that has to be turned on right after start, to keep power flowing. #define SUICIDE_PIN 54 //PIN that has to be turned on right after start, to keep power flowing.
#define SERVO0_PIN 13 // untested
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_LCD)