Skip to content

Commit

Permalink
BTN_ENC_EN for many boards (MarlinFirmware#19890)
Browse files Browse the repository at this point in the history
Enables CHECK_ENCODER_ACTIVE_SIGNAL for many more boards.

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Co-authored-by: Jason Smith <jason.inet@gmail.com>
  • Loading branch information
3 people authored and dpreed committed Feb 5, 2021
1 parent 00d76fb commit 6c97adb
Show file tree
Hide file tree
Showing 42 changed files with 191 additions and 0 deletions.
5 changes: 5 additions & 0 deletions Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,11 @@
#define LCD_PINS_D5 EXPA1_05_PIN
#define LCD_PINS_D6 EXPA1_04_PIN
#define LCD_PINS_D7 EXPA1_03_PIN

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif

#endif // !FYSETC_MINI_12864
Expand Down
5 changes: 5 additions & 0 deletions Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,11 @@
#define LCD_PINS_D5 P0_22
#define LCD_PINS_D6 P1_29
#define LCD_PINS_D7 P1_28

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif

//
Expand Down
5 changes: 5 additions & 0 deletions Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,11 @@
#define LCD_PINS_D5 P0_17
#define LCD_PINS_D6 P1_00
#define LCD_PINS_D7 P1_22

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif

#endif // !FYSETC_MINI_12864
Expand Down
5 changes: 5 additions & 0 deletions Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,11 @@
#define LCD_PINS_D5 P1_17 // (71) ENET_MDIO
#define LCD_PINS_D6 P1_14 // (73) ENET_RX_ER
#define LCD_PINS_D7 P1_10 // (75) ENET_RXD1

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif
#endif

Expand Down
5 changes: 5 additions & 0 deletions Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,9 @@
#define BTN_ENC P1_30

#define SD_DETECT_PIN -1

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif // IS_RRD_FG_SC
5 changes: 5 additions & 0 deletions Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,11 @@
#endif
#define BEEPER_PIN P1_30 // (37) not 5V tolerant
#define DOGLCD_CS P0_16 // (16)

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif

#if ENABLED(MINIPANEL)
Expand Down
5 changes: 5 additions & 0 deletions Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,11 @@
#define LCD_PINS_D5 P0_17
#define LCD_PINS_D6 P1_00
#define LCD_PINS_D7 P1_22

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif

#endif // !FYSETC_MINI_12864
Expand Down
4 changes: 4 additions & 0 deletions Marlin/src/pins/mega/pins_CHEAPTRONICv2.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@
#define LCD_PINS_D6 41
#define LCD_PINS_D7 40

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

//
// Beeper, SD Card, Encoder
//
Expand Down
4 changes: 4 additions & 0 deletions Marlin/src/pins/mega/pins_GT2560_REV_A.h
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,10 @@
#define LCD_PINS_D6 20
#define LCD_PINS_D7 19

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#define SD_DETECT_PIN -1

#endif // !IS_NEWPANEL
Expand Down
5 changes: 5 additions & 0 deletions Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,11 @@
#define LCD_PINS_D7 71
#define BTN_EN1 14
#define BTN_EN2 72

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif

#define BTN_ENC 9 // AUX-2
Expand Down
4 changes: 4 additions & 0 deletions Marlin/src/pins/rambo/pins_EINSY_RETRO.h
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,10 @@

#define SD_DETECT_PIN 15

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif // IS_ULTIPANEL || TOUCH_UI_ULTIPANEL || TOUCH_UI_FTDI_EVE

#endif // HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL || TOUCH_UI_FTDI_EVE
4 changes: 4 additions & 0 deletions Marlin/src/pins/rambo/pins_MINIRAMBO.h
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,10 @@

#endif // !MINIRAMBO_10A

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif // IS_ULTIPANEL || TOUCH_UI_ULTIPANEL

#endif // HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL
4 changes: 4 additions & 0 deletions Marlin/src/pins/rambo/pins_RAMBO.h
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,10 @@

#endif // !VIKI2 && !miniVIKI

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#else // !IS_NEWPANEL - old style panel with shift register

// No Beeper added
Expand Down
4 changes: 4 additions & 0 deletions Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,10 @@
#define DOGLCD_A0 27
#endif

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif

#if IS_NEWPANEL
Expand Down
4 changes: 4 additions & 0 deletions Marlin/src/pins/ramps/pins_RAMPS.h
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,10 @@

#endif

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

//
// LCD Display input pins
//
Expand Down
5 changes: 5 additions & 0 deletions Marlin/src/pins/ramps/pins_RAMPS_S_12.h
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,11 @@
#ifndef SD_DETECT_PIN
#define SD_DETECT_PIN 38
#endif

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif

//
Expand Down
4 changes: 4 additions & 0 deletions Marlin/src/pins/ramps/pins_TT_OSCAR.h
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,10 @@

#endif

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

//
// LCD Display input pins
//
Expand Down
5 changes: 5 additions & 0 deletions Marlin/src/pins/sam/pins_ARCHIM1.h
Original file line number Diff line number Diff line change
Expand Up @@ -198,4 +198,9 @@
#define BTN_EN2 13 // D13 PB27_TIOB0
#define BTN_ENC 16 // D16 PA13_TXD1
#endif // IS_NEWPANEL

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif // HAS_WIRED_LCD
5 changes: 5 additions & 0 deletions Marlin/src/pins/sam/pins_DUE3DOM.h
Original file line number Diff line number Diff line change
Expand Up @@ -168,4 +168,9 @@

#define BEEPER_PIN -1
#endif // SPARK_FULL_GRAPHICS

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif // HAS_WIRED_LCD
5 changes: 5 additions & 0 deletions Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
Original file line number Diff line number Diff line change
Expand Up @@ -171,4 +171,9 @@
#define DOGLCD_CS 45

#endif // SPARK_FULL_GRAPHICS

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif // HAS_WIRED_LCD
4 changes: 4 additions & 0 deletions Marlin/src/pins/sam/pins_RADDS.h
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,10 @@

#endif // SPARK_FULL_GRAPHICS

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif // HAS_WIRED_LCD

#ifndef SDSS
Expand Down
4 changes: 4 additions & 0 deletions Marlin/src/pins/sam/pins_RAMPS_DUO.h
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,10 @@
#endif
#endif

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif // IS_NEWPANEL

#endif // HAS_WIRED_LCD
4 changes: 4 additions & 0 deletions Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,10 @@
#define DOGLCD_MISO 74 // MISO_PIN
#endif

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif // HAS_WIRED_LCD

#if HAS_TMC_UART
Expand Down
4 changes: 4 additions & 0 deletions Marlin/src/pins/sam/pins_RURAMPS4D_11.h
Original file line number Diff line number Diff line change
Expand Up @@ -271,4 +271,8 @@
#define BTN_ENC 40
#endif

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif // HAS_WIRED_LCD
4 changes: 4 additions & 0 deletions Marlin/src/pins/sam/pins_RURAMPS4D_13.h
Original file line number Diff line number Diff line change
Expand Up @@ -253,4 +253,8 @@
#define BTN_ENC 40
#endif

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif // HAS_WIRED_LCD
4 changes: 4 additions & 0 deletions Marlin/src/pins/samd/pins_RAMPS_144.h
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,10 @@
#endif
#endif // IS_NEWPANEL

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif // HAS_WIRED_LCD

//
Expand Down
4 changes: 4 additions & 0 deletions Marlin/src/pins/sanguino/pins_ANET_10.h
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,10 @@

#endif

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#else

#define SERVO0_PIN 27
Expand Down
5 changes: 5 additions & 0 deletions Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,11 @@
#define LCD_PINS_D5 PB7
#define LCD_PINS_D6 PC15
#define LCD_PINS_D7 PC14

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif

#endif // !FYSETC_MINI_12864
Expand Down
4 changes: 4 additions & 0 deletions Marlin/src/pins/stm32f1/pins_CHITU3D.h
Original file line number Diff line number Diff line change
Expand Up @@ -283,4 +283,8 @@
#endif
#endif // IS_NEWPANEL

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif // HAS_WIRED_LCD
4 changes: 4 additions & 0 deletions Marlin/src/pins/stm32f1/pins_FLY_MINI.h
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,10 @@
#define BTN_EN2 PB3
#define BTN_ENC PC13

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

//
// Filament runout
//
Expand Down
5 changes: 5 additions & 0 deletions Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,11 @@
#define LCD_PINS_D5 PE15
#define LCD_PINS_D6 PD11
#define LCD_PINS_D7 PD10

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif

#ifndef BOARD_ST7920_DELAY_1
Expand Down
5 changes: 5 additions & 0 deletions Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,11 @@
#define LCD_PINS_D5 PA7
#define LCD_PINS_D6 PC4
#define LCD_PINS_D7 PC5

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif

#endif // !MKS_MINI_12864
Expand Down
5 changes: 5 additions & 0 deletions Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,11 @@
#define LCD_PINS_D5 PA7
#define LCD_PINS_D6 PC4
#define LCD_PINS_D7 PC5

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif

#endif // !MKS_MINI_12864
Expand Down
5 changes: 5 additions & 0 deletions Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,11 @@
#define LCD_PINS_D5 PE15
#define LCD_PINS_D6 PD11
#define LCD_PINS_D7 PD10

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif

#ifndef BOARD_ST7920_DELAY_1
Expand Down
5 changes: 5 additions & 0 deletions Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,11 @@
#define LCD_PINS_D5 PF15
#define LCD_PINS_D6 PF12
#define LCD_PINS_D7 PF13

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif

#endif // !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY
Expand Down
4 changes: 4 additions & 0 deletions Marlin/src/pins/stm32f1/pins_STM32F1R.h
Original file line number Diff line number Diff line change
Expand Up @@ -258,4 +258,8 @@
#endif
#endif // IS_NEWPANEL

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif

#endif // HAS_WIRED_LCD
Loading

0 comments on commit 6c97adb

Please sign in to comment.