andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Clean up some pins

pull/1/head
Scott Lahteine 5 years ago
parent
bd1ced14e7
commit
4581957d93
11 changed files with 49 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Marlin/src/pins/linux/pins_RAMPS_LINUX.h
  2. 52
      Marlin/src/pins/mega/pins_MEGATRONICS_2.h
  3. 2
      Marlin/src/pins/rambo/pins_RAMBO.h
  4. 2
      Marlin/src/pins/ramps/pins_RAMPS.h
  5. 2
      Marlin/src/pins/ramps/pins_TT_OSCAR.h
  6. 4
      Marlin/src/pins/ramps/pins_ULTIMAKER.h
  7. 4
      Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
  8. 4
      Marlin/src/pins/stm32/pins_BEAST.h
  9. 12
      Marlin/src/pins/stm32/pins_CHITU3D.h
  10. 4
      Marlin/src/pins/stm32/pins_STM32F1R.h
  11. 4
      Marlin/src/pins/stm32/pins_STM3R_MINI.h

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

@ -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

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

@ -115,32 +115,38 @@
#define PS_ON_PIN 12
#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
//
#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
#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
#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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

12
Marlin/src/pins/stm32/pins_CHITU3D.h
View File

@ -141,12 +141,12 @@
#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
//#define SHIFT_OUT 40
//#define SHIFT_EN 17
//#define SHIFT_CLK 38
//#define SHIFT_LD 42
//#define SHIFT_OUT 40
//#define SHIFT_EN 17
#endif
#endif
@ -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

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

@ -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

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

@ -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

Write Preview
Loading…
Cancel
Save