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

Clean up some pins

Browse source
This commit is contained in:
Scott Lahteine 2019-08-21 05:15:31 -05:00
parent bd1ced14e7
commit 4581957d93
11 changed files with 49 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/pins/linux/pins_RAMPS_LINUX.h
View file

@ -437,7 +437,7 @@
#endif #endif
#if DISABLED(NEWPANEL) #if DISABLED(NEWPANEL)
// Buttons are attached to a shift register // Buttons attached to a shift register
// Not wired yet // Not wired yet
//#define SHIFT_CLK 38 //#define SHIFT_CLK 38
//#define SHIFT_LD 42 //#define SHIFT_LD 42

52
Marlin/src/pins/mega/pins_MEGATRONICS_2.h
View file

@ -115,32 +115,38 @@
#define PS_ON_PIN 12 #define PS_ON_PIN 12
#define CASE_LIGHT_PIN 2 #define CASE_LIGHT_PIN 2
//
// LCD / Controller
//
#define BEEPER_PIN 64
#define LCD_PINS_RS 14
#define LCD_PINS_ENABLE 15
#define LCD_PINS_D4 30
#define LCD_PINS_D5 31
#define LCD_PINS_D6 32
#define LCD_PINS_D7 33
// 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
#define SHIFT_CLK 63
#define SHIFT_LD 42
#define SHIFT_OUT 17
#define SHIFT_EN 17
// //
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// //
#define SPINDLE_LASER_PWM_PIN 3 // Hardware PWM #define SPINDLE_LASER_PWM_PIN 3 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 16 // Pullup! #define SPINDLE_LASER_ENA_PIN 16 // Pullup!
#define SPINDLE_DIR_PIN 11 #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
#define LCD_PINS_D5 31
#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
#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
#endif // HAS_SPI_LCD

2
Marlin/src/pins/rambo/pins_RAMBO.h
View file

@ -219,7 +219,7 @@
// No Beeper added // No Beeper added
#define BEEPER_PIN 33 #define BEEPER_PIN 33
// buttons are attached to a shift register // Buttons attached to a shift register
// Not wired yet // Not wired yet
//#define SHIFT_CLK 38 //#define SHIFT_CLK 38
//#define SHIFT_LD 42 //#define SHIFT_LD 42

2
Marlin/src/pins/ramps/pins_RAMPS.h
View file

@ -477,7 +477,7 @@
#endif #endif
#if DISABLED(NEWPANEL) #if DISABLED(NEWPANEL)
// Buttons are attached to a shift register // Buttons attached to a shift register
// Not wired yet // Not wired yet
//#define SHIFT_CLK 38 //#define SHIFT_CLK 38
//#define SHIFT_LD 42 //#define SHIFT_LD 42

2
Marlin/src/pins/ramps/pins_TT_OSCAR.h
View file

@ -337,7 +337,7 @@
#endif #endif
#if DISABLED(NEWPANEL) #if DISABLED(NEWPANEL)
// Buttons are attached to a shift register // Buttons attached to a shift register
// Not wired yet // Not wired yet
//#define SHIFT_CLK 38 //#define SHIFT_CLK 38
//#define SHIFT_LD 42 //#define SHIFT_LD 42

4
Marlin/src/pins/ramps/pins_ULTIMAKER.h
View file

@ -129,7 +129,7 @@
#define LCD_PINS_D6 5 #define LCD_PINS_D6 5
#define LCD_PINS_D7 6 #define LCD_PINS_D7 6
// buttons are directly attached // Buttons directly attached
#define BTN_EN1 40 #define BTN_EN1 40
#define BTN_EN2 42 #define BTN_EN2 42
#define BTN_ENC 19 #define BTN_ENC 19
@ -138,7 +138,7 @@
#else // !NEWPANEL - Old style panel with shift register #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_CLK 38
#define SHIFT_LD 42 #define SHIFT_LD 42
#define SHIFT_OUT 40 #define SHIFT_OUT 40

4
Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
View file

@ -187,7 +187,7 @@
#define LCD_PINS_D6 5 #define LCD_PINS_D6 5
#define LCD_PINS_D7 6 #define LCD_PINS_D7 6
// buttons are directly attached // Buttons directly attached
#define BTN_EN1 40 #define BTN_EN1 40
#define BTN_EN2 42 #define BTN_EN2 42
#define BTN_ENC 19 #define BTN_ENC 19
@ -196,7 +196,7 @@
#else // !NEWPANEL - Old style panel with shift register #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_CLK 38
#define SHIFT_LD 42 #define SHIFT_LD 42
#define SHIFT_OUT 40 #define SHIFT_OUT 40

4
Marlin/src/pins/stm32/pins_BEAST.h
View file

@ -142,7 +142,7 @@
#define LCD_PINS_D7 PB15 #define LCD_PINS_D7 PB15
#if DISABLED(NEWPANEL) #if DISABLED(NEWPANEL)
#define BEEPER_PIN 33 #define BEEPER_PIN 33
// Buttons are attached to a shift register // Buttons attached to a shift register
// Not wired yet // Not wired yet
//#define SHIFT_CLK 38 //#define SHIFT_CLK 38
//#define SHIFT_LD 42 //#define SHIFT_LD 42
@ -254,7 +254,7 @@
// Beeper on AUX-4 // Beeper on AUX-4
#define BEEPER_PIN 33 #define BEEPER_PIN 33
// buttons are directly attached to AUX-2 // Buttons directly attached to AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD) #if ENABLED(REPRAPWORLD_KEYPAD)
#define BTN_EN1 64 #define BTN_EN1 64
#define BTN_EN2 59 #define BTN_EN2 59

4
Marlin/src/pins/stm32/pins_CHITU3D.h
View file

@ -141,7 +141,7 @@
#define LCD_PINS_D7 PB15 #define LCD_PINS_D7 PB15
#if DISABLED(NEWPANEL) #if DISABLED(NEWPANEL)
#define BEEPER_PIN 33 #define BEEPER_PIN 33
// Buttons are attached to a shift register // Buttons attached to a shift register
// Not wired yet // Not wired yet
//#define SHIFT_CLK 38 //#define SHIFT_CLK 38
//#define SHIFT_LD 42 //#define SHIFT_LD 42
@ -252,7 +252,7 @@
// Beeper on AUX-4 // Beeper on AUX-4
#define BEEPER_PIN 33 #define BEEPER_PIN 33
// buttons are directly attached to AUX-2 // Buttons directly attached to AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD) #if ENABLED(REPRAPWORLD_KEYPAD)
#define BTN_EN1 64 #define BTN_EN1 64
#define BTN_EN2 59 #define BTN_EN2 59

4
Marlin/src/pins/stm32/pins_STM32F1R.h
View file

@ -119,7 +119,7 @@
#define LCD_PINS_D7 PB15 #define LCD_PINS_D7 PB15
#if DISABLED(NEWPANEL) #if DISABLED(NEWPANEL)
#define BEEPER_PIN 33 #define BEEPER_PIN 33
// Buttons are attached to a shift register // Buttons attached to a shift register
// Not wired yet // Not wired yet
//#define SHIFT_CLK 38 //#define SHIFT_CLK 38
//#define SHIFT_LD 42 //#define SHIFT_LD 42
@ -230,7 +230,7 @@
// Beeper on AUX-4 // Beeper on AUX-4
#define BEEPER_PIN 33 #define BEEPER_PIN 33
// buttons are directly attached to AUX-2 // Buttons directly attached to AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD) #if ENABLED(REPRAPWORLD_KEYPAD)
#define BTN_EN1 64 #define BTN_EN1 64
#define BTN_EN2 59 #define BTN_EN2 59

4
Marlin/src/pins/stm32/pins_STM3R_MINI.h
View file

@ -134,7 +134,7 @@
#define LCD_PINS_D7 PB15 #define LCD_PINS_D7 PB15
#if DISABLED(NEWPANEL) #if DISABLED(NEWPANEL)
#define BEEPER_PIN 33 #define BEEPER_PIN 33
// Buttons are attached to a shift register // Buttons attached to a shift register
// Not wired yet // Not wired yet
//#define SHIFT_CLK 38 //#define SHIFT_CLK 38
//#define SHIFT_LD 42 //#define SHIFT_LD 42
@ -254,7 +254,7 @@
// Beeper on AUX-4 // Beeper on AUX-4
#define BEEPER_PIN 33 #define BEEPER_PIN 33
// buttons are directly attached to AUX-2 // Buttons directly attached to AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD) #if ENABLED(REPRAPWORLD_KEYPAD)
#define BTN_EN1 64 #define BTN_EN1 64
#define BTN_EN2 59 #define BTN_EN2 59