MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

🔧 Remove LCD_SERIAL_PORT defaults, warn on auto-assign (#24170)

Browse Source
This commit is contained in:
Scott Lahteine 2022-05-20 11:27:09 -05:00 committed by Scott Lahteine
parent dbd00d9927
commit 209c792ef7
6 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/Configuration.h
View File

@ -2674,9 +2674,6 @@
// Touch-screen LCD for Malyan M200/M300 printers // Touch-screen LCD for Malyan M200/M300 printers
// //
//#define MALYAN_LCD //#define MALYAN_LCD
#if ENABLED(MALYAN_LCD)
#define LCD_SERIAL_PORT 1 // Default is 1 for Malyan M200
#endif
// //
// Touch UI for FTDI EVE (FT800/FT810) displays // Touch UI for FTDI EVE (FT800/FT810) displays
@ -2690,7 +2687,6 @@
//#define ANYCUBIC_LCD_I3MEGA //#define ANYCUBIC_LCD_I3MEGA
//#define ANYCUBIC_LCD_CHIRON //#define ANYCUBIC_LCD_CHIRON
#if EITHER(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON) #if EITHER(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON)
#define LCD_SERIAL_PORT 3 // Default is 3 for Anycubic
//#define ANYCUBIC_LCD_DEBUG //#define ANYCUBIC_LCD_DEBUG
#endif #endif
@ -2698,9 +2694,6 @@
// 320x240 Nextion 2.8" serial TFT Resistive Touch Screen NX3224T028 // 320x240 Nextion 2.8" serial TFT Resistive Touch Screen NX3224T028
// //
//#define NEXTION_TFT //#define NEXTION_TFT
#if ENABLED(NEXTION_TFT)
#define LCD_SERIAL_PORT 1 // Default is 1 for Nextion
#endif
// //
// Third-party or vendor-customized controller interfaces. // Third-party or vendor-customized controller interfaces.

1
Marlin/Configuration_adv.h
View File

@ -1748,7 +1748,6 @@
// Additional options for DGUS / DWIN displays // Additional options for DGUS / DWIN displays
// //
#if HAS_DGUS_LCD #if HAS_DGUS_LCD
#define LCD_SERIAL_PORT 3
#define LCD_BAUDRATE 115200 #define LCD_BAUDRATE 115200
#define DGUS_RX_BUFFER_SIZE 128 #define DGUS_RX_BUFFER_SIZE 128

9
Marlin/src/inc/Conditionals_LCD.h
View File

@ -485,15 +485,6 @@
// E3V2 extras // E3V2 extras
#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
#define SERIAL_CATCHALL 0 #define SERIAL_CATCHALL 0
#ifndef LCD_SERIAL_PORT
#if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_MINI_E3_V3_0, BTT_SKR_E3_TURBO)
#define LCD_SERIAL_PORT 1
#elif MB(CREALITY_V24S1_301, CREALITY_V24S1_301F4, CREALITY_V423)
#define LCD_SERIAL_PORT 2 // Creality Ender3S1 board
#else
#define LCD_SERIAL_PORT 3 // Creality 4.x board
#endif
#endif
#define HAS_LCD_BRIGHTNESS 1 #define HAS_LCD_BRIGHTNESS 1
#define LCD_BRIGHTNESS_MAX 250 #define LCD_BRIGHTNESS_MAX 250
#if ENABLED(DWIN_LCD_PROUI) #if ENABLED(DWIN_LCD_PROUI)

18
Marlin/src/inc/Conditionals_adv.h
View File

@ -1012,6 +1012,24 @@
#define HAS_USER_ITEM(N) 0 #define HAS_USER_ITEM(N) 0
#endif #endif
/**
* LCD_SERIAL_PORT must be defined ahead of HAL.h
*/
#ifndef LCD_SERIAL_PORT
#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
#if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_MINI_E3_V3_0, BTT_SKR_E3_TURBO)
#define LCD_SERIAL_PORT 1
#elif MB(CREALITY_V24S1_301, CREALITY_V24S1_301F4, CREALITY_V423)
#define LCD_SERIAL_PORT 2 // Creality Ender3S1 board
#else
#define LCD_SERIAL_PORT 3 // Creality 4.x board
#endif
#endif
#ifdef LCD_SERIAL_PORT
#define AUTO_ASSIGNED_LCD_SERIAL 1
#endif
#endif
#if !HAS_MULTI_SERIAL #if !HAS_MULTI_SERIAL
#undef MEATPACK_ON_SERIAL_PORT_2 #undef MEATPACK_ON_SERIAL_PORT_2
#endif #endif

2
Marlin/src/inc/SanityCheck.h
View File

@ -2941,6 +2941,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#error "The ANYCUBIC LCD requires LCD_SERIAL_PORT to be defined." #error "The ANYCUBIC LCD requires LCD_SERIAL_PORT to be defined."
#elif ENABLED(MALYAN_LCD) #elif ENABLED(MALYAN_LCD)
#error "MALYAN_LCD requires LCD_SERIAL_PORT to be defined." #error "MALYAN_LCD requires LCD_SERIAL_PORT to be defined."
#elif ENABLED(NEXTION_LCD)
#error "NEXTION_LCD requires LCD_SERIAL_PORT to be defined."
#endif #endif
#endif #endif

4
Marlin/src/inc/Warnings.cpp
View File

@ -67,6 +67,10 @@
#ifndef NO_AUTO_ASSIGN_WARNING #ifndef NO_AUTO_ASSIGN_WARNING
#if AUTO_ASSIGNED_LCD_SERIAL
#warning "Note: Auto-assigned LCD_SERIAL_PORT. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
#endif
#if AUTO_ASSIGNED_X2_STEPPER #if AUTO_ASSIGNED_X2_STEPPER
#warning "Note: Auto-assigned X2 STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)" #warning "Note: Auto-assigned X2 STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
#endif #endif