From 82d3d78e3190ea314f1f1f59f9a0c3acf64a59c3 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 10 Mar 2025 01:11:20 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20BOARD=5FLCD=5FSERIAL=5FPORT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/inc/Warnings.cpp | 7 +++++++ Marlin/src/pins/hc32f4/pins_AQUILA_101.h | 2 ++ Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h | 2 ++ Marlin/src/pins/ramps/pins_PANOWIN_CUTLASS.h | 2 ++ Marlin/src/pins/ramps/pins_RAMPS.h | 2 ++ Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h | 2 ++ Marlin/src/pins/stm32f1/pins_CREALITY_CR4NS.h | 2 ++ Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h | 2 ++ Marlin/src/pins/stm32f1/pins_CREALITY_V423.h | 2 ++ Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h | 2 ++ Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_1.h | 2 ++ Marlin/src/pins/stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h | 2 ++ Marlin/src/pins/stm32f4/pins_CREALITY_CR4NTXXC10.h | 2 ++ Marlin/src/pins/stm32f4/pins_CREALITY_F401.h | 2 ++ Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V1.h | 2 ++ Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h | 6 ++++-- Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h | 2 ++ 17 files changed, 41 insertions(+), 2 deletions(-) diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp index a6ea570030..df2279a08b 100644 --- a/Marlin/src/inc/Warnings.cpp +++ b/Marlin/src/inc/Warnings.cpp @@ -925,3 +925,10 @@ #if ALL(PELTIER_BED, PIDTEMPBED) #warning "PELTIER_BED with PIDTEMPBED requires extra circuitry. Use with caution." #endif + +/** + * Board recommended LCD_SERIAL_PORT + */ +#if LCD_IS_SERIAL_HOST && defined(BOARD_LCD_SERIAL_PORT) && LCD_SERIAL_PORT != BOARD_LCD_SERIAL_PORT && DISABLED(NO_LCD_SERIAL_PORT_WARNING) + #warning "LCD_SERIAL_PORT overrides the default (BOARD_LCD_SERIAL_PORT)." +#endif diff --git a/Marlin/src/pins/hc32f4/pins_AQUILA_101.h b/Marlin/src/pins/hc32f4/pins_AQUILA_101.h index 8c3ce10c6d..dd8488de64 100644 --- a/Marlin/src/pins/hc32f4/pins_AQUILA_101.h +++ b/Marlin/src/pins/hc32f4/pins_AQUILA_101.h @@ -37,6 +37,8 @@ #define DEFAULT_MACHINE_NAME "Aquila" #endif +#define BOARD_LCD_SERIAL_PORT 1 + // // Onboard crystal oscillator // diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h index 98da81781e..03394b02ba 100644 --- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h +++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h @@ -34,6 +34,8 @@ #define USES_DIAG_JUMPERS +#define BOARD_LCD_SERIAL_PORT 1 + // Onboard I2C EEPROM #define I2C_EEPROM #define MARLIN_EEPROM_SIZE 0x1000U // 4K (AT24C32) diff --git a/Marlin/src/pins/ramps/pins_PANOWIN_CUTLASS.h b/Marlin/src/pins/ramps/pins_PANOWIN_CUTLASS.h index 11451e95a4..51da658365 100755 --- a/Marlin/src/pins/ramps/pins_PANOWIN_CUTLASS.h +++ b/Marlin/src/pins/ramps/pins_PANOWIN_CUTLASS.h @@ -38,6 +38,8 @@ #define DEFAULT_MACHINE_NAME "Panowin F1" #endif +#define BOARD_LCD_SERIAL_PORT 2 + // // Limit Switches // diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h index e40415c826..e033cfd060 100644 --- a/Marlin/src/pins/ramps/pins_RAMPS.h +++ b/Marlin/src/pins/ramps/pins_RAMPS.h @@ -59,6 +59,8 @@ #define BOARD_INFO_NAME "RAMPS 1.4" #endif +#define BOARD_LCD_SERIAL_PORT 2 + // // Servos // diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h index 6b6aec5197..77a80d36e1 100644 --- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h +++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h @@ -38,6 +38,8 @@ #define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K #endif +#define BOARD_LCD_SERIAL_PORT 1 + // // Servos // diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_CR4NS.h b/Marlin/src/pins/stm32f1/pins_CREALITY_CR4NS.h index 95bd5e98ff..7d19aec51d 100644 --- a/Marlin/src/pins/stm32f1/pins_CREALITY_CR4NS.h +++ b/Marlin/src/pins/stm32f1/pins_CREALITY_CR4NS.h @@ -41,6 +41,8 @@ #endif #define BOARD_WEBSITE_URL "www.creality.com" +#define BOARD_LCD_SERIAL_PORT 2 + // // EEPROM // diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h index 584d7661f8..916db4e596 100644 --- a/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h +++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h @@ -44,6 +44,8 @@ #define DEFAULT_MACHINE_NAME "Ender-3 S1" #endif +#define BOARD_LCD_SERIAL_PORT 2 + // // Servos // diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V423.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V423.h index c174b0e56e..e8ffca6a5b 100644 --- a/Marlin/src/pins/stm32f1/pins_CREALITY_V423.h +++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V423.h @@ -28,6 +28,8 @@ #define BOARD_INFO_NAME "Creality v4.2.3" #define DEFAULT_MACHINE_NAME "Creality3D" +#define BOARD_LCD_SERIAL_PORT 2 + // // Heaters // diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h index ff438418fe..f081dad4cb 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h @@ -58,6 +58,8 @@ #define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K #endif +#define BOARD_LCD_SERIAL_PORT 2 + // // Servos // diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_1.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_1.h index e9de6d8176..21c93b8f31 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_1.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_1.h @@ -23,6 +23,8 @@ #define BOARD_INFO_NAME "BTT OCTOPUS V1.1" +#define BOARD_LCD_SERIAL_PORT 1 + // // Temperature Sensors // diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h index 0582cdff61..ca1adec5d7 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h @@ -52,6 +52,8 @@ #define MARLIN_EEPROM_SIZE 0x1000U // 4K #endif +#define BOARD_LCD_SERIAL_PORT 1 + // // Servos // diff --git a/Marlin/src/pins/stm32f4/pins_CREALITY_CR4NTXXC10.h b/Marlin/src/pins/stm32f4/pins_CREALITY_CR4NTXXC10.h index 3b22085b3d..71ee1b84dc 100644 --- a/Marlin/src/pins/stm32f4/pins_CREALITY_CR4NTXXC10.h +++ b/Marlin/src/pins/stm32f4/pins_CREALITY_CR4NTXXC10.h @@ -48,6 +48,8 @@ //#undef DISABLE_DEBUG // DISABLE_(DEBUG|JTAG) is not supported for STM32F4. //#define DISABLE_JTAG +#define BOARD_LCD_SERIAL_PORT 2 + // // EEPROM // diff --git a/Marlin/src/pins/stm32f4/pins_CREALITY_F401.h b/Marlin/src/pins/stm32f4/pins_CREALITY_F401.h index 757dde06c9..eecb5c8bc3 100644 --- a/Marlin/src/pins/stm32f4/pins_CREALITY_F401.h +++ b/Marlin/src/pins/stm32f4/pins_CREALITY_F401.h @@ -47,6 +47,8 @@ // 32Mb FLASH //#define SPI_FLASH_CS ? +#define BOARD_LCD_SERIAL_PORT 2 + // // Servos // diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V1.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V1.h index a8d0be3ca6..758690ee80 100644 --- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V1.h +++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V1.h @@ -23,6 +23,8 @@ #define BOARD_INFO_NAME "MKS Monster8 V1" +#define BOARD_LCD_SERIAL_PORT 1 + // // Limit Switches // diff --git a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h index 121dbac336..c7130564ef 100644 --- a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h +++ b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h @@ -34,8 +34,6 @@ // Ignore temp readings during development. //#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000 -#define LED_PIN PD8 - // Onboard I2C EEPROM #if ANY(NO_EEPROM_SELECTED, I2C_EEPROM) #undef NO_EEPROM_SELECTED @@ -46,6 +44,10 @@ #define MARLIN_EEPROM_SIZE 0x1000U // 4K #endif +#define BOARD_LCD_SERIAL_PORT 1 + +#define LED_PIN PD8 + // // Servos // 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 87afd7bb16..7456236669 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 @@ -41,6 +41,8 @@ #define USES_DIAG_JUMPERS +#define BOARD_LCD_SERIAL_PORT 1 + // Onboard I2C EEPROM #if ANY(NO_EEPROM_SELECTED, I2C_EEPROM) #undef NO_EEPROM_SELECTED