🎨 Update more EXP Headers

This commit is contained in:
Scott Lahteine
2021-08-29 13:51:57 -05:00
committed by Scott Lahteine
parent 7704d84419
commit 6769718264
11 changed files with 155 additions and 125 deletions

View File

@@ -96,7 +96,7 @@
/** ------ ------
* (BEEPER) PC10 |10 9 | PC11 (BTN_ENC) (MISO) PB4 |10 9 | PB3 (SCK)
* (LCD_EN) PB6 | 8 7 | PC12 (LCD_RS) (BTN_EN1) PD2 | 8 7 | PA15 (SD_SS)
* (LCD_D4) PC13 | 6 5 | PB7 (LCD_D5) (BTN_EN2) PB8 | 6 5 | PB5 (MOSI)
* (LCD_D4) PC13 6 5 | PB7 (LCD_D5) (BTN_EN2) PB8 6 5 | PB5 (MOSI)
* (LCD_D6) PC15 | 4 3 | PC14 (LCD_D7) (SD_DETECT) PB9 | 4 3 | RESET
* GND | 2 1 | 5V GND | 2 1 | NC
* ------ ------

View File

@@ -165,7 +165,7 @@
* ------
* PC6 |10 9 | PB2
* PB10 | 8 7 | PE8
* PB14 | 6 5 | PB13
* PB14 6 5 | PB13
* PB12 | 4 3 | PB15
* GND | 2 1 | 5V
* ------
@@ -189,7 +189,7 @@
* ------
* ? |10 9 | PC5
* PB10 | 8 7 | ?
* PA6 | 6 5 | PA5
* PA6 6 5 | PA5
* PA4 | 4 3 | PA7
* GND | 2 1 | 5V
* ------

View File

@@ -294,13 +294,14 @@
#define TFT_BACKLIGHT_PIN PD13
#define LCD_USE_DMA_FSMC // Use DMA transfers to send data to the TFT
#define FSMC_CS_PIN PD7 // NE4
#define FSMC_RS_PIN PD11 // A0
#define FSMC_DMA_DEV DMA2
#define FSMC_DMA_CHANNEL DMA_CH5
#define TFT_CS_PIN TFT_CS_PIN
#define TFT_RS_PIN TFT_RS_PIN
#define FSMC_CS_PIN PD7 // NE4
#define FSMC_RS_PIN PD11 // A0
#define TFT_CS_PIN FSMC_CS_PIN
#define TFT_RS_PIN FSMC_RS_PIN
#ifdef TFT_CLASSIC_UI
#define TFT_MARLINBG_COLOR 0x3186 // Grey
@@ -309,11 +310,14 @@
#define TFT_BTOKMENU_COLOR 0x145F // Cyan
#endif
#define TFT_BUFFER_SIZE 14400
#elif HAS_GRAPHICAL_TFT
#define TFT_RESET_PIN PC6
#define TFT_BACKLIGHT_PIN PD13
#define TFT_CS_PIN PD7 // NE4
#define TFT_RS_PIN PD11 // A0
#endif
#if NEED_TOUCH_PINS

View File

@@ -130,29 +130,39 @@
#define RGB_LED_B_PIN PB6
#endif
/*
* EXP1 pinout for the LCD according to Fysetcs schematic for the Cheetah board
* -----
* (BEEPER) PC9 | 1 2 | PC12 (BTN_ENC)
* (BTN_EN2) PC11 | 3 4 | PB14 (LCD_RS / MISO)
* (BTN_EN1) PC10 5 6 | PB13 (SCK)
* (LCD_EN) PB12 | 7 8 | PB15 (MOSI)
* GND | 9 10| 5V
* -----
* EXP1
* Note: The pin-numbers match the connector correctly and are not in reverse order like on the Ender-3 board.
* Note: Functionally the pins are assigned in the same order as on the Ender-3 board.
* Note: Pin 4 on the Cheetah board is assigned to an I/O, it is assigned to RESET on the Ender-3 board.
*/
/**
* EXP1 pinout for the LCD according to FYSETC's Cheetah board schematic
* ------
* (BEEPER) PC9 |10 9 | PC12 (BTN_ENC)
* (BTN_EN2) PC11 | 8 7 | PB14 (LCD_RS / MISO)
* (BTN_EN1) PC10 6 5 | PB13 (SCK)
* (LCD_EN) PB12 | 4 3 | PB15 (MOSI)
* GND | 2 1 | 5V
* ------
* EXP1
*
* Notes:
* - The pin-numbers match the connector correctly and are not in reverse order like on the Ender-3 board.
* - Functionally the pins are assigned in the same order as on the Ender-3 board.
* - Pin 4 on the Cheetah board is assigned to an I/O, it is assigned to RESET on the Ender-3 board.
*/
#define EXP1_03_PIN PB15
#define EXP1_04_PIN PB12
#define EXP1_05_PIN PB13
#define EXP1_06_PIN PC10
#define EXP1_07_PIN PB14
#define EXP1_08_PIN PC11
#define EXP1_09_PIN PC12
#define EXP1_10_PIN PC9
#if HAS_WIRED_LCD
#define BEEPER_PIN PC9
#define BEEPER_PIN EXP1_10_PIN
#if HAS_MARLINUI_U8GLIB
#define DOGLCD_A0 PB14
#define DOGLCD_CS PB12
#define DOGLCD_SCK PB13
#define DOGLCD_MOSI PB15
#define DOGLCD_A0 EXP1_07_PIN
#define DOGLCD_CS EXP1_04_PIN
#define DOGLCD_SCK EXP1_05_PIN
#define DOGLCD_MOSI EXP1_03_PIN
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
@@ -162,30 +172,30 @@
#endif
#endif
#define LCD_PINS_RS PB12 // CS -- SOFT SPI for ENDER3 LCD
#define LCD_PINS_D4 PB13 // SCLK
#define LCD_PINS_ENABLE PB15 // DATA MOSI
#define LCD_PINS_RS EXP1_04_PIN // CS -- SOFT SPI for ENDER3 LCD
#define LCD_PINS_D4 EXP1_05_PIN // SCLK
#define LCD_PINS_ENABLE EXP1_03_PIN // DATA MOSI
//#define LCD_CONTRAST_INIT 190
#if IS_NEWPANEL
#define BTN_EN1 PC10
#define BTN_EN2 PC11
#define BTN_ENC PC12
#define BTN_EN1 EXP1_06_PIN
#define BTN_EN2 EXP1_08_PIN
#define BTN_ENC EXP1_09_PIN
#endif
#endif
#if ENABLED(TOUCH_UI_FTDI_EVE)
#define BEEPER_PIN PC9
#define CLCD_MOD_RESET PC11
#define CLCD_SPI_CS PB12
#define BEEPER_PIN EXP1_10_PIN
#define CLCD_MOD_RESET EXP1_08_PIN
#define CLCD_SPI_CS EXP1_04_PIN
//#define CLCD_USE_SOFT_SPI // the Cheetah can use hardware-SPI so we do not really need this
#if ENABLED(CLCD_USE_SOFT_SPI)
#define CLCD_SOFT_SPI_MOSI PB15
#define CLCD_SOFT_SPI_MISO PB14
#define CLCD_SOFT_SPI_SCLK PB13
#define CLCD_SOFT_SPI_MOSI EXP1_03_PIN
#define CLCD_SOFT_SPI_MISO EXP1_07_PIN
#define CLCD_SOFT_SPI_SCLK EXP1_05_PIN
#else
#define CLCD_SPI_BUS 2
#endif