From e48dd40b53999530d1e67e161975367a0832c84d Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 7 Oct 2025 21:50:24 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20Misc.=20LCD?= =?UTF-8?q?=20pins=20corrections?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/inc/Conditionals-2-LCD.h | 78 ++++++++++- Marlin/src/inc/SanityCheck.h | 73 ---------- Marlin/src/pins/esp32/pins_MKS_TINYBEE.h | 2 + Marlin/src/pins/esp32/pins_MM_JOKER.h | 13 +- Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h | 58 +++++--- Marlin/src/pins/lpc1768/pins_MKS_SBASE.h | 2 + .../pins/lpc1769/pins_XTLW_CLIMBER_8TH_LPC.h | 119 ++++++++++------- Marlin/src/pins/mega/pins_GT2560_V3.h | 8 +- Marlin/src/pins/mega/pins_GT2560_V41b.h | 4 +- Marlin/src/pins/mega/pins_WANHAO_D9.h | 1 + Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h | 1 + .../pins/stm32f1/pins_KEDI_CONTROLLER_V1_2.h | 110 +++++++-------- Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h | 2 + .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h | 2 + Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h | 2 + Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h | 76 +++++++---- .../src/pins/stm32f4/pins_BTT_BTT002_V1_0.h | 2 +- Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h | 2 +- .../pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h | 2 +- .../pins/stm32f4/pins_BTT_SKR_PRO_common.h | 4 +- Marlin/src/pins/stm32f4/pins_FLY_CDY_V3.h | 1 + Marlin/src/pins/stm32f4/pins_FLY_D8.h | 1 + .../pins/stm32f4/pins_FYSETC_CHEETAH_V20.h | 2 +- .../pins/stm32f4/pins_FYSETC_CHEETAH_V30.h | 2 +- .../pins/stm32f4/pins_FYSETC_SPIDER_KING407.h | 126 +++++++++--------- Marlin/src/pins/stm32f4/pins_I3DBEEZ9.h | 2 - .../src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h | 2 +- .../pins/stm32f4/pins_MKS_MONSTER8_common.h | 4 + Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h | 2 +- .../src/pins/stm32f4/pins_XTLW_CLIMBER_8TH.h | 5 +- .../pins/stm32g0/pins_BTT_MANTA_M5P_V1_0.h | 2 +- .../pins/stm32g0/pins_BTT_MANTA_M8P_common.h | 2 +- Marlin/src/pins/stm32g0/pins_BTT_SKRAT_V1_0.h | 5 +- .../src/pins/stm32h7/pins_BTT_KRAKEN_V1_0.h | 4 +- .../stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h | 2 +- .../pins/stm32h7/pins_BTT_SKR_V3_0_common.h | 2 +- Marlin/src/pins/stm32h7/pins_FLY_D8_PRO.h | 1 + 37 files changed, 410 insertions(+), 316 deletions(-) diff --git a/Marlin/src/inc/Conditionals-2-LCD.h b/Marlin/src/inc/Conditionals-2-LCD.h index 41d3805954..49d8121f0c 100644 --- a/Marlin/src/inc/Conditionals-2-LCD.h +++ b/Marlin/src/inc/Conditionals-2-LCD.h @@ -99,8 +99,9 @@ * * DOGLCD : Run a Graphical LCD through U8GLib (with MarlinUI) * IS_ULTIPANEL : Define LCD_PINS_D5/6/7 for direct-connected "Ultipanel" LCDs + * IS_NEWPANEL : A panel with encoder pins: ENC EN1 EN2 BEEPER. * HAS_WIRED_LCD : Ultra LCD, not necessarily Ultipanel. - * IS_RRD_SC : Common RRD Smart Controller digital interface pins + * IS_RRD_SC : Common RRD Smart Controller digital interface pins: RS EN D4 D5 D6 D7. * IS_RRD_FG_SC : Common RRD Full Graphical Smart Controller digital interface pins * IS_U8GLIB_ST7920 : Most common DOGM display SPI interface, supporting a "lightweight" display mode. * U8GLIB_SH1106 : SH1106 OLED with I2C interface via U8GLib @@ -890,3 +891,78 @@ #if LED_POWEROFF_TIMEOUT > 0 #define HAS_LED_POWEROFF_TIMEOUT 1 #endif + +#define LCD_ENABLED_COUNT 0 \ + + ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) \ + + ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) \ + + (ENABLED(U8GLIB_SSD1306) && DISABLED(IS_U8GLIB_SSD1306)) \ + + (ENABLED(MINIPANEL) && NONE(MKS_MINI_12864, ENDER2_STOCKDISPLAY)) \ + + (ENABLED(MKS_MINI_12864) && NONE(MKS_LCD12864A, MKS_LCD12864B)) \ + + (ENABLED(FYSETC_MINI_12864_2_1) && NONE(MKS_MINI_12864_V3, BTT_MINI_12864, BEEZ_MINI_12864)) \ + + COUNT_ENABLED(MKS_MINI_12864_V3, BTT_MINI_12864, BEEZ_MINI_12864) \ + + (ENABLED(EXTENSIBLE_UI) && DISABLED(IS_EXTUI)) \ + + (DISABLED(IS_LEGACY_TFT) && ENABLED(TFT_GENERIC)) \ + + (ENABLED(IS_LEGACY_TFT) && COUNT_ENABLED(TFT_320x240, TFT_320x240_SPI, TFT_480x320, TFT_480x320_SPI)) \ + + COUNT_ENABLED(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON, ANYCUBIC_TFT35, ANYCUBIC_LCD_VYPER) \ + + DGUS_UI_IS(ORIGIN) + DGUS_UI_IS(FYSETC) + DGUS_UI_IS(HIPRECY) + DGUS_UI_IS(MKS) + DGUS_UI_IS(RELOADED) + DGUS_UI_IS(IA_CREALITY) \ + + COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY) \ + + COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE, SOVOL_SV06_RTS) \ + + COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_GENERIC_12864_1_1) \ + + COUNT_ENABLED(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004) \ + + COUNT_ENABLED(MKS_12864OLED, MKS_12864OLED_SSD1306) \ + + COUNT_ENABLED(MKS_TS35_V2_0, MKS_ROBIN_TFT24, MKS_ROBIN_TFT28, MKS_ROBIN_TFT32, MKS_ROBIN_TFT35, MKS_ROBIN_TFT43, \ + MKS_ROBIN_TFT_V1_1R, ANET_ET4_TFT28, ANET_ET5_TFT35, BIQU_BX_TFT70, BTT_TFT35_SPI_V1_0) \ + + COUNT_ENABLED(TFTGLCD_PANEL_SPI, TFTGLCD_PANEL_I2C) \ + + COUNT_ENABLED(VIKI2, miniVIKI) \ + + ENABLED(WYH_L12864) \ + + COUNT_ENABLED(ZONESTAR_12864LCD, ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306) \ + + COUNT_ENABLED(ANET_FULL_GRAPHICS_LCD, CTC_A10S_A13) \ + + ENABLED(AZSMZ_12864) \ + + ENABLED(BQ_LCD_SMART_CONTROLLER) \ + + ENABLED(CARTESIO_UI) \ + + ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) \ + + ENABLED(FF_INTERFACEBOARD) \ + + ENABLED(FYSETC_242_OLED_12864) \ + + ENABLED(G3D_PANEL) \ + + ENABLED(LCD_FOR_MELZI) \ + + ENABLED(LCD_I2C_PANELOLU2) \ + + ENABLED(LCD_I2C_VIKI) \ + + ENABLED(LCM1602) \ + + ENABLED(LONGER_LK_TFT28) \ + + ENABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602) \ + + ENABLED(MAKRPANEL) \ + + ENABLED(MALYAN_LCD) \ + + ENABLED(NEXTION_TFT) \ + + ENABLED(MKS_LCD12864A) \ + + ENABLED(MKS_LCD12864B) \ + + ENABLED(OLED_PANEL_TINYBOY2) \ + + ENABLED(OVERLORD_OLED) \ + + ENABLED(PANEL_ONE) \ + + ENABLED(RA_CONTROL_PANEL) \ + + ENABLED(RADDS_DISPLAY) \ + + ENABLED(REPRAPWORLD_GRAPHICAL_LCD) \ + + ENABLED(RIGIDBOT_PANEL) \ + + ENABLED(SAV_3DGLCD) \ + + ENABLED(SAV_3DLCD) \ + + ENABLED(SILVER_GATE_GLCD_CONTROLLER) \ + + ENABLED(TFT_TRONXY_X5SA) \ + + ENABLED(TOUCH_UI_FTDI_EVE) \ + + ENABLED(U8GLIB_SH1106_EINSTART) \ + + ENABLED(ULTI_CONTROLLER) \ + + ENABLED(ULTIMAKERCONTROLLER) \ + + ENABLED(ULTIPANEL) \ + + ENABLED(ULTRA_LCD) \ + + ENABLED(YHCB2004) \ + + ENABLED(ZONESTAR_LCD) \ + + ENABLED(K3D_FULL_GRAPHIC_SMART_CONTROLLER) \ + + ENABLED(K3D_242_OLED_CONTROLLER) + +#if LCD_ENABLED_COUNT > 0 + #define HAS_LCD_SELECTED 1 + #if LCD_ENABLED_COUNT > 1 + #error "Please select only one LCD controller option." + #endif +#endif +#undef LCD_ENABLED_COUNT +#undef IS_U8GLIB_SSD1306 +#undef IS_EXTUI diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index 4020c85120..15043d8102 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -2803,79 +2803,6 @@ static_assert(NUM_SERVOS <= NUM_SERVO_PLUGS, "NUM_SERVOS (or some servo index) i #endif #endif -/** - * Make sure only one display is enabled - */ -#if 1 < 0 \ - + ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) \ - + ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) \ - + (ENABLED(U8GLIB_SSD1306) && DISABLED(IS_U8GLIB_SSD1306)) \ - + (ENABLED(MINIPANEL) && NONE(MKS_MINI_12864, ENDER2_STOCKDISPLAY)) \ - + (ENABLED(MKS_MINI_12864) && NONE(MKS_LCD12864A, MKS_LCD12864B)) \ - + (ENABLED(FYSETC_MINI_12864_2_1) && NONE(MKS_MINI_12864_V3, BTT_MINI_12864, BEEZ_MINI_12864)) \ - + COUNT_ENABLED(MKS_MINI_12864_V3, BTT_MINI_12864, BEEZ_MINI_12864) \ - + (ENABLED(EXTENSIBLE_UI) && DISABLED(IS_EXTUI)) \ - + (DISABLED(IS_LEGACY_TFT) && ENABLED(TFT_GENERIC)) \ - + (ENABLED(IS_LEGACY_TFT) && COUNT_ENABLED(TFT_320x240, TFT_320x240_SPI, TFT_480x320, TFT_480x320_SPI)) \ - + COUNT_ENABLED(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON, ANYCUBIC_TFT35, ANYCUBIC_LCD_VYPER) \ - + DGUS_UI_IS(ORIGIN) + DGUS_UI_IS(FYSETC) + DGUS_UI_IS(HIPRECY) + DGUS_UI_IS(MKS) + DGUS_UI_IS(RELOADED) + DGUS_UI_IS(IA_CREALITY) \ - + COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY) \ - + COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE, SOVOL_SV06_RTS) \ - + COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_GENERIC_12864_1_1) \ - + COUNT_ENABLED(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004) \ - + COUNT_ENABLED(MKS_12864OLED, MKS_12864OLED_SSD1306) \ - + COUNT_ENABLED(MKS_TS35_V2_0, MKS_ROBIN_TFT24, MKS_ROBIN_TFT28, MKS_ROBIN_TFT32, MKS_ROBIN_TFT35, MKS_ROBIN_TFT43, \ - MKS_ROBIN_TFT_V1_1R, ANET_ET4_TFT28, ANET_ET5_TFT35, BIQU_BX_TFT70, BTT_TFT35_SPI_V1_0) \ - + COUNT_ENABLED(TFTGLCD_PANEL_SPI, TFTGLCD_PANEL_I2C) \ - + COUNT_ENABLED(VIKI2, miniVIKI) \ - + ENABLED(WYH_L12864) \ - + COUNT_ENABLED(ZONESTAR_12864LCD, ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306) \ - + COUNT_ENABLED(ANET_FULL_GRAPHICS_LCD, CTC_A10S_A13) \ - + ENABLED(AZSMZ_12864) \ - + ENABLED(BQ_LCD_SMART_CONTROLLER) \ - + ENABLED(CARTESIO_UI) \ - + ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) \ - + ENABLED(FF_INTERFACEBOARD) \ - + ENABLED(FYSETC_242_OLED_12864) \ - + ENABLED(G3D_PANEL) \ - + ENABLED(LCD_FOR_MELZI) \ - + ENABLED(LCD_I2C_PANELOLU2) \ - + ENABLED(LCD_I2C_VIKI) \ - + ENABLED(LCM1602) \ - + ENABLED(LONGER_LK_TFT28) \ - + ENABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602) \ - + ENABLED(MAKRPANEL) \ - + ENABLED(MALYAN_LCD) \ - + ENABLED(NEXTION_TFT) \ - + ENABLED(MKS_LCD12864A) \ - + ENABLED(MKS_LCD12864B) \ - + ENABLED(OLED_PANEL_TINYBOY2) \ - + ENABLED(OVERLORD_OLED) \ - + ENABLED(PANEL_ONE) \ - + ENABLED(RA_CONTROL_PANEL) \ - + ENABLED(RADDS_DISPLAY) \ - + ENABLED(REPRAPWORLD_GRAPHICAL_LCD) \ - + ENABLED(RIGIDBOT_PANEL) \ - + ENABLED(SAV_3DGLCD) \ - + ENABLED(SAV_3DLCD) \ - + ENABLED(SILVER_GATE_GLCD_CONTROLLER) \ - + ENABLED(TFT_TRONXY_X5SA) \ - + ENABLED(TOUCH_UI_FTDI_EVE) \ - + ENABLED(U8GLIB_SH1106_EINSTART) \ - + ENABLED(ULTI_CONTROLLER) \ - + ENABLED(ULTIMAKERCONTROLLER) \ - + ENABLED(ULTIPANEL) \ - + ENABLED(ULTRA_LCD) \ - + ENABLED(YHCB2004) \ - + ENABLED(ZONESTAR_LCD) \ - + ENABLED(K3D_FULL_GRAPHIC_SMART_CONTROLLER) \ - + ENABLED(K3D_242_OLED_CONTROLLER) - #error "Please select only one LCD controller option." -#endif - -#undef IS_U8GLIB_SSD1306 -#undef IS_EXTUI - /** * Make sure LCD language settings are distinct */ diff --git a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h index 11f18f4496..7650e9bed7 100644 --- a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h +++ b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h @@ -163,6 +163,8 @@ #define EXP2_07_PIN 34 #define EXP2_08_PIN -1 // RESET +#define EXP_REVERSE_KEYED + // // MicroSD card // diff --git a/Marlin/src/pins/esp32/pins_MM_JOKER.h b/Marlin/src/pins/esp32/pins_MM_JOKER.h index 2ebeda6b60..34e3ab7e8c 100644 --- a/Marlin/src/pins/esp32/pins_MM_JOKER.h +++ b/Marlin/src/pins/esp32/pins_MM_JOKER.h @@ -222,6 +222,10 @@ #if HAS_WIRED_LCD + #define BTN_ENC 12 + #define BTN_EN1 2 + #define BTN_EN2 4 + //#define LCD_PINS_RS 13 //#define LCD_PINS_EN 17 //#define LCD_PINS_D4 16 @@ -238,12 +242,11 @@ //#define LCD_PINS_D6 -1 //#define LCD_PINS_D7 -1 - #endif + #else - #define BTN_EN1 2 - #define BTN_EN2 4 - #define BTN_ENC 12 - #define BEEPER_PIN 139 + #define BEEPER_PIN 139 + + #endif #endif // HAS_WIRED_LCD diff --git a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h index 6329c506a0..f56990ea30 100644 --- a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h +++ b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h @@ -122,20 +122,48 @@ #define LED_PIN P1_31 #define POWER_MONITOR_VOLTAGE_PIN P0_25_A2 +/** ------ ------ + * P0_19 | 1 2 | P1_25 P0_17 | 1 2 | P0_15 + * P0_21 | 3 4 | P0_20 P1_23 | 3 4 | P0_16 + * P2_11 5 6 | P0_22 P1_24 5 6 | P0_18 + * P1_29 | 7 8 | P1_28 P1_22 | 7 8 | (KILL) + * GND | 9 10 | 5V GND | 9 10 | 5V + * ------ ------ + * EXP1 EXP2 + */ +#define EXP1_01_PIN P0_19 +#define EXP1_02_PIN P1_25 +#define EXP1_03_PIN P0_21 // Y+ +#define EXP1_04_PIN P0_20 +#define EXP1_05_PIN P2_11 +#define EXP1_06_PIN P0_22 +#define EXP1_07_PIN P1_29 +#define EXP1_08_PIN P1_28 + +#define EXP2_01_PIN P0_17 +#define EXP2_02_PIN P0_15 +#define EXP2_03_PIN P1_23 +#define EXP2_04_PIN P0_16 +#define EXP2_05_PIN P1_24 +#define EXP2_06_PIN P0_18 +#define EXP2_07_PIN P1_22 +#define EXP2_08_PIN -1 // RESET + // // LCD // #if IS_RRD_SC - #define BEEPER_PIN P0_19 - #define BTN_EN1 P1_23 - #define BTN_EN2 P1_24 - #define BTN_ENC P1_25 - #define LCD_PINS_RS P0_20 - #define LCD_PINS_EN P0_21 - #define LCD_PINS_D4 P2_11 - #define LCD_PINS_D5 P0_22 - #define LCD_PINS_D6 P1_29 - #define LCD_PINS_D7 P1_28 + + #define BEEPER_PIN EXP1_01_PIN + #define BTN_EN1 EXP2_03_PIN + #define BTN_EN2 EXP2_05_PIN + #define BTN_ENC EXP1_02_PIN + #define LCD_PINS_RS EXP1_04_PIN + #define LCD_PINS_EN EXP1_03_PIN + #define LCD_PINS_D4 EXP1_05_PIN + #define LCD_PINS_D5 EXP1_06_PIN + #define LCD_PINS_D6 EXP1_07_PIN + #define LCD_PINS_D7 EXP1_08_PIN #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) #define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder @@ -156,11 +184,11 @@ #endif #if SD_CONNECTION_IS(LCD) - #define SD_SCK_PIN P0_15 - #define SD_MISO_PIN P0_17 - #define SD_MOSI_PIN P0_18 - #define SD_SS_PIN P0_16 - #define SD_DETECT_PIN P1_22 + #define SD_SCK_PIN EXP2_02_PIN + #define SD_MISO_PIN EXP2_01_PIN + #define SD_MOSI_PIN EXP2_06_PIN + #define SD_SS_PIN EXP2_04_PIN + #define SD_DETECT_PIN EXP2_07_PIN #elif SD_CONNECTION_IS(ONBOARD) #define SD_SCK_PIN P0_07 #define SD_MISO_PIN P0_08 diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h index 368d116af5..b8a0af3f7a 100644 --- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h +++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h @@ -226,6 +226,8 @@ #define EXP2_06_PIN P0_09 #define EXP2_07_PIN P0_27 +#define EXP_REVERSE_KEYED + // // LCD / Controller // diff --git a/Marlin/src/pins/lpc1769/pins_XTLW_CLIMBER_8TH_LPC.h b/Marlin/src/pins/lpc1769/pins_XTLW_CLIMBER_8TH_LPC.h index bbdf16dc2b..cc9d257b34 100644 --- a/Marlin/src/pins/lpc1769/pins_XTLW_CLIMBER_8TH_LPC.h +++ b/Marlin/src/pins/lpc1769/pins_XTLW_CLIMBER_8TH_LPC.h @@ -147,115 +147,132 @@ #define SD_MOSI_PIN P0_09 #define SD_DETECT_PIN P0_05 #elif SD_CONNECTION_IS(LCD) - #define SD_SCK_PIN P0_15 - #define SD_MISO_PIN P0_17 - #define SD_MOSI_PIN P0_18 - #define SD_SS_PIN P0_16 - #define SD_DETECT_PIN P2_06 + #define SD_SCK_PIN EXP2_02_PIN + #define SD_MISO_PIN EXP2_01_PIN + #define SD_MOSI_PIN EXP2_06_PIN + #define SD_SS_PIN EXP2_04_PIN + #define SD_DETECT_PIN EXP2_07_PIN #endif /** - * ----- ----- - * NC | 1 2 | GND 5V | 1 2 | GND - * RESET | 3 4 | P2_06 (SD_DETECT) (LCD_D7) P1_31 | 3 4 | P1_30 (LCD_D6) - * (MOSI) P0_18 | 5 6 P0_01 (BTN_EN2) (LCD_D5) P2_08 | 5 6 P1_19 (LCD_D4) - *(SD_SS) P0_16 | 7 8 | P0_00 (BTN_EN1) (LCD_RS) P2_10 | 7 8 | P0_22 (LCD_EN) - * (SCK) P0_15 | 9 10| P0_17 (MISO) (BTN_ENC) P0_28 | 9 10| P2_07 (BEEPER) - * ----- ----- - * EXP2 EXP1 + * ------ ------ + * (MISO) P0_17 | 1 2 | P0_15 (SCK) (BEEPER) P2_07 | 1 2 | P0_28 (BTN_ENC) + * (BTN_EN1) P0_00 | 3 4 | P0_16 (SD_SS) (LCD_EN) P0_22 | 3 4 | P2_10 (LCD_RS) + * (BTN_EN2) P0_01 5 6 | P0_18 (MOSI) (LCD_D4) P1_19 5 6 | P2_08 (LCD_D5) + * (SD_DETECT) P2_06 | 7 8 | RESET (LCD_D6) P1_30 | 7 8 | P1_31 (LCD_D7) + * GND | 9 10 | -- GND | 9 10 | 5V + * EXP2 EXP1 */ +#define EXP1_01_PIN P2_07 +#define EXP1_02_PIN P0_28 +#define EXP1_03_PIN P0_22 +#define EXP1_04_PIN P2_10 +#define EXP1_05_PIN P1_19 +#define EXP1_06_PIN P2_08 +#define EXP1_07_PIN P1_30 +#define EXP1_08_PIN P1_31 + +#define EXP2_01_PIN P0_17 +#define EXP2_02_PIN P0_15 +#define EXP2_03_PIN P0_00 +#define EXP2_04_PIN P0_16 +#define EXP2_05_PIN P0_01 +#define EXP2_06_PIN P0_18 +#define EXP2_07_PIN P2_06 +#define EXP2_08_PIN -1 // RESET // -// LCDs and Controllers +// LCD / Controller // + #if IS_TFTGLCD_PANEL #if ENABLED(TFTGLCD_PANEL_SPI) - #define TFTGLCD_CS P0_00 + #define TFTGLCD_CS EXP2_03_PIN #endif - #define SD_DETECT_PIN P2_06 + #define SD_DETECT_PIN EXP2_07_PIN #elif HAS_WIRED_LCD - #define BEEPER_PIN P2_07 - #define BTN_ENC P0_28 + #define BEEPER_PIN EXP1_01_PIN + #define BTN_ENC EXP1_02_PIN #if ENABLED(CR10_STOCKDISPLAY) - #define LCD_PINS_RS P1_30 + #define LCD_PINS_RS EXP1_07_PIN - #define BTN_EN1 P0_22 - #define BTN_EN2 P1_19 + #define BTN_EN1 EXP1_03_PIN + #define BTN_EN2 EXP1_05_PIN - #define LCD_PINS_EN P1_31 - #define LCD_PINS_D4 P2_08 + #define LCD_PINS_EN EXP1_08_PIN + #define LCD_PINS_D4 EXP1_06_PIN #else - #define BTN_EN1 P0_00 - #define BTN_EN2 P0_01 + #define BTN_EN1 EXP2_03_PIN + #define BTN_EN2 EXP2_05_PIN - #define LCD_SDSS_PIN P0_16 + #define LCD_SDSS_PIN EXP2_04_PIN #if ENABLED(MKS_12864OLED_SSD1306) - #define LCD_PINS_DC P2_08 - #define DOGLCD_CS P2_10 + #define LCD_PINS_DC EXP1_06_PIN + #define DOGLCD_CS EXP1_04_PIN #define DOGLCD_A0 LCD_PINS_DC - #define DOGLCD_SCK P1_19 - #define DOGLCD_MOSI P0_22 + #define DOGLCD_SCK EXP1_05_PIN + #define DOGLCD_MOSI EXP1_03_PIN - #define LCD_PINS_RS P1_30 - #define LCD_PINS_D7 P1_31 + #define LCD_PINS_RS EXP1_07_PIN + #define LCD_PINS_D7 EXP1_08_PIN #define KILL_PIN -1 // NC - #else // !MKS_12864OLED_SSD1306 + #else // !MKS_12864OLED_SSD1306 - #define LCD_PINS_RS P2_10 + #define LCD_PINS_RS EXP1_04_PIN - #define LCD_PINS_EN P0_22 - #define LCD_PINS_D4 P1_19 + #define LCD_PINS_EN EXP1_03_PIN + #define LCD_PINS_D4 EXP1_05_PIN #if ENABLED(FYSETC_MINI_12864) - #define DOGLCD_CS P0_22 - #define DOGLCD_A0 P2_10 - #define DOGLCD_SCK P0_15 - #define DOGLCD_MOSI P0_18 + #define DOGLCD_CS EXP1_03_PIN + #define DOGLCD_A0 EXP1_04_PIN + #define DOGLCD_SCK EXP2_02_PIN + #define DOGLCD_MOSI EXP2_06_PIN #define LCD_BACKLIGHT_PIN -1 #define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems // results in LCD soft SPI mode 3, SD soft SPI mode 0 - #define LCD_RESET_PIN P1_19 // Must be high or open for LCD to operate normally. + #define LCD_RESET_PIN EXP1_05_PIN // Must be high or open for LCD to operate normally. #if ANY(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) #ifndef RGB_LED_R_PIN - #define RGB_LED_R_PIN P2_08 + #define RGB_LED_R_PIN EXP1_06_PIN #endif #ifndef RGB_LED_G_PIN - #define RGB_LED_G_PIN P1_30 + #define RGB_LED_G_PIN EXP1_07_PIN #endif #ifndef RGB_LED_B_PIN - #define RGB_LED_B_PIN P1_31 + #define RGB_LED_B_PIN EXP1_08_PIN #endif #elif ENABLED(FYSETC_MINI_12864_2_1) - #define NEOPIXEL_PIN P2_08 + #define NEOPIXEL_PIN EXP1_06_PIN #endif - #else // !FYSETC_MINI_12864 + #else // !FYSETC_MINI_12864 #if ENABLED(MKS_MINI_12864) - #define DOGLCD_CS P2_08 - #define DOGLCD_A0 P1_30 + #define DOGLCD_CS EXP1_06_PIN + #define DOGLCD_A0 EXP1_07_PIN #endif #if ENABLED(ULTIPANEL) - #define LCD_PINS_D5 P2_08 - #define LCD_PINS_D6 P1_30 - #define LCD_PINS_D7 P1_31 + #define LCD_PINS_D5 EXP1_06_PIN + #define LCD_PINS_D6 EXP1_07_PIN + #define LCD_PINS_D7 EXP1_08_PIN #endif #endif // !FYSETC_MINI_12864 diff --git a/Marlin/src/pins/mega/pins_GT2560_V3.h b/Marlin/src/pins/mega/pins_GT2560_V3.h index 72bdc7bb4b..ae4614eedd 100644 --- a/Marlin/src/pins/mega/pins_GT2560_V3.h +++ b/Marlin/src/pins/mega/pins_GT2560_V3.h @@ -201,23 +201,23 @@ #endif #if ENABLED(YHCB2004) + #ifndef BTN_ENC + #define BTN_ENC 19 + #endif #ifndef BTN_EN1 #define BTN_EN1 16 #endif #ifndef BTN_EN2 #define BTN_EN2 17 #endif +#elif IS_NEWPANEL #ifndef BTN_ENC #define BTN_ENC 19 #endif -#elif IS_NEWPANEL #ifndef BTN_EN1 #define BTN_EN1 42 #endif #ifndef BTN_EN2 #define BTN_EN2 40 #endif - #ifndef BTN_ENC - #define BTN_ENC 19 - #endif #endif diff --git a/Marlin/src/pins/mega/pins_GT2560_V41b.h b/Marlin/src/pins/mega/pins_GT2560_V41b.h index 689166cf39..674b4b1703 100644 --- a/Marlin/src/pins/mega/pins_GT2560_V41b.h +++ b/Marlin/src/pins/mega/pins_GT2560_V41b.h @@ -222,7 +222,7 @@ //#define H2_11_PIN RESET #define H2_12_PIN 18 // BEEP -#define LCM_RS 20 // Pin named and connected to 10k pull-up resistor but unused +#define LCM_RS 20 // Named, unused pin connected to 10k pull-up #if ENABLED(YHCB2004) #define YHCB2004_SS_PIN H2_04_PIN @@ -243,5 +243,5 @@ #define BEEPER_PIN H2_12_PIN #elif HAS_WIRED_LCD #error "GT2560 V4.1b requires an adapter for common LCDs." - /* Cannot use because V4.1b board has not LCD_PINS_RS wired to display connector */ + // Can't use because V4.1b board has no LCD_PINS_RS wired to display connector #endif diff --git a/Marlin/src/pins/mega/pins_WANHAO_D9.h b/Marlin/src/pins/mega/pins_WANHAO_D9.h index c810b8461d..f62c37d405 100644 --- a/Marlin/src/pins/mega/pins_WANHAO_D9.h +++ b/Marlin/src/pins/mega/pins_WANHAO_D9.h @@ -114,6 +114,7 @@ // // LCD / Controller // + #if HAS_WIRED_LCD #define BEEPER_PIN 27 // EXP1-1 diff --git a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h index 655b2c9b59..1004808354 100644 --- a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h +++ b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h @@ -99,6 +99,7 @@ // // LCD / Controller // + #ifndef BEEPER_PIN #define BEEPER_PIN 37 // Always define beeper pin so Play Tone works with ExtUI #endif diff --git a/Marlin/src/pins/stm32f1/pins_KEDI_CONTROLLER_V1_2.h b/Marlin/src/pins/stm32f1/pins_KEDI_CONTROLLER_V1_2.h index f7fde28374..a382c69d52 100644 --- a/Marlin/src/pins/stm32f1/pins_KEDI_CONTROLLER_V1_2.h +++ b/Marlin/src/pins/stm32f1/pins_KEDI_CONTROLLER_V1_2.h @@ -133,48 +133,48 @@ #define TEMP_0_PIN PA0 // Analog Input /** ------ ------ - * (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_D6) PC15 | 4 3 | PC14 (LCD_D7) (SD_DETECT) PB9 | 4 3 | RESET - * GND | 2 1 | 5V GND | 2 1 | -- + * (BEEPER) PC10 | 1 2 | PC11 (BTN_ENC) (MISO) PB4 | 1 2 | PB3 (SCK) + * (LCD_EN) PB6 | 3 4 | PC12 (LCD_RS) (BTN_EN1) PD2 | 3 4 | PA15 (SD_SS) + * (LCD_D4) PC13 5 6 | PB7 (LCD_D5) (BTN_EN2) PB8 5 6 | PB5 (MOSI) + * (LCD_D6) PC15 | 7 8 | PC14 (LCD_D7) (SD_DETECT) PB9 | 7 8 | RESET + * GND | 9 10 | 5V GND | 9 10 | -- * ------ ------ * EXP1 EXP2 */ -#define EXP1_03_PIN PC14 -#define EXP1_04_PIN PC15 -#define EXP1_05_PIN PB7 -#define EXP1_06_PIN PC13 -#define EXP1_07_PIN PC12 -#define EXP1_08_PIN PB6 -#define EXP1_09_PIN PC11 -#define EXP1_10_PIN PC10 +#define EXP1_01_PIN PC10 +#define EXP1_02_PIN PC11 +#define EXP1_03_PIN PB6 +#define EXP1_04_PIN PC12 +#define EXP1_05_PIN PC13 +#define EXP1_06_PIN PB7 +#define EXP1_07_PIN PC15 +#define EXP1_08_PIN PC14 -#define EXP2_03_PIN -1 // RESET -#define EXP2_04_PIN PB9 -#define EXP2_05_PIN PB5 -#define EXP2_06_PIN PB8 -#define EXP2_07_PIN PA15 -#define EXP2_08_PIN PD2 -#define EXP2_09_PIN PB3 -#define EXP2_10_PIN PB4 +#define EXP2_01_PIN PB4 +#define EXP2_02_PIN PB3 +#define EXP2_03_PIN PD2 +#define EXP2_04_PIN PA15 +#define EXP2_05_PIN PB8 +#define EXP2_06_PIN PB5 +#define EXP2_07_PIN PB9 +#define EXP2_08_PIN -1 // RESET // // LCD / Controller // #if HAS_WIRED_LCD - #define BEEPER_PIN EXP1_10_PIN - #define BTN_ENC EXP1_09_PIN + #define BEEPER_PIN EXP1_01_PIN + #define BTN_ENC EXP1_02_PIN #if ENABLED(CR10_STOCKDISPLAY) - #define LCD_PINS_RS EXP1_04_PIN + #define LCD_PINS_RS EXP1_07_PIN - #define BTN_EN1 EXP1_08_PIN - #define BTN_EN2 EXP1_06_PIN + #define BTN_EN1 EXP1_03_PIN + #define BTN_EN2 EXP1_05_PIN - #define LCD_PINS_EN EXP1_03_PIN - #define LCD_PINS_D4 EXP1_05_PIN + #define LCD_PINS_EN EXP1_08_PIN + #define LCD_PINS_D4 EXP1_06_PIN #elif IS_TFTGLCD_PANEL @@ -182,56 +182,56 @@ #undef BTN_ENC #if ENABLED(TFTGLCD_PANEL_SPI) - #define TFTGLCD_CS EXP2_08_PIN + #define TFTGLCD_CS EXP2_03_PIN #endif - #define SD_DETECT_PIN EXP2_04_PIN + #define SD_DETECT_PIN EXP2_07_PIN #else - #define LCD_PINS_RS EXP1_07_PIN + #define LCD_PINS_RS EXP1_04_PIN - #define BTN_EN1 EXP2_08_PIN - #define BTN_EN2 EXP2_06_PIN + #define BTN_EN1 EXP2_03_PIN + #define BTN_EN2 EXP2_05_PIN - #define LCD_PINS_EN EXP1_08_PIN + #define LCD_PINS_EN EXP1_03_PIN #if ENABLED(FYSETC_MINI_12864) #define LCD_BACKLIGHT_PIN -1 - #define LCD_RESET_PIN EXP1_06_PIN - #define DOGLCD_A0 EXP1_07_PIN - #define DOGLCD_CS EXP1_08_PIN - #define DOGLCD_SCK EXP2_09_PIN - #define DOGLCD_MOSI EXP2_05_PIN + #define LCD_RESET_PIN EXP1_05_PIN + #define DOGLCD_A0 EXP1_04_PIN + #define DOGLCD_CS EXP1_03_PIN + #define DOGLCD_SCK EXP2_02_PIN + #define DOGLCD_MOSI EXP2_06_PIN #define FORCE_SOFT_SPI // SPI MODE3 - #define LED_PIN EXP1_05_PIN // red pwm - //#define LED_PIN EXP1_04_PIN // green - //#define LED_PIN EXP1_03_PIN // blue + #define LED_PIN EXP1_06_PIN // red pwm + //#define LED_PIN EXP1_07_PIN // green + //#define LED_PIN EXP1_08_PIN // blue //#if ANY(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) // #ifndef RGB_LED_R_PIN - // #define RGB_LED_R_PIN EXP1_05_PIN + // #define RGB_LED_R_PIN EXP1_06_PIN // #endif // #ifndef RGB_LED_G_PIN - // #define RGB_LED_G_PIN EXP1_04_PIN + // #define RGB_LED_G_PIN EXP1_07_PIN // #endif // #ifndef RGB_LED_B_PIN - // #define RGB_LED_B_PIN EXP1_03_PIN + // #define RGB_LED_B_PIN EXP1_08_PIN // #endif //#elif ENABLED(FYSETC_MINI_12864_2_1) - // #define NEOPIXEL_PIN EXP1_05_PIN + // #define NEOPIXEL_PIN EXP1_06_PIN //#endif #else // !FYSETC_MINI_12864 - #define LCD_PINS_D4 EXP1_06_PIN + #define LCD_PINS_D4 EXP1_05_PIN #if IS_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 #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) #define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder @@ -264,11 +264,11 @@ #if SD_CONNECTION_IS(LCD) #define SPI_DEVICE 3 // Maple - #define SD_DETECT_PIN EXP2_04_PIN - #define SD_SCK_PIN EXP2_09_PIN - #define SD_MISO_PIN EXP2_10_PIN - #define SD_MOSI_PIN EXP2_05_PIN - #define SD_SS_PIN EXP2_07_PIN + #define SD_DETECT_PIN EXP2_07_PIN + #define SD_SCK_PIN EXP2_02_PIN + #define SD_MISO_PIN EXP2_01_PIN + #define SD_MOSI_PIN EXP2_06_PIN + #define SD_SS_PIN EXP2_04_PIN #elif SD_CONNECTION_IS(ONBOARD) #define SD_DETECT_PIN PA3 #define SD_SCK_PIN PA5 diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h index af9c18acf8..e5f4972fc6 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h @@ -242,6 +242,8 @@ #define EXP2_07_PIN PE12 #define EXP2_08_PIN -1 +#define EXP_REVERSE_KEYED + // // SD Card // diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h index 14cc4c1eb3..fd40fd30ed 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h @@ -289,6 +289,8 @@ #define EXP2_07_PIN PE12 #define EXP2_08_PIN -1 // RESET +#define EXP_REVERSE_KEYED + // // LCD / Controller // diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h index 1639ffed59..4cbaf3fcdf 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h @@ -262,6 +262,8 @@ #define EXP2_07_PIN PG3 #define EXP2_08_PIN -1 // RESET +#define EXP_REVERSE_KEYED + /** ------- * | 0 | DGND-| * 3V3 | 1 2 | DGND-| diff --git a/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h b/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h index 6dd25ad464..64427af22d 100644 --- a/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h +++ b/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h @@ -98,64 +98,92 @@ // #define SERVO0_PIN PC3 +/** + * ------ ------ + * PC13 | 1 2 | PC14 PC11 | 1 2 | PC10 + * PB6 | 3 4 | PC15 PB4 | 3 4 | PA15 + * PB5 5 6 | PB9 PB3 5 6 | PC12 + * PB8 | 7 8 | PB7 PD2 | 7 8 | RESET + * GND | 9 10 | 5V GND | 9 10 | -- + * ------ ------ + * EXP1 EXP2 + */ +#define EXP1_01_PIN PC13 +#define EXP1_02_PIN PC14 +#define EXP1_03_PIN PB6 +#define EXP1_04_PIN PC15 +#define EXP1_05_PIN PB5 +#define EXP1_06_PIN PB9 +#define EXP1_07_PIN PB8 +#define EXP1_08_PIN PB7 + +#define EXP2_01_PIN PC11 +#define EXP2_02_PIN PC10 +#define EXP2_03_PIN PB4 +#define EXP2_04_PIN PA15 +#define EXP2_05_PIN PB3 +#define EXP2_06_PIN PC12 +#define EXP2_07_PIN PD2 +#define EXP2_08_PIN -1 // RESET + // // LCD / Controller // #if HAS_WIRED_LCD #if ANY(MKS_12864OLED, MKS_12864OLED_SSD1306) - #define LCD_PINS_DC PB8 // Set as output on init - #define LCD_PINS_RS PB9 // Pull low for 1s to init + #define LCD_PINS_DC EXP1_07_PIN // Set as output on init + #define LCD_PINS_RS EXP1_06_PIN // Pull low for 1s to init // DOGM SPI LCD Support - #define DOGLCD_CS PC15 - #define DOGLCD_MOSI PB6 - #define DOGLCD_SCK PB5 + #define DOGLCD_CS EXP1_04_PIN + #define DOGLCD_MOSI EXP1_03_PIN + #define DOGLCD_SCK EXP1_05_PIN #define DOGLCD_A0 LCD_PINS_DC #elif ENABLED(FYSETC_MINI_12864) - #define DOGLCD_CS PB6 - #define DOGLCD_A0 PC15 + #define DOGLCD_CS EXP1_03_PIN + #define DOGLCD_A0 EXP1_04_PIN //#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems // results in LCD soft SPI mode 3, SD soft SPI mode 0 - #define LCD_RESET_PIN PB5 // Must be high or open for LCD to operate normally. + #define LCD_RESET_PIN EXP1_05_PIN // Must be high or open for LCD to operate normally. #if ANY(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) #ifndef RGB_LED_R_PIN - #define RGB_LED_R_PIN PB9 + #define RGB_LED_R_PIN EXP1_06_PIN #endif #ifndef RGB_LED_G_PIN - #define RGB_LED_G_PIN PB8 + #define RGB_LED_G_PIN EXP1_07_PIN #endif #ifndef RGB_LED_B_PIN - #define RGB_LED_B_PIN PB7 + #define RGB_LED_B_PIN EXP1_08_PIN #endif #elif ENABLED(FYSETC_MINI_12864_2_1) - #define NEOPIXEL_PIN PB9 + #define NEOPIXEL_PIN EXP1_06_PIN #endif #define LCD_CONTRAST_INIT 255 #else - #define LCD_PINS_RS PC15 - #define LCD_PINS_EN PB6 - #define LCD_PINS_D4 PB5 - #define LCD_PINS_D5 PB9 - #define LCD_PINS_D6 PB8 + #define LCD_PINS_RS EXP1_04_PIN + #define LCD_PINS_EN EXP1_03_PIN + #define LCD_PINS_D4 EXP1_05_PIN + #define LCD_PINS_D5 EXP1_06_PIN + #define LCD_PINS_D6 EXP1_07_PIN #endif - #define LCD_PINS_D7 PB7 + #define LCD_PINS_D7 EXP1_08_PIN // // Beeper, SD Card, Encoder // - #define BEEPER_PIN PC13 + #define BEEPER_PIN EXP1_01_PIN #if HAS_MEDIA - #define SD_SS_PIN PA15 - #define SD_DETECT_PIN PD2 + #define SD_SS_PIN EXP2_04_PIN + #define SD_DETECT_PIN EXP2_07_PIN #endif - #define BTN_EN1 PB4 - #define BTN_EN2 PB3 - #define BTN_ENC PC14 + #define BTN_EN1 EXP2_03_PIN + #define BTN_EN2 EXP2_05_PIN + #define BTN_ENC EXP1_02_PIN #endif diff --git a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h index 0e059106b8..696eef2d1d 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h @@ -293,7 +293,7 @@ #elif ENABLED(FYSETC_MINI_12864_2_1) #define NEOPIXEL_PIN EXP1_06_PIN #endif - #endif // !FYSETC_MINI_12864 + #endif // FYSETC_MINI_12864 #if IS_ULTIPANEL #define LCD_PINS_D5 EXP1_06_PIN diff --git a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h index 1d3975ab8f..276c3fa511 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h @@ -450,7 +450,7 @@ #elif ENABLED(FYSETC_MINI_12864_2_1) #define NEOPIXEL_PIN EXP1_06_PIN #endif - #endif // !FYSETC_MINI_12864 + #endif // FYSETC_MINI_12864 #if IS_ULTIPANEL #define LCD_PINS_D5 EXP1_06_PIN diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h index 9388c8a1f4..c066629e06 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h @@ -426,7 +426,7 @@ #elif ENABLED(FYSETC_MINI_12864_2_1) #define NEOPIXEL_PIN EXP1_06_PIN #endif - #endif // !FYSETC_MINI_12864 + #endif // FYSETC_MINI_12864 #if IS_ULTIPANEL #define LCD_PINS_D5 EXP1_06_PIN diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h index 5b42a05c70..76fab7e825 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h @@ -481,17 +481,15 @@ #elif ENABLED(FYSETC_MINI_12864_2_1) #define NEOPIXEL_PIN EXP1_06_PIN #endif - #endif // !FYSETC_MINI_12864 + #endif // FYSETC_MINI_12864 #if IS_ULTIPANEL #define LCD_PINS_D5 EXP1_06_PIN #define LCD_PINS_D6 EXP1_07_PIN #define LCD_PINS_D7 EXP1_08_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 diff --git a/Marlin/src/pins/stm32f4/pins_FLY_CDY_V3.h b/Marlin/src/pins/stm32f4/pins_FLY_CDY_V3.h index a7383967b2..bbb815ae11 100644 --- a/Marlin/src/pins/stm32f4/pins_FLY_CDY_V3.h +++ b/Marlin/src/pins/stm32f4/pins_FLY_CDY_V3.h @@ -233,6 +233,7 @@ // // LCD / Controller // + #if ENABLED(FYSETC_242_OLED_12864) #define BTN_EN1 EXP1_01_PIN diff --git a/Marlin/src/pins/stm32f4/pins_FLY_D8.h b/Marlin/src/pins/stm32f4/pins_FLY_D8.h index ada7c2a853..3fca90718e 100644 --- a/Marlin/src/pins/stm32f4/pins_FLY_D8.h +++ b/Marlin/src/pins/stm32f4/pins_FLY_D8.h @@ -247,6 +247,7 @@ // // LCD / Controller // + #if ENABLED(FYSETC_242_OLED_12864) #define BTN_EN1 EXP1_01_PIN diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h index 6fd927f783..2bdaebdb48 100644 --- a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h +++ b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h @@ -239,7 +239,7 @@ #elif ENABLED(FYSETC_MINI_12864_2_1) #define NEOPIXEL_PIN EXP1_06_PIN #endif - #endif // !FYSETC_MINI_12864 + #endif // FYSETC_MINI_12864 #if IS_ULTIPANEL #define LCD_PINS_D5 EXP1_06_PIN diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V30.h b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V30.h index d0427b2c31..e3606d03c2 100644 --- a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V30.h +++ b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V30.h @@ -262,7 +262,7 @@ #elif ENABLED(FYSETC_MINI_12864_2_1) #define NEOPIXEL_PIN EXP1_05_PIN #endif - #endif // !FYSETC_MINI_12864 + #endif // FYSETC_MINI_12864 #if IS_ULTIPANEL #define LCD_PINS_D5 EXP1_05_PIN diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_KING407.h b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_KING407.h index 8354df6289..e243f6cfcd 100644 --- a/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_KING407.h +++ b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_KING407.h @@ -213,50 +213,50 @@ /** * ------ ------ ------ - * PA2 |10 9 | PA3 PA6 |10 9 | PA5 PC9 |10 9 | PA8 - * -1 | 8 7 | PB10 PC6 | 8 7 | PA4 PC12 | 8 7 | PD0 - * PA6 6 5 | PA7 PC7 | 6 5 PA7 PC10 | 6 5 PC11 - * PA5 | 4 3 | PA4 PB10 | 4 3 | RESET PG4 | 4 3 | PE7 - * GND | 2 1 | 5V GND | 2 1 | 5V GND | 2 1 | 5V + * PA2 | 1 2 | PA3 PA6 | 1 2 | PA5 PC9 | 1 2 | PA8 + * -1 | 3 4 | PB10 PC6 | 3 4 | PA4 PC12 | 3 4 | PD0 + * PA6 5 6 | PA7 PC7 | 5 6 PA7 PC10 | 5 6 PC11 + * PA5 | 7 8 | PA4 PB10 | 7 8 | RESET PG4 | 7 8 | PE7 + * GND | 9 10 | 5V GND | 9 10 | 5V GND | 9 10 | 5V * ------ ------ ------ * EXP3 EXP2 EXP1 */ -#define EXP1_03_PIN PE7 // LCD_D7 -#define EXP1_04_PIN PG4 // LCD_D6 -#define EXP1_05_PIN PC11 // LCD_D5 -#define EXP1_06_PIN PC10 // LCD_D4 -#define EXP1_07_PIN PD0 // LCD_RS -#define EXP1_08_PIN PC12 // LCD_EN -#define EXP1_09_PIN PA8 // BTN_ENC -#define EXP1_10_PIN PC9 // BEEP +#define EXP1_01_PIN PC9 // BEEP +#define EXP1_02_PIN PA8 // BTN_ENC +#define EXP1_03_PIN PC12 // LCD_EN +#define EXP1_04_PIN PD0 // LCD_RS +#define EXP1_05_PIN PC10 // LCD_D4 +#define EXP1_06_PIN PC11 // LCD_D5 +#define EXP1_07_PIN PG4 // LCD_D6 +#define EXP1_08_PIN PE7 // LCD_D7 -#define EXP2_03_PIN -1 // RESET -#define EXP2_04_PIN PB10 // CD -#define EXP2_05_PIN PA7 // MOSI -#define EXP2_06_PIN PC7 // BTN_EN2 -#define EXP2_07_PIN PA4 // SS -#define EXP2_08_PIN PC6 // BTN_EN1 -#define EXP2_09_PIN PA5 // SCK -#define EXP2_10_PIN PA6 // MISO +#define EXP2_01_PIN PA6 // MISO +#define EXP2_02_PIN PA5 // SCK +#define EXP2_03_PIN PC6 // BTN_EN1 +#define EXP2_04_PIN PA4 // SS +#define EXP2_05_PIN PC7 // BTN_EN2 +#define EXP2_06_PIN PA7 // MOSI +#define EXP2_07_PIN PB10 // CD +#define EXP2_08_PIN -1 // RESET -#define EXP3_03_PIN PA4 // SS -#define EXP3_04_PIN PA5 // SCK -#define EXP3_05_PIN PA7 // MOSI -#define EXP3_06_PIN PA6 // MISO -#define EXP3_07_PIN PB10 // CD -#define EXP3_08_PIN -1 // 3V3 -#define EXP3_09_PIN PA3 // LCD_RX/RX -#define EXP3_10_PIN PA2 // LCD_TX/TX +#define EXP3_01_PIN PA2 // LCD_TX/TX +#define EXP3_02_PIN PA3 // LCD_RX/RX +#define EXP3_03_PIN -1 // 3V3 +#define EXP3_04_PIN PB10 // CD +#define EXP3_05_PIN PA6 // MISO +#define EXP3_06_PIN PA7 // MOSI +#define EXP3_07_PIN PA5 // SCK +#define EXP3_08_PIN PA4 // SS // // SPI / SD Card // -#define SD_SCK_PIN EXP2_09_PIN -#define SD_MISO_PIN EXP2_10_PIN -#define SD_MOSI_PIN EXP2_05_PIN +#define SD_SCK_PIN EXP2_02_PIN +#define SD_MISO_PIN EXP2_01_PIN +#define SD_MOSI_PIN EXP2_06_PIN -#define SD_SS_PIN EXP2_07_PIN -#define SD_DETECT_PIN EXP2_04_PIN +#define SD_SS_PIN EXP2_04_PIN +#define SD_DETECT_PIN EXP2_07_PIN // // LCD / Controller @@ -264,65 +264,65 @@ #if ENABLED(FYSETC_242_OLED_12864) - #define BEEPER_PIN EXP2_08_PIN + #define BEEPER_PIN EXP2_03_PIN - #define BTN_EN1 EXP1_10_PIN - #define BTN_EN2 EXP1_03_PIN - #define BTN_ENC EXP1_09_PIN + #define BTN_EN1 EXP1_01_PIN + #define BTN_EN2 EXP1_08_PIN + #define BTN_ENC EXP1_02_PIN - #define LCD_PINS_DC EXP1_05_PIN - #define LCD_PINS_RS EXP2_06_PIN // LCD_RST - #define DOGLCD_CS EXP1_07_PIN - #define DOGLCD_MOSI EXP1_06_PIN - #define DOGLCD_SCK EXP1_08_PIN + #define LCD_PINS_DC EXP1_06_PIN + #define LCD_PINS_RS EXP2_05_PIN // LCD_RST + #define DOGLCD_CS EXP1_04_PIN + #define DOGLCD_MOSI EXP1_05_PIN + #define DOGLCD_SCK EXP1_03_PIN #define DOGLCD_A0 LCD_PINS_DC #define FORCE_SOFT_SPI //#define KILL_PIN -1 // NC - #define NEOPIXEL_PIN EXP1_04_PIN + #define NEOPIXEL_PIN EXP1_07_PIN #elif HAS_WIRED_LCD - #define BEEPER_PIN EXP1_10_PIN - #define BTN_ENC EXP1_09_PIN + #define BEEPER_PIN EXP1_01_PIN + #define BTN_ENC EXP1_02_PIN - #define LCD_PINS_RS EXP1_07_PIN + #define LCD_PINS_RS EXP1_04_PIN - #define BTN_EN1 EXP2_08_PIN - #define BTN_EN2 EXP2_06_PIN + #define BTN_EN1 EXP2_03_PIN + #define BTN_EN2 EXP2_05_PIN - #define LCD_SDSS_PIN EXP2_07_PIN + #define LCD_SDSS_PIN EXP2_04_PIN - #define LCD_PINS_EN EXP1_08_PIN - #define LCD_PINS_D4 EXP1_06_PIN + #define LCD_PINS_EN EXP1_03_PIN + #define LCD_PINS_D4 EXP1_05_PIN #if ENABLED(FYSETC_MINI_12864) // See https://wiki.fysetc.com/Mini12864_Panel - #define DOGLCD_CS EXP1_08_PIN - #define DOGLCD_A0 EXP1_07_PIN + #define DOGLCD_CS EXP1_03_PIN + #define DOGLCD_A0 EXP1_04_PIN #if ENABLED(FYSETC_GENERIC_12864_1_1) - #define LCD_BACKLIGHT_PIN EXP1_04_PIN + #define LCD_BACKLIGHT_PIN EXP1_07_PIN #endif - #define LCD_RESET_PIN EXP1_06_PIN // Must be high or open for LCD to operate normally. + #define LCD_RESET_PIN EXP1_05_PIN // Must be high or open for LCD to operate normally. #if ANY(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) #ifndef RGB_LED_R_PIN - #define RGB_LED_R_PIN EXP1_05_PIN + #define RGB_LED_R_PIN EXP1_06_PIN #endif #ifndef RGB_LED_G_PIN - #define RGB_LED_G_PIN EXP1_04_PIN + #define RGB_LED_G_PIN EXP1_07_PIN #endif #ifndef RGB_LED_B_PIN - #define RGB_LED_B_PIN EXP1_03_PIN + #define RGB_LED_B_PIN EXP1_08_PIN #endif #elif ENABLED(FYSETC_MINI_12864_2_1) - #define NEOPIXEL_PIN EXP1_05_PIN + #define NEOPIXEL_PIN EXP1_06_PIN #endif #endif #if IS_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 #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) #define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder #endif diff --git a/Marlin/src/pins/stm32f4/pins_I3DBEEZ9.h b/Marlin/src/pins/stm32f4/pins_I3DBEEZ9.h index 13dc536cfa..43b0562b52 100644 --- a/Marlin/src/pins/stm32f4/pins_I3DBEEZ9.h +++ b/Marlin/src/pins/stm32f4/pins_I3DBEEZ9.h @@ -517,11 +517,9 @@ #define LCD_PINS_D5 EXP1_06_PIN #define LCD_PINS_D6 EXP1_07_PIN #define LCD_PINS_D7 EXP1_08_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 diff --git a/Marlin/src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h b/Marlin/src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h index d6b5c31bbf..9d81db0de7 100644 --- a/Marlin/src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h +++ b/Marlin/src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h @@ -368,7 +368,7 @@ #elif ENABLED(FYSETC_MINI_12864_2_1) #define NEOPIXEL_PIN EXP1_06_PIN #endif - #endif // !FYSETC_MINI_12864 + #endif // FYSETC_MINI_12864 #if IS_ULTIPANEL #define LCD_PINS_D5 EXP1_06_PIN diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h index ec21f5ab7b..e004c8f8a1 100644 --- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h +++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h @@ -273,6 +273,10 @@ #error "CUSTOM_CABLE is not a supported SDCARD_CONNECTION for BOARD_MKS_MONSTER8_V1/V2." #endif +// +// LCD / Controller +// + #if HAS_WIRED_LCD #define BEEPER_PIN EXP1_01_PIN diff --git a/Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h b/Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h index b060ac56e5..28daa07fb8 100644 --- a/Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h +++ b/Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h @@ -288,7 +288,7 @@ #elif ENABLED(FYSETC_MINI_12864_2_1) #define NEOPIXEL_PIN EXP1_06_PIN #endif - #endif // !FYSETC_MINI_12864 + #endif // FYSETC_MINI_12864 #if IS_ULTIPANEL #define LCD_PINS_D5 EXP1_06_PIN diff --git a/Marlin/src/pins/stm32f4/pins_XTLW_CLIMBER_8TH.h b/Marlin/src/pins/stm32f4/pins_XTLW_CLIMBER_8TH.h index 0b41764ec4..8eb5904cab 100644 --- a/Marlin/src/pins/stm32f4/pins_XTLW_CLIMBER_8TH.h +++ b/Marlin/src/pins/stm32f4/pins_XTLW_CLIMBER_8TH.h @@ -214,8 +214,9 @@ #define EXP2_10_PIN PA6 // -// LCDs and Controllers +// LCD / Controller // + #if IS_TFTGLCD_PANEL #if ENABLED(TFTGLCD_PANEL_SPI) @@ -262,7 +263,7 @@ #elif ENABLED(FYSETC_MINI_12864_2_1) #define NEOPIXEL_PIN EXP1_05_PIN #endif - #endif // !FYSETC_MINI_12864 + #endif // FYSETC_MINI_12864 #if IS_ULTIPANEL #define LCD_PINS_D5 EXP1_05_PIN diff --git a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M5P_V1_0.h b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M5P_V1_0.h index 4ff278acc5..28ef309b73 100644 --- a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M5P_V1_0.h +++ b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M5P_V1_0.h @@ -289,7 +289,7 @@ #elif ENABLED(FYSETC_MINI_12864_2_1) #define NEOPIXEL_PIN EXP1_06_PIN #endif - #endif // !FYSETC_MINI_12864 + #endif // FYSETC_MINI_12864 #if IS_ULTIPANEL #define LCD_PINS_D5 EXP1_06_PIN diff --git a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_common.h b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_common.h index 901f1c8919..6e9e5fe659 100644 --- a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_common.h +++ b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_common.h @@ -307,7 +307,7 @@ #elif ENABLED(FYSETC_MINI_12864_2_1) #define NEOPIXEL_PIN EXP1_06_PIN #endif - #endif // !FYSETC_MINI_12864 + #endif // FYSETC_MINI_12864 #if IS_ULTIPANEL #define LCD_PINS_D5 EXP1_06_PIN diff --git a/Marlin/src/pins/stm32g0/pins_BTT_SKRAT_V1_0.h b/Marlin/src/pins/stm32g0/pins_BTT_SKRAT_V1_0.h index e760306780..65bace9d50 100644 --- a/Marlin/src/pins/stm32g0/pins_BTT_SKRAT_V1_0.h +++ b/Marlin/src/pins/stm32g0/pins_BTT_SKRAT_V1_0.h @@ -398,8 +398,9 @@ #endif // BTT_MOTOR_EXPANSION // -// LCDs and Controllers +// LCD / Controller // + #if IS_TFTGLCD_PANEL #if ENABLED(TFTGLCD_PANEL_SPI) @@ -456,7 +457,7 @@ #elif ENABLED(FYSETC_MINI_12864_2_1) #define NEOPIXEL_PIN EXP1_06_PIN #endif - #endif // !FYSETC_MINI_12864 + #endif // FYSETC_MINI_12864 #if IS_ULTIPANEL #define LCD_PINS_D5 EXP1_06_PIN diff --git a/Marlin/src/pins/stm32h7/pins_BTT_KRAKEN_V1_0.h b/Marlin/src/pins/stm32h7/pins_BTT_KRAKEN_V1_0.h index 8ed780b6c7..f8c402263a 100644 --- a/Marlin/src/pins/stm32h7/pins_BTT_KRAKEN_V1_0.h +++ b/Marlin/src/pins/stm32h7/pins_BTT_KRAKEN_V1_0.h @@ -479,17 +479,15 @@ #elif ENABLED(FYSETC_MINI_12864_2_1) #define NEOPIXEL_PIN EXP1_06_PIN #endif - #endif // !FYSETC_MINI_12864 + #endif // FYSETC_MINI_12864 #if IS_ULTIPANEL #define LCD_PINS_D5 EXP1_06_PIN #define LCD_PINS_D6 EXP1_07_PIN #define LCD_PINS_D7 EXP1_08_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 diff --git a/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h b/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h index 7339d74376..7e80e05268 100644 --- a/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h +++ b/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h @@ -431,7 +431,7 @@ #elif ENABLED(FYSETC_MINI_12864_2_1) #define NEOPIXEL_PIN EXP1_06_PIN #endif - #endif // !FYSETC_MINI_12864 + #endif // FYSETC_MINI_12864 #if IS_ULTIPANEL #define LCD_PINS_D5 EXP1_06_PIN diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h index 320d396d76..f8944892c8 100644 --- a/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h +++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h @@ -569,7 +569,7 @@ #elif ENABLED(FYSETC_MINI_12864_2_1) #define NEOPIXEL_PIN EXP1_06_PIN #endif - #endif // !FYSETC_MINI_12864 + #endif // FYSETC_MINI_12864 #if IS_ULTIPANEL #define LCD_PINS_D5 EXP1_06_PIN diff --git a/Marlin/src/pins/stm32h7/pins_FLY_D8_PRO.h b/Marlin/src/pins/stm32h7/pins_FLY_D8_PRO.h index ab032a21a9..c288bcd606 100644 --- a/Marlin/src/pins/stm32h7/pins_FLY_D8_PRO.h +++ b/Marlin/src/pins/stm32h7/pins_FLY_D8_PRO.h @@ -247,6 +247,7 @@ // // LCD / Controller // + #if ENABLED(FYSETC_242_OLED_12864) #define BTN_EN1 EXP1_01_PIN