🎨 Guard some LCD_SERIAL_PORT (#937)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
Keith Bennett 2023-06-01 15:23:07 -07:00 committed by GitHub
parent a73e3986e3
commit 3e1e975595
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 14 additions and 10 deletions

View file

@ -3144,7 +3144,6 @@
//#define LCD_SCREEN_ROTATE 90 // Portrait Mode or 800x480 displays //#define LCD_SCREEN_ROTATE 90 // Portrait Mode or 800x480 displays
//#define IA_CREALITY_BOOT_DELAY 1500 // (ms) //#define IA_CREALITY_BOOT_DELAY 1500 // (ms)
#endif #endif
#define LCD_SERIAL_PORT 1
// //
// Touch-screen LCD for Malyan M200/M300 printers // Touch-screen LCD for Malyan M200/M300 printers

View file

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

View file

@ -3154,7 +3154,6 @@
//#define LCD_SCREEN_ROTATE 90 // Portrait Mode or 800x480 displays //#define LCD_SCREEN_ROTATE 90 // Portrait Mode or 800x480 displays
//#define IA_CREALITY_BOOT_DELAY 1500 // (ms) //#define IA_CREALITY_BOOT_DELAY 1500 // (ms)
#endif #endif
#define LCD_SERIAL_PORT 2
// //
// Touch-screen LCD for Malyan M200/M300 printers // Touch-screen LCD for Malyan M200/M300 printers

View file

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

View file

@ -3155,7 +3155,6 @@
//#define LCD_SCREEN_ROTATE 90 // Portrait Mode or 800x480 displays //#define LCD_SCREEN_ROTATE 90 // Portrait Mode or 800x480 displays
//#define IA_CREALITY_BOOT_DELAY 1500 // (ms) //#define IA_CREALITY_BOOT_DELAY 1500 // (ms)
#endif #endif
#define LCD_SERIAL_PORT 3
// //
// Touch-screen LCD for Malyan M200/M300 printers // Touch-screen LCD for Malyan M200/M300 printers

View file

@ -1999,6 +1999,7 @@
// 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

View file

@ -3155,7 +3155,9 @@
// Touch-screen LCD for Malyan M200/M300 printers // Touch-screen LCD for Malyan M200/M300 printers
// //
#define MALYAN_LCD #define MALYAN_LCD
#define LCD_SERIAL_PORT 1 #if ENABLED(MALYAN_LCD)
#define LCD_SERIAL_PORT 1
#endif
// //
// Touch UI for FTDI EVE (FT800/FT810) displays // Touch UI for FTDI EVE (FT800/FT810) displays

View file

@ -3178,7 +3178,9 @@
// 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
#define LCD_SERIAL_PORT 1 #if ENABLED(NEXTION_TFT)
#define LCD_SERIAL_PORT 2
#endif
// //
// PanelDue touch controller by Escher3D // PanelDue touch controller by Escher3D

View file

@ -963,7 +963,6 @@
// Delta radius and diagonal rod adjustments (mm) // Delta radius and diagonal rod adjustments (mm)
//#define DELTA_RADIUS_TRIM_TOWER { 0.0, 0.0, 0.0 } //#define DELTA_RADIUS_TRIM_TOWER { 0.0, 0.0, 0.0 }
#define DELTA_DIAGONAL_ROD_TRIM_TOWER { 0.0, 0.0, 0.0 } #define DELTA_DIAGONAL_ROD_TRIM_TOWER { 0.0, 0.0, 0.0 }
#endif #endif
// @section scara // @section scara
@ -1227,7 +1226,6 @@
* Override with M92 * Override with M92
* X, Y, Z [, I [, J [, K...]]], E0 [, E1[, E2...]] * X, Y, Z [, I [, J [, K...]]], E0 [, E1[, E2...]]
*/ */
#define DEFAULT_AXIS_STEPS_PER_UNIT { 114.28, 114.28, 114.28, 97.0 } #define DEFAULT_AXIS_STEPS_PER_UNIT { 114.28, 114.28, 114.28, 97.0 }
/** /**
@ -1562,7 +1560,7 @@
// Most probes should stay away from the edges of the bed, but // Most probes should stay away from the edges of the bed, but
// with NOZZLE_AS_PROBE this can be negative for a wider probing area. // with NOZZLE_AS_PROBE this can be negative for a wider probing area.
#define PROBING_MARGIN 55.0 #define PROBING_MARGIN 5.0
// X and Y axis travel speed (mm/min) between probes // X and Y axis travel speed (mm/min) between probes
#define XY_PROBE_FEEDRATE (66*60) #define XY_PROBE_FEEDRATE (66*60)
@ -3152,7 +3150,9 @@
// Touch-screen LCD for Malyan M200/M300 printers // Touch-screen LCD for Malyan M200/M300 printers
// //
#define MALYAN_LCD #define MALYAN_LCD
#define LCD_SERIAL_PORT 1 #if ENABLED(MALYAN_LCD)
#define LCD_SERIAL_PORT 1
#endif
// //
// Touch UI for FTDI EVE (FT800/FT810) displays // Touch UI for FTDI EVE (FT800/FT810) displays

View file

@ -2426,7 +2426,7 @@
// //
// G2/G3 Arc Support // G2/G3 Arc Support
// //
#define ARC_SUPPORT // Requires ~3226 bytes //#define ARC_SUPPORT // Requires ~3226 bytes
#if ENABLED(ARC_SUPPORT) #if ENABLED(ARC_SUPPORT)
#define MIN_ARC_SEGMENT_MM 0.1 // (mm) Minimum length of each arc segment #define MIN_ARC_SEGMENT_MM 0.1 // (mm) Minimum length of each arc segment
#define MAX_ARC_SEGMENT_MM 1.0 // (mm) Maximum length of each arc segment #define MAX_ARC_SEGMENT_MM 1.0 // (mm) Maximum length of each arc segment