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

TFT pins for BTT GTR V1

Browse source 
Proposed in #21772
This commit is contained in:
Scott Lahteine 2021-05-02 03:29:29 -05:00
parent a24eb691fb
commit 0b3da61ac7
2 changed files with 73 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
View file

@ -342,7 +342,7 @@
#endif #endif
#ifndef SDCARD_CONNECTION #ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD #define SDCARD_CONNECTION ONBOARD
#endif #endif
// //
@ -352,8 +352,8 @@
// //
#if SD_CONNECTION_IS(LCD) #if SD_CONNECTION_IS(LCD)
#define SD_DETECT_PIN PB10 #define SD_DETECT_PIN EXP2_04_PIN
#define SDSS PB12 #define SDSS EXP2_07_PIN
#elif SD_CONNECTION_IS(ONBOARD) #elif SD_CONNECTION_IS(ONBOARD)
@ -371,31 +371,63 @@
#endif #endif
/** /**
* ----- ----- * ------ ------
* NC | · · | GND 5V | · · | GND * NC | 1 2 | GND 5V | 1 2 | GND
* RESET | · · | PB10(SD_DETECT) (LCD_D7) PG5 | · · | PG6 (LCD_D6) * RESET | 3 4 | PB10 (SD_DETECT) (LCD_D7) PG5 | 3 4 | PG6 (LCD_D6)
* (MOSI)PB15 | · · | PH10(BTN_EN2) (LCD_D5) PG7 | · · | PG8 (LCD_D4) * (MOSI) PB15 | 5 6 | PH10 (BTN_EN2) (LCD_D5) PG7 | 5 6 | PG8 (LCD_D4)
* (SD_SS)PB12 | · · | PD10(BTN_EN1) (LCD_RS) PA8 | · · | PC10 (LCD_EN) * (SD_SS) PB12 | 7 8 | PD10 (BTN_EN1) (LCD_RS) PA8 | 7 8 | PC10 (LCD_EN)
* (SCK)PB13 | · · | PB14(MISO) (BTN_ENC) PA15 | · · | PC11 (BEEPER) * (SCK) PB13 | 9 10 | PB14 (MISO) (BTN_ENC) PA15 | 9 10 | PC11 (BEEPER)
* ----- ----- * ------ ------
* EXP2 EXP1 * EXP2 EXP1
*/ */
#define EXP1_03_PIN PG5
#define EXP1_04_PIN PG6
#define EXP1_05_PIN PG7
#define EXP1_06_PIN PG8
#define EXP1_07_PIN PA8
#define EXP1_08_PIN PC10
#define EXP1_09_PIN PA15
#define EXP1_10_PIN PC11
#define EXP2_04_PIN PB10
#define EXP2_05_PIN PB15
#define EXP2_06_PIN PH10
#define EXP2_07_PIN PB12
#define EXP2_08_PIN PD10
#define EXP2_09_PIN PB13
#define EXP2_10_PIN PB14
// //
// LCDs and Controllers // LCDs and Controllers
// //
#if HAS_WIRED_LCD #if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI)
#define BEEPER_PIN PC11
#define BTN_ENC PA15 #define TFT_CS_PIN EXP2_07_PIN
#define TFT_A0_PIN EXP2_04_PIN
#define TFT_SCK_PIN EXP2_09_PIN
#define TFT_MISO_PIN EXP2_10_PIN
#define TFT_MOSI_PIN EXP2_05_PIN
#define TOUCH_INT_PIN EXP1_04_PIN
#define TOUCH_MISO_PIN EXP1_05_PIN
#define TOUCH_MOSI_PIN EXP1_08_PIN
#define TOUCH_SCK_PIN EXP1_06_PIN
#define TOUCH_CS_PIN EXP1_07_PIN
#define BTN_EN1 EXP2_08_PIN
#define BTN_EN2 EXP2_06_PIN
#elif HAS_WIRED_LCD
#define BEEPER_PIN EXP1_10_PIN
#define BTN_ENC EXP1_09_PIN
#if ENABLED(CR10_STOCKDISPLAY) #if ENABLED(CR10_STOCKDISPLAY)
#define LCD_PINS_RS PG6 #define LCD_PINS_RS EXP1_04_PIN
#define BTN_EN1 PC10 #define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 PG8 #define BTN_EN2 EXP1_06_PIN
#define LCD_PINS_ENABLE PG5 #define LCD_PINS_ENABLE EXP1_03_PIN
#define LCD_PINS_D4 PG7 #define LCD_PINS_D4 EXP1_05_PIN
// CR10_STOCKDISPLAY default timing is too fast // CR10_STOCKDISPLAY default timing is too fast
#undef BOARD_ST7920_DELAY_1 #undef BOARD_ST7920_DELAY_1
@ -403,53 +435,53 @@
#undef BOARD_ST7920_DELAY_3 #undef BOARD_ST7920_DELAY_3
#elif ENABLED(MKS_MINI_12864) #elif ENABLED(MKS_MINI_12864)
#define DOGLCD_A0 PG6 #define DOGLCD_A0 EXP1_04_PIN
#define DOGLCD_CS PG7 #define DOGLCD_CS EXP1_05_PIN
#define BTN_EN1 PD10 #define BTN_EN1 EXP2_08_PIN
#define BTN_EN2 PH10 #define BTN_EN2 EXP2_06_PIN
#if SD_CONNECTION_IS(ONBOARD) #if SD_CONNECTION_IS(ONBOARD)
#define SOFTWARE_SPI #define SOFTWARE_SPI
#endif #endif
#else #else
#define LCD_PINS_RS PA8 #define LCD_PINS_RS EXP1_07_PIN
#define BTN_EN1 PD10 #define BTN_EN1 EXP2_08_PIN
#define BTN_EN2 PH10 #define BTN_EN2 EXP2_06_PIN
#define LCD_PINS_ENABLE PC10 #define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_D4 PG8 #define LCD_PINS_D4 EXP1_06_PIN
#if ENABLED(FYSETC_MINI_12864) #if ENABLED(FYSETC_MINI_12864)
#define DOGLCD_CS PC10 #define DOGLCD_CS EXP1_08_PIN
#define DOGLCD_A0 PA8 #define DOGLCD_A0 EXP1_07_PIN
#if SD_CONNECTION_IS(ONBOARD) #if SD_CONNECTION_IS(ONBOARD)
#define SOFTWARE_SPI #define SOFTWARE_SPI
#endif #endif
//#define LCD_BACKLIGHT_PIN -1 //#define LCD_BACKLIGHT_PIN -1
#define LCD_RESET_PIN PG8 // Must be high or open for LCD to operate normally. #define LCD_RESET_PIN EXP1_06_PIN // Must be high or open for LCD to operate normally.
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN #ifndef RGB_LED_R_PIN
#define RGB_LED_R_PIN PG7 #define RGB_LED_R_PIN EXP1_05_PIN
#endif #endif
#ifndef RGB_LED_G_PIN #ifndef RGB_LED_G_PIN
#define RGB_LED_G_PIN PG6 #define RGB_LED_G_PIN EXP1_04_PIN
#endif #endif
#ifndef RGB_LED_B_PIN #ifndef RGB_LED_B_PIN
#define RGB_LED_B_PIN PG5 #define RGB_LED_B_PIN EXP1_03_PIN
#endif #endif
#elif ENABLED(FYSETC_MINI_12864_2_1) #elif ENABLED(FYSETC_MINI_12864_2_1)
#define NEOPIXEL_PIN PG7 #define NEOPIXEL_PIN EXP1_05_PIN
#endif #endif
#endif // !FYSETC_MINI_12864 #endif // !FYSETC_MINI_12864
#if IS_ULTIPANEL #if IS_ULTIPANEL
#define LCD_PINS_D5 PG7 #define LCD_PINS_D5 EXP1_05_PIN
#define LCD_PINS_D6 PG6 #define LCD_PINS_D6 EXP1_04_PIN
#define LCD_PINS_D7 PG5 #define LCD_PINS_D7 EXP1_03_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder #define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder

6
Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
View file

@ -200,9 +200,9 @@
#if HOTENDS == 1 #if HOTENDS == 1
#if TEMP_SENSOR_PROBE #if TEMP_SENSOR_PROBE
#define TEMP_PROBE_PIN TEMP_1_PIN #define TEMP_PROBE_PIN TEMP_1_PIN
#elif TEMP_SENSOR_CHAMBER #elif TEMP_SENSOR_CHAMBER
#define TEMP_CHAMBER_PIN TEMP_1_PIN #define TEMP_CHAMBER_PIN TEMP_1_PIN
#endif #endif
#endif #endif
@ -288,7 +288,7 @@
// SD Connection // SD Connection
// //
#ifndef SDCARD_CONNECTION #ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION LCD #define SDCARD_CONNECTION LCD
#endif #endif
/** /**