General cleanup of Re-ARM pins
This commit is contained in:
Scott Lahteine
parent
ee423dcdd0
commit
b738972e69
|
|
@ -98,13 +98,6 @@
|
|||
#define E1_CS_PIN -1
|
||||
#endif
|
||||
|
||||
//#define E2_STEP_PIN P2_08 // (36)
|
||||
//#define E2_DIR_PIN P2_13 // (34)
|
||||
//#define E2_ENABLE_PIN P4_29 // (30)
|
||||
//#ifndef E2_CS_PIN
|
||||
// #define E2_CS_PIN -1
|
||||
//#endif
|
||||
|
||||
//
|
||||
// Software SPI pins for TMC2130 stepper drivers
|
||||
//
|
||||
|
|
@ -205,23 +198,22 @@
|
|||
#define PS_ON_PIN P2_12 // (12)
|
||||
|
||||
#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENABLE_PIN)
|
||||
#if !defined(NUM_SERVOS) || NUM_SERVOS < 4 // try to use servo connector
|
||||
#if !defined(NUM_SERVOS) || NUM_SERVOS < 4 // Try to use servo connector
|
||||
#define CASE_LIGHT_PIN P1_18 // (4) MUST BE HARDWARE PWM
|
||||
#endif
|
||||
#endif
|
||||
|
||||
//
|
||||
// M3/M4/M5 - Spindle/Laser Control
|
||||
// Use servo pins, if available
|
||||
//
|
||||
#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENABLE)
|
||||
#if !defined(NUM_SERVOS) || NUM_SERVOS == 1 // must use servo connector
|
||||
#undef SERVO1
|
||||
#undef SERVO2
|
||||
#undef SERVO3
|
||||
#define SPINDLE_LASER_ENABLE_PIN P1_21 // (6) Pin should have a pullup/pulldown!
|
||||
#define SPINDLE_LASER_PWM_PIN P1_18 // (4) MUST BE HARDWARE PWM
|
||||
#define SPINDLE_DIR_PIN P1_19 // (5)
|
||||
#if NUM_SERVOS > 1
|
||||
#error "SPINDLE_LASER_ENABLE requires 3 free servo pins."
|
||||
#endif
|
||||
#define SPINDLE_LASER_ENABLE_PIN SERVO1_PIN // (6) Pin should have a pullup/pulldown!
|
||||
#define SPINDLE_LASER_PWM_PIN SERVO3_PIN // (4) MUST BE HARDWARE PWM
|
||||
#define SPINDLE_DIR_PIN SERVO2_PIN // (5)
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
@ -237,6 +229,9 @@
|
|||
* LCD / Controller
|
||||
*
|
||||
* All controllers can use J3 and J5 on the Re-ARM board. Custom cabling will be required.
|
||||
*
|
||||
* - https://github.com/wolfmanjm/universal-panel-adapter
|
||||
* - http://panucattdevices.freshdesk.com/support/solutions/articles/1000243195-lcd-display-installation
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -252,9 +247,7 @@
|
|||
* that the garbage/lines are erased immediately after the SD card accesses are completed.
|
||||
*/
|
||||
|
||||
#if ENABLED(ULTRA_LCD)
|
||||
|
||||
#if ENABLED(CR10_STOCKDISPLAY)
|
||||
#if ENABLED(CR10_STOCKDISPLAY)
|
||||
|
||||
// Re-Arm can support Creality stock display without SD card reader and single cable on EXP3.
|
||||
// Re-Arm J3 pins 1 (p1.31) & 2 (P3.26) are not used. Stock cable will need to have one
|
||||
|
|
@ -271,7 +264,7 @@
|
|||
#define LCD_PINS_ENABLE P0_18 // J3-10 & AUX-3 (SID, MOSI)
|
||||
#define LCD_PINS_D4 P2_06 // J3-8 & AUX-3 (SCK, CLK)
|
||||
|
||||
#else
|
||||
#elif ENABLED(ULTRA_LCD)
|
||||
|
||||
#define BEEPER_PIN P1_30 // (37) not 5V tolerant
|
||||
|
||||
|
|
@ -279,7 +272,7 @@
|
|||
#define BTN_EN2 P3_25 // (33) J3-4 & AUX-4
|
||||
#define BTN_ENC P2_11 // (35) J3-3 & AUX-4
|
||||
|
||||
#define SD_DETECT_PIN P1_31 // (49) not 5V tolerant J3-1 & AUX-3
|
||||
#define SD_DETECT_PIN P1_31 // (49) J3-1 & AUX-3 (NOT 5V tolerant)
|
||||
#define KILL_PIN P1_22 // (41) J5-4 & AUX-4
|
||||
#define LCD_PINS_RS P0_16 // (16) J3-7 & AUX-4
|
||||
#define LCD_SDSS P0_16 // (16) J3-7 & AUX-4
|
||||
|
|
@ -288,7 +281,7 @@
|
|||
#if ENABLED(REPRAPWORLD_KEYPAD)
|
||||
#define SHIFT_OUT P0_18 // (51) (MOSI) J3-10 & AUX-3
|
||||
#define SHIFT_CLK P0_15 // (52) (SCK) J3-9 & AUX-3
|
||||
#define SHIFT_LD P1_31 // (49) not 5V tolerant J3-1 & AUX-3
|
||||
#define SHIFT_LD P1_31 // (49) J3-1 & AUX-3 (NOT 5V tolerant)
|
||||
#endif
|
||||
#else
|
||||
//#define SHIFT_CLK P3_26 // (31) J3-2 & AUX-4
|
||||
|
|
@ -304,7 +297,7 @@
|
|||
#define BTN_EN2 P3_25 // (33) J3-4 & AUX-4
|
||||
#define BTN_ENC P2_11 // (35) J3-3 & AUX-4
|
||||
|
||||
#define SD_DETECT_PIN P1_31 // (49) not 5V tolerant J3-1 & AUX-3
|
||||
#define SD_DETECT_PIN P1_31 // (49) J3-1 & AUX-3 (NOT 5V tolerant)
|
||||
#define KILL_PIN P1_22 // (41) J5-4 & AUX-4
|
||||
|
||||
#define DOGLCD_CS P0_16 // (16)
|
||||
|
|
@ -312,12 +305,12 @@
|
|||
#define DOGLCD_SCK SCK_PIN
|
||||
#define DOGLCD_MOSI MOSI_PIN
|
||||
|
||||
#define STAT_LED_BLUE_PIN P0_26 // (63) may change if cable changes
|
||||
#define STAT_LED_BLUE_PIN P0_26 //(63) may change if cable changes
|
||||
#define STAT_LED_RED_PIN P1_21 // ( 6) may change if cable changes
|
||||
#else
|
||||
#define DOGLCD_CS P0_26 // (63) J5-3 & AUX-2
|
||||
#define DOGLCD_A0 P2_06 // (59) J3-8 & AUX-2
|
||||
#define LCD_BACKLIGHT_PIN P0_16 // (16) J3-7 & AUX-4 - only used on DOGLCD controllers
|
||||
#define LCD_BACKLIGHT_PIN P0_16 //(16) J3-7 & AUX-4 - only used on DOGLCD controllers
|
||||
#define LCD_PINS_ENABLE P0_18 // (51) (MOSI) J3-10 & AUX-3
|
||||
#define LCD_PINS_D4 P0_15 // (52) (SCK) J3-9 & AUX-3
|
||||
#if ENABLED(ULTIPANEL)
|
||||
|
|
@ -330,7 +323,7 @@
|
|||
//#define MISO_PIN P0_17 // (50) system defined J3-10 & AUX-3
|
||||
//#define MOSI_PIN P0_18 // (51) system defined J3-10 & AUX-3
|
||||
//#define SCK_PIN P0_15 // (52) system defined J3-9 & AUX-3
|
||||
//#define SS_PIN P1_23 // (53) system defined J3-5 & AUX-3 - sometimes called SDSS
|
||||
//#define SS_PIN P1_23 // (53) system defined J3-5 & AUX-3 (Sometimes called SDSS)
|
||||
|
||||
#if ENABLED(MINIPANEL)
|
||||
// GLCD features
|
||||
|
|
@ -341,8 +334,6 @@
|
|||
//#define LCD_SCREEN_ROT_270
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#endif // ULTRA_LCD
|
||||
|
||||
//
|
||||
|
|
@ -383,6 +374,7 @@
|
|||
#define SHARED_SD_CARD
|
||||
#undef SD_DETECT_PIN // there is also no detect pin for the onboard card
|
||||
#endif
|
||||
|
||||
#define SCK_PIN P0_07
|
||||
#define MISO_PIN P0_08
|
||||
#define MOSI_PIN P0_09
|
||||
|
|
@ -406,6 +398,7 @@
|
|||
* The following pins/signals use the direct method. All other pins use the
|
||||
* the interrupt method. Note that SERVO2_PIN and RAMPS_D8_PIN use the
|
||||
* interrupt method.
|
||||
*
|
||||
* P1_20 (11) SERVO0_PIN
|
||||
* P1_21 ( 6) SERVO1_PIN J5-1
|
||||
* P0_18 ( 4) SERVO3_PIN 5V output
|
||||
|
|
@ -418,31 +411,14 @@
|
|||
|
||||
/**
|
||||
* Special pins
|
||||
* P1_30 (37) - not 5V tolerant
|
||||
* P1_31 (49) - not 5V tolerant
|
||||
* P0_27 (57) - open collector
|
||||
* P0_28 (58) - open collector
|
||||
*
|
||||
* P1_30 (37) (NOT 5V tolerant)
|
||||
* P1_31 (49) (NOT 5V tolerant)
|
||||
* P0_27 (57) (Open collector)
|
||||
* P0_28 (58) (Open collector)
|
||||
*/
|
||||
|
||||
/**
|
||||
* The following mega2560 pins are NOT available in a Re-ARM system
|
||||
* 7
|
||||
* 17
|
||||
* 22
|
||||
* 23
|
||||
* 25
|
||||
* 27
|
||||
* 29
|
||||
* 32
|
||||
* 39
|
||||
* 40
|
||||
* 42
|
||||
* 43
|
||||
* 44
|
||||
* 45
|
||||
* 47
|
||||
* 64
|
||||
* 65
|
||||
* 66
|
||||
* The following mega2560 pins are NOT available in a Re-ARM system:
|
||||
*
|
||||
* 7, 17, 22, 23, 25, 27, 29, 32, 39, 40, 42, 43, 44, 45, 47, 64, 65, 66
|
||||
*/
|
||||
|
|
|
|||
Reference in a new issue