thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

🚸 Renumber EXP pins to match schematics/RRF/Klipper

Browse Source
This commit is contained in:
Scott Lahteine
2022-07-16 16:26:36 -05:00
parent 05a7be7b25
commit 504fec9823
53 changed files with 2587 additions and 2589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h
View File

@@ -213,31 +213,31 @@
/**
* ------ ------
* (BEEPER) PB2 |10 9 | PE10 (BTN_ENC) (SPI1 MISO) PA6 |10 9 | PA5 (SPI1 SCK)
* (LCD_EN) PE11 | 8 7 | PD10 (LCD_RS) (BTN_EN1) PE9 | 8 7 | PA4 (SPI1 CS)
* (LCD_D4) PD9 6 5 | PD8 (LCD_D5) (BTN_EN2) PE8 6 5 | PA7 (SPI1 MOSI)
* (LCD_D6) PE15 | 4 3 | PE7 (LCD_D7) (SPI1_RS) PB11 | 4 3 | RESET
* GND | 2 1 | 5V GND | 2 1 | 3.3V
* (BEEPER) PB2 | 1 2 | PE10 (BTN_ENC) (SPI1 MISO) PA6 | 1 2 | PA5 (SPI1 SCK)
* (LCD_EN) PE11 | 3 4 | PD10 (LCD_RS) (BTN_EN1) PE9 | 3 4 | PA4 (SPI1 CS)
* (LCD_D4) PD9 5 6 | PD8 (LCD_D5) (BTN_EN2) PE8 5 6 | PA7 (SPI1 MOSI)
* (LCD_D6) PE15 | 7 8 | PE7 (LCD_D7) (SPI1_RS) PB11 | 7 8 | RESET
* GND | 9 10 | 5V GND | 9 10 | 3.3V
* ------ ------
* EXP1 EXP2
*/
#define EXP1_03_PIN PE7
#define EXP1_04_PIN PE15
#define EXP1_05_PIN PD8
#define EXP1_06_PIN PD9
#define EXP1_07_PIN PD10
#define EXP1_08_PIN PE11
#define EXP1_09_PIN PE10
#define EXP1_10_PIN PB2
#define EXP1_08_PIN PE7
#define EXP1_07_PIN PE15
#define EXP1_06_PIN PD8
#define EXP1_05_PIN PD9
#define EXP1_04_PIN PD10
#define EXP1_03_PIN PE11
#define EXP1_02_PIN PE10
#define EXP1_01_PIN PB2
#define EXP2_03_PIN -1 // RESET
#define EXP2_04_PIN PB11
#define EXP2_05_PIN PA7
#define EXP2_06_PIN PE8
#define EXP2_07_PIN PA4
#define EXP2_08_PIN PE9
#define EXP2_09_PIN PA5
#define EXP2_10_PIN PA6
#define EXP2_08_PIN -1 // RESET
#define EXP2_07_PIN PB11
#define EXP2_06_PIN PA7
#define EXP2_05_PIN PE8
#define EXP2_04_PIN PA4
#define EXP2_03_PIN PE9
#define EXP2_02_PIN PA5
#define EXP2_01_PIN PA6
#if ENABLED(SDSUPPORT)
#ifndef SDCARD_CONNECTION
@@ -253,25 +253,25 @@
#define SD_DETECT_PIN PC4 // SD_DETECT_PIN doesn't work with NO_SD_HOST_DRIVE disabled
#elif SD_CONNECTION_IS(LCD)
#define ENABLE_SPI1
#define SDSS EXP2_07_PIN
#define SD_SCK_PIN EXP2_09_PIN
#define SD_MISO_PIN EXP2_10_PIN
#define SD_MOSI_PIN EXP2_05_PIN
#define SD_DETECT_PIN EXP2_04_PIN
#define SDSS EXP2_04_PIN
#define SD_SCK_PIN EXP2_02_PIN
#define SD_MISO_PIN EXP2_01_PIN
#define SD_MOSI_PIN EXP2_06_PIN
#define SD_DETECT_PIN EXP2_07_PIN
#endif
#endif
#if EITHER(TFT_COLOR_UI, TFT_CLASSIC_UI)
#define TFT_CS_PIN EXP1_04_PIN
#define TFT_SCK_PIN EXP2_09_PIN
#define TFT_MISO_PIN EXP2_10_PIN
#define TFT_MOSI_PIN EXP2_05_PIN
#define TFT_DC_PIN EXP1_03_PIN
#define TFT_CS_PIN EXP1_07_PIN
#define TFT_SCK_PIN EXP2_02_PIN
#define TFT_MISO_PIN EXP2_01_PIN
#define TFT_MOSI_PIN EXP2_06_PIN
#define TFT_DC_PIN EXP1_08_PIN
#define TFT_A0_PIN TFT_DC_PIN
#define TFT_RESET_PIN EXP1_07_PIN
#define TFT_RESET_PIN EXP1_04_PIN
#define LCD_BACKLIGHT_PIN EXP1_08_PIN
#define LCD_BACKLIGHT_PIN EXP1_03_PIN
#define TFT_BACKLIGHT_PIN LCD_BACKLIGHT_PIN
#define TOUCH_BUTTONS_HW_SPI
@@ -284,10 +284,10 @@
#define TFT_HEIGHT 320
#endif
#define TOUCH_CS_PIN EXP1_06_PIN // SPI1_NSS
#define TOUCH_SCK_PIN EXP2_09_PIN // SPI1_SCK
#define TOUCH_MISO_PIN EXP2_10_PIN // SPI1_MISO
#define TOUCH_MOSI_PIN EXP2_05_PIN // SPI1_MOSI
#define TOUCH_CS_PIN EXP1_05_PIN // SPI1_NSS
#define TOUCH_SCK_PIN EXP2_02_PIN // SPI1_SCK
#define TOUCH_MISO_PIN EXP2_01_PIN // SPI1_MISO
#define TOUCH_MOSI_PIN EXP2_06_PIN // SPI1_MOSI
#define LCD_READ_ID 0xD3
#define LCD_USE_DMA_SPI
@@ -312,8 +312,8 @@
#elif HAS_WIRED_LCD
#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_RS EXP1_07_PIN
#define LCD_PINS_ENABLE EXP1_03_PIN
#define LCD_PINS_RS EXP1_04_PIN
#define LCD_BACKLIGHT_PIN -1
// MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
@@ -321,23 +321,23 @@
#define ENABLE_SPI1
#define FORCE_SOFT_SPI
#define DOGLCD_A0 EXP1_04_PIN
#define DOGLCD_CS EXP1_05_PIN
#define DOGLCD_SCK EXP2_09_PIN
#define DOGLCD_MOSI EXP2_05_PIN
#define DOGLCD_A0 EXP1_07_PIN
#define DOGLCD_CS EXP1_06_PIN
#define DOGLCD_SCK EXP2_02_PIN
#define DOGLCD_MOSI EXP2_06_PIN
//#define LCD_BACKLIGHT_PIN -1
//#define LCD_RESET_PIN -1
#elif ENABLED(FYSETC_MINI_12864_2_1)
#define LCD_PINS_DC EXP1_07_PIN
#define DOGLCD_CS EXP1_08_PIN
#define LCD_PINS_DC EXP1_04_PIN
#define DOGLCD_CS EXP1_03_PIN
#define DOGLCD_A0 LCD_PINS_DC
#define LCD_BACKLIGHT_PIN -1
#define LCD_RESET_PIN EXP1_06_PIN
#define NEOPIXEL_PIN EXP1_05_PIN
#define DOGLCD_MOSI EXP2_05_PIN
#define DOGLCD_SCK EXP2_09_PIN
#define LCD_RESET_PIN EXP1_05_PIN
#define NEOPIXEL_PIN EXP1_06_PIN
#define DOGLCD_MOSI EXP2_06_PIN
#define DOGLCD_SCK EXP2_02_PIN
#if SD_CONNECTION_IS(ONBOARD)
#define FORCE_SOFT_SPI
#endif
@@ -345,11 +345,11 @@
#else
#define LCD_PINS_D4 EXP1_06_PIN
#define LCD_PINS_D4 EXP1_05_PIN
#if ENABLED(ULTIPANEL)
#define LCD_PINS_D5 EXP1_05_PIN
#define LCD_PINS_D6 EXP1_04_PIN
#define LCD_PINS_D7 EXP1_03_PIN
#define LCD_PINS_D5 EXP1_06_PIN
#define LCD_PINS_D6 EXP1_07_PIN
#define LCD_PINS_D7 EXP1_08_PIN
#endif
#define BOARD_ST7920_DELAY_1 96
@@ -361,8 +361,8 @@
#endif // HAS_WIRED_LCD
#if ANY(TFT_COLOR_UI, TFT_CLASSIC_UI, HAS_WIRED_LCD)
#define BEEPER_PIN EXP1_10_PIN
#define BTN_EN1 EXP2_08_PIN
#define BTN_EN2 EXP2_06_PIN
#define BTN_ENC EXP1_09_PIN
#define BEEPER_PIN EXP1_01_PIN
#define BTN_EN1 EXP2_03_PIN
#define BTN_EN2 EXP2_05_PIN
#define BTN_ENC EXP1_02_PIN
#endif