Clean up some pins
This commit is contained in:
parent
bd1ced14e7
commit
4581957d93
11 changed files with 49 additions and 43 deletions
|
@ -437,7 +437,7 @@
|
|||
#endif
|
||||
|
||||
#if DISABLED(NEWPANEL)
|
||||
// Buttons are attached to a shift register
|
||||
// Buttons attached to a shift register
|
||||
// Not wired yet
|
||||
//#define SHIFT_CLK 38
|
||||
//#define SHIFT_LD 42
|
||||
|
|
|
@ -115,11 +115,20 @@
|
|||
#define PS_ON_PIN 12
|
||||
#define CASE_LIGHT_PIN 2
|
||||
|
||||
//
|
||||
// M3/M4/M5 - Spindle/Laser Control
|
||||
//
|
||||
#define SPINDLE_LASER_PWM_PIN 3 // Hardware PWM
|
||||
#define SPINDLE_LASER_ENA_PIN 16 // Pullup!
|
||||
#define SPINDLE_DIR_PIN 11
|
||||
|
||||
//
|
||||
// LCD / Controller
|
||||
//
|
||||
#define BEEPER_PIN 64
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
|
||||
#define LCD_PINS_RS 14
|
||||
#define LCD_PINS_ENABLE 15
|
||||
#define LCD_PINS_D4 30
|
||||
|
@ -127,20 +136,17 @@
|
|||
#define LCD_PINS_D6 32
|
||||
#define LCD_PINS_D7 33
|
||||
|
||||
#if ENABLED(NEWPANEL)
|
||||
// Buttons are directly attached using keypad
|
||||
#define BTN_EN1 61
|
||||
#define BTN_EN2 59
|
||||
#define BTN_ENC 43
|
||||
|
||||
// Buttons that are attached using shift register of reprapworld keypad v1.1
|
||||
#else
|
||||
// Buttons attached to shift register of reprapworld keypad v1.1
|
||||
#define SHIFT_CLK 63
|
||||
#define SHIFT_LD 42
|
||||
#define SHIFT_OUT 17
|
||||
#define SHIFT_EN 17
|
||||
#endif
|
||||
|
||||
//
|
||||
// M3/M4/M5 - Spindle/Laser Control
|
||||
//
|
||||
#define SPINDLE_LASER_PWM_PIN 3 // Hardware PWM
|
||||
#define SPINDLE_LASER_ENA_PIN 16 // Pullup!
|
||||
#define SPINDLE_DIR_PIN 11
|
||||
#endif // HAS_SPI_LCD
|
||||
|
|
|
@ -219,7 +219,7 @@
|
|||
// No Beeper added
|
||||
#define BEEPER_PIN 33
|
||||
|
||||
// buttons are attached to a shift register
|
||||
// Buttons attached to a shift register
|
||||
// Not wired yet
|
||||
//#define SHIFT_CLK 38
|
||||
//#define SHIFT_LD 42
|
||||
|
|
|
@ -477,7 +477,7 @@
|
|||
#endif
|
||||
|
||||
#if DISABLED(NEWPANEL)
|
||||
// Buttons are attached to a shift register
|
||||
// Buttons attached to a shift register
|
||||
// Not wired yet
|
||||
//#define SHIFT_CLK 38
|
||||
//#define SHIFT_LD 42
|
||||
|
|
|
@ -337,7 +337,7 @@
|
|||
#endif
|
||||
|
||||
#if DISABLED(NEWPANEL)
|
||||
// Buttons are attached to a shift register
|
||||
// Buttons attached to a shift register
|
||||
// Not wired yet
|
||||
//#define SHIFT_CLK 38
|
||||
//#define SHIFT_LD 42
|
||||
|
|
|
@ -129,7 +129,7 @@
|
|||
#define LCD_PINS_D6 5
|
||||
#define LCD_PINS_D7 6
|
||||
|
||||
// buttons are directly attached
|
||||
// Buttons directly attached
|
||||
#define BTN_EN1 40
|
||||
#define BTN_EN2 42
|
||||
#define BTN_ENC 19
|
||||
|
@ -138,7 +138,7 @@
|
|||
|
||||
#else // !NEWPANEL - Old style panel with shift register
|
||||
|
||||
// buttons are attached to a shift register
|
||||
// Buttons attached to a shift register
|
||||
#define SHIFT_CLK 38
|
||||
#define SHIFT_LD 42
|
||||
#define SHIFT_OUT 40
|
||||
|
|
|
@ -187,7 +187,7 @@
|
|||
#define LCD_PINS_D6 5
|
||||
#define LCD_PINS_D7 6
|
||||
|
||||
// buttons are directly attached
|
||||
// Buttons directly attached
|
||||
#define BTN_EN1 40
|
||||
#define BTN_EN2 42
|
||||
#define BTN_ENC 19
|
||||
|
@ -196,7 +196,7 @@
|
|||
|
||||
#else // !NEWPANEL - Old style panel with shift register
|
||||
|
||||
// buttons are attached to a shift register
|
||||
// Buttons attached to a shift register
|
||||
#define SHIFT_CLK 38
|
||||
#define SHIFT_LD 42
|
||||
#define SHIFT_OUT 40
|
||||
|
|
|
@ -142,7 +142,7 @@
|
|||
#define LCD_PINS_D7 PB15
|
||||
#if DISABLED(NEWPANEL)
|
||||
#define BEEPER_PIN 33
|
||||
// Buttons are attached to a shift register
|
||||
// Buttons attached to a shift register
|
||||
// Not wired yet
|
||||
//#define SHIFT_CLK 38
|
||||
//#define SHIFT_LD 42
|
||||
|
@ -254,7 +254,7 @@
|
|||
// Beeper on AUX-4
|
||||
#define BEEPER_PIN 33
|
||||
|
||||
// buttons are directly attached to AUX-2
|
||||
// Buttons directly attached to AUX-2
|
||||
#if ENABLED(REPRAPWORLD_KEYPAD)
|
||||
#define BTN_EN1 64
|
||||
#define BTN_EN2 59
|
||||
|
|
|
@ -141,7 +141,7 @@
|
|||
#define LCD_PINS_D7 PB15
|
||||
#if DISABLED(NEWPANEL)
|
||||
#define BEEPER_PIN 33
|
||||
// Buttons are attached to a shift register
|
||||
// Buttons attached to a shift register
|
||||
// Not wired yet
|
||||
//#define SHIFT_CLK 38
|
||||
//#define SHIFT_LD 42
|
||||
|
@ -252,7 +252,7 @@
|
|||
// Beeper on AUX-4
|
||||
#define BEEPER_PIN 33
|
||||
|
||||
// buttons are directly attached to AUX-2
|
||||
// Buttons directly attached to AUX-2
|
||||
#if ENABLED(REPRAPWORLD_KEYPAD)
|
||||
#define BTN_EN1 64
|
||||
#define BTN_EN2 59
|
||||
|
|
|
@ -119,7 +119,7 @@
|
|||
#define LCD_PINS_D7 PB15
|
||||
#if DISABLED(NEWPANEL)
|
||||
#define BEEPER_PIN 33
|
||||
// Buttons are attached to a shift register
|
||||
// Buttons attached to a shift register
|
||||
// Not wired yet
|
||||
//#define SHIFT_CLK 38
|
||||
//#define SHIFT_LD 42
|
||||
|
@ -230,7 +230,7 @@
|
|||
// Beeper on AUX-4
|
||||
#define BEEPER_PIN 33
|
||||
|
||||
// buttons are directly attached to AUX-2
|
||||
// Buttons directly attached to AUX-2
|
||||
#if ENABLED(REPRAPWORLD_KEYPAD)
|
||||
#define BTN_EN1 64
|
||||
#define BTN_EN2 59
|
||||
|
|
|
@ -134,7 +134,7 @@
|
|||
#define LCD_PINS_D7 PB15
|
||||
#if DISABLED(NEWPANEL)
|
||||
#define BEEPER_PIN 33
|
||||
// Buttons are attached to a shift register
|
||||
// Buttons attached to a shift register
|
||||
// Not wired yet
|
||||
//#define SHIFT_CLK 38
|
||||
//#define SHIFT_LD 42
|
||||
|
@ -254,7 +254,7 @@
|
|||
// Beeper on AUX-4
|
||||
#define BEEPER_PIN 33
|
||||
|
||||
// buttons are directly attached to AUX-2
|
||||
// Buttons directly attached to AUX-2
|
||||
#if ENABLED(REPRAPWORLD_KEYPAD)
|
||||
#define BTN_EN1 64
|
||||
#define BTN_EN2 59
|
||||
|
|
Reference in a new issue