bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🎨 EXP1/2 headers and pins cleanup (#22628)

Browse Source
This commit is contained in:
Scott Lahteine
2021-08-24 18:07:41 -05:00
committed by Scott Lahteine
parent 02ae4bc9b9
commit 95f27cf339
40 changed files with 593 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
View File

@@ -158,8 +158,6 @@
// SD Card
//
#define HAS_ONBOARD_SD
#ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD
#endif

6
Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
View File

@@ -156,7 +156,7 @@
#define USB_CONNECT_INVERTING false
/**
* _____
* -----
* 5V | 1 2 | GND
* (LCD_EN) PB7 | 3 4 | PB8 (LCD_RS)
* (LCD_D4) PB9 | 5 6 PA10 (BTN_EN2)
@@ -195,7 +195,7 @@
#elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
/** Creality Ender-2 display pinout
* _____
* -----
* 5V | 1 2 | GND
* (MOSI) PB7 | 3 4 | PB8 (LCD_RS)
* (LCD_A0) PB9 | 5 6 PA10 (BTN_EN2)
@@ -229,7 +229,7 @@
/** FYSETC TFT TFT81050 display pinout
*
* Board Display
* _____ _____
* ----- -----
* 5V | 1 2 | GND (SPI1-MISO) MISO | 1 2 | SCK (SPI1-SCK)
* (FREE) PB7 | 3 4 | PB8 (LCD_CS) (PA9) MOD_RESET | 3 4 | SD_CS (PA10)
* (FREE) PB9 | 5 6 PA10 (SD_CS) (PB8) LCD_CS | 5 6 MOSI (SPI1-MOSI)

8
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
View File

@@ -117,7 +117,7 @@
/**
* SKR Mini E3 V1.0, V1.2 SKR Mini E3 V2.0
* ______ ______
* ------ ------
* 5V | 1 2 | GND 5V | 1 2 | GND
* (LCD_EN) PB7 | 3 4 | PB8 (LCD_RS) (LCD_EN) PB15 | 3 4 | PB8 (LCD_RS)
* (LCD_D4) PB9 | 5 6 PA10 (BTN_EN2) (LCD_D4) PB9 | 5 6 PA10 (BTN_EN2)
@@ -134,7 +134,7 @@
#define EXP1_3 PB7
#endif
#if ENABLED(DWIN_CREALITY_LCD)
#if EITHER(DWIN_CREALITY_LCD, IS_DWIN_MARLINUI)
/**
* ------ ------ ------
* VCC | 1 2 | GND VCC | 1 2 | GND GND | 2 1 | VCC
@@ -205,7 +205,7 @@
* TFTGLCD_PANEL_SPI display pinout
*
* Board Display
* ______ ______
* ------ ------
* 5V | 1 2 | GND (SPI1-MISO) MISO | 1 2 | SCK (SPI1-SCK)
* (FREE) PB7 | 3 4 | PB8 (LCD_CS) (PA9) LCD_CS | 3 4 | SD_CS (PA10)
* (FREE) PB9 | 5 6 | PA10 (SD_CS) (FREE) | 5 6 | MOSI (SPI1-MOSI)
@@ -248,7 +248,7 @@
* FYSETC TFT TFT81050 display pinout
*
* Board Display
* ______ ______
* ------ ------
* 5V | 1 2 | GND (SPI1-MISO) MISO | 1 2 | SCK (SPI1-SCK)
* (FREE) PB7 | 3 4 | PB8 (LCD_CS) (PA9) MOD_RESET | 3 4 | SD_CS (PA10)
* (FREE) PB9 | 5 6 | PA10 (SD_CS) (PB8) LCD_CS | 5 6 | MOSI (SPI1-MOSI)

2
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
View File

@@ -98,7 +98,7 @@
//
/**
* _____ _____
* ----- -----
* NC | · · | GND 5V | · · | GND
* RESET | · · | PB9 (SD_DETECT) (LCD_D7) PC14 | · · | PC15 (LCD_D6)
* (MOSI) PB5 | · · | PB8 (BTN_EN2) (LCD_D5) PB7 | · · | PC13 (LCD_D4)

2
Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
View File

@@ -122,7 +122,7 @@
#define NEOPIXEL_PIN PC7 // The NEOPIXEL LED driving pin
/**
* 1 _____ 2
* 1 ----- 2
* PB5 | · · | PB6
* PA2 | · · | RESET
* PA3 | · · | PB8

1
Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
View File

@@ -194,7 +194,6 @@
//#define LCD_LED_PIN PB2
#ifndef BEEPER_PIN
#define BEEPER_PIN PB13
//#undef SPEAKER
#endif
#elif ENABLED(DWIN_VET6_CREALITY_LCD)

75
Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
View File

@@ -156,35 +156,67 @@
#define SDIO_SUPPORT
#define NO_SD_HOST_DRIVE // This board's SD is only seen by the printer
#if ENABLED(CR10_STOCKDISPLAY) && NONE(RET6_12864_LCD, VET6_12864_LCD)
#error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
#endif
#if ENABLED(CR10_STOCKDISPLAY)
#if ENABLED(RET6_12864_LCD)
#if ENABLED(RET6_12864_LCD)
// RET6 12864 LCD
#define LCD_PINS_RS PB12
#define LCD_PINS_ENABLE PB15
#define LCD_PINS_D4 PB13
/**
* RET6 12864 LCD
* ------
* PC6 |10 9 | PB2
* PB10 | 8 7 | PE8
* PB14 | 6 5 | PB13
* PB12 | 4 3 | PB15
* GND | 2 1 | 5V
* ------
* EXP1
*/
#define EXP1_03_PIN PB15
#define EXP1_04_PIN PB12
#define EXP1_05_PIN PB13
#define EXP1_06_PIN PB14
#define EXP1_07_PIN PE8
#define EXP1_08_PIN PB10
#define EXP1_09_PIN PB2
#define EXP1_10_PIN PC6
#define BTN_ENC PB2
#define BTN_EN1 PB10
#define BTN_EN2 PB14
#define BEEPER_PIN EXP1_10_PIN
#define BEEPER_PIN PC6
#elif ENABLED(VET6_12864_LCD)
#elif ENABLED(VET6_12864_LCD)
/**
* VET6 12864 LCD
* ------
* ? |10 9 | PC5
* PB10 | 8 7 | ?
* PA6 | 6 5 | PA5
* PA4 | 4 3 | PA7
* GND | 2 1 | 5V
* ------
* EXP1
*/
#define EXP1_03_PIN PA7
#define EXP1_04_PIN PA4
#define EXP1_05_PIN PA5
#define EXP1_06_PIN PA6
#define EXP1_07_PIN -1
#define EXP1_08_PIN PB10
#define EXP1_09_PIN PC5
#define EXP1_10_PIN -1
// VET6 12864 LCD
#define LCD_PINS_RS PA4
#define LCD_PINS_ENABLE PA7
#define LCD_PINS_D4 PA5
#else
#error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
#endif
#define BTN_ENC PC5
#define BTN_EN1 PB10
#define BTN_EN2 PA6
#define LCD_PINS_RS EXP1_04_PIN
#define LCD_PINS_ENABLE EXP1_03_PIN
#define LCD_PINS_D4 EXP1_05_PIN
#elif ENABLED(DWIN_CREALITY_LCD)
#define BTN_ENC EXP1_09_PIN
#define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 EXP1_06_PIN
#elif EITHER(DWIN_CREALITY_LCD, IS_DWIN_MARLINUI)
// RET6 DWIN ENCODER LCD
#define BTN_ENC PB14
@@ -194,7 +226,6 @@
//#define LCD_LED_PIN PB2
#ifndef BEEPER_PIN
#define BEEPER_PIN PB13
#undef SPEAKER
#endif
#elif ENABLED(DWIN_VET6_CREALITY_LCD)

4
Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
View File

@@ -132,8 +132,8 @@
/*
* EXP1 pinout for the LCD according to Fysetcs schematic for the Cheetah board
* _____
* (Beeper) PC9 | 1 2 | PC12 (BTN_ENC)
* -----
* (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)

2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
View File

@@ -133,7 +133,7 @@
#endif
/**
* _____ _____ _____
* ----- ----- -----
* (BEEPER) PC1 | 1 2 | PC3 (BTN_ENC) (MISO) PB14 | 1 2 | PB13 (SD_SCK) 5V | 1 2 | GND
* (LCD_EN) PA4 | 3 4 | PA5 (LCD_RS) (BTN_EN1) PB11 | 3 4 | PA15 (SD_SS) (LCD_EN) PA4 | 3 4 | PA5 (LCD_RS)
* (LCD_D4) PA6 | 5 6 PA7 (LCD_D5) (BTN_EN2) PB0 | 5 6 PB15 (SD_MOSI) (LCD_D4) PA6 | 5 6 PB0 (BTN_EN2)

18
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
View File

@@ -299,14 +299,16 @@
#endif
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
#endif
#ifndef BOARD_ST7920_DELAY_2
#define BOARD_ST7920_DELAY_2 DELAY_NS(125)
#endif
#ifndef BOARD_ST7920_DELAY_3
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
#if HAS_MARLINUI_U8GLIB
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
#endif
#ifndef BOARD_ST7920_DELAY_2
#define BOARD_ST7920_DELAY_2 DELAY_NS(125)
#endif
#ifndef BOARD_ST7920_DELAY_3
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
#endif
#endif
#define HAS_SPI_FLASH 1

6
Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
View File

@@ -201,9 +201,9 @@
#define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 EXP1_06_PIN
#define BTN_ENC EXP1_04_PIN
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
#define BOARD_ST7920_DELAY_2 DELAY_NS(200)
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
#define BOARD_ST7920_DELAY_2 DELAY_NS(200)
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
#elif EITHER(ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306)

6
Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
View File

@@ -332,9 +332,9 @@
#endif
#if HAS_MARLINUI_U8GLIB
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
#define BOARD_ST7920_DELAY_2 DELAY_NS(250)
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
#define BOARD_ST7920_DELAY_2 DELAY_NS(250)
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
#endif
// Remap SERVO0 PIN for BLTouch

6
Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
View File

@@ -305,9 +305,9 @@
#endif
#if HAS_MARLINUI_U8GLIB
#define BOARD_ST7920_DELAY_1 DELAY_NS(200) // Tclk_fall <200ns
#define BOARD_ST7920_DELAY_2 DELAY_NS(250) // Tdata_width >200ns
#define BOARD_ST7920_DELAY_3 DELAY_NS(200) // Tclk_rise <200ns
#define BOARD_ST7920_DELAY_1 DELAY_NS(200) // Tclk_fall <200ns
#define BOARD_ST7920_DELAY_2 DELAY_NS(250) // Tdata_width >200ns
#define BOARD_ST7920_DELAY_3 DELAY_NS(200) // Tclk_rise <200ns
#endif
// Remap SERVO0 PIN for BLTouch