mirror of
https://github.com/MarlinFirmware/Configurations.git
synced 2025-07-06 14:37:39 -06:00
🎨 Guard some LCD_SERIAL_PORT (#937)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
parent
a73e3986e3
commit
3e1e975595
10 changed files with 14 additions and 10 deletions
|
@ -3144,7 +3144,6 @@
|
|||
//#define LCD_SCREEN_ROTATE 90 // Portrait Mode or 800x480 displays
|
||||
//#define IA_CREALITY_BOOT_DELAY 1500 // (ms)
|
||||
#endif
|
||||
#define LCD_SERIAL_PORT 1
|
||||
|
||||
//
|
||||
// Touch-screen LCD for Malyan M200/M300 printers
|
||||
|
|
|
@ -1999,6 +1999,7 @@
|
|||
// Additional options for DGUS / DWIN displays
|
||||
//
|
||||
#if HAS_DGUS_LCD
|
||||
#define LCD_SERIAL_PORT 1
|
||||
#define LCD_BAUDRATE 115200
|
||||
|
||||
#define DGUS_RX_BUFFER_SIZE 128
|
||||
|
|
|
@ -3154,7 +3154,6 @@
|
|||
//#define LCD_SCREEN_ROTATE 90 // Portrait Mode or 800x480 displays
|
||||
//#define IA_CREALITY_BOOT_DELAY 1500 // (ms)
|
||||
#endif
|
||||
#define LCD_SERIAL_PORT 2
|
||||
|
||||
//
|
||||
// Touch-screen LCD for Malyan M200/M300 printers
|
||||
|
|
|
@ -1999,6 +1999,7 @@
|
|||
// Additional options for DGUS / DWIN displays
|
||||
//
|
||||
#if HAS_DGUS_LCD
|
||||
#define LCD_SERIAL_PORT 2
|
||||
#define LCD_BAUDRATE 115200
|
||||
|
||||
#define DGUS_RX_BUFFER_SIZE 128
|
||||
|
|
|
@ -3155,7 +3155,6 @@
|
|||
//#define LCD_SCREEN_ROTATE 90 // Portrait Mode or 800x480 displays
|
||||
//#define IA_CREALITY_BOOT_DELAY 1500 // (ms)
|
||||
#endif
|
||||
#define LCD_SERIAL_PORT 3
|
||||
|
||||
//
|
||||
// Touch-screen LCD for Malyan M200/M300 printers
|
||||
|
|
|
@ -1999,6 +1999,7 @@
|
|||
// Additional options for DGUS / DWIN displays
|
||||
//
|
||||
#if HAS_DGUS_LCD
|
||||
#define LCD_SERIAL_PORT 3
|
||||
#define LCD_BAUDRATE 115200
|
||||
|
||||
#define DGUS_RX_BUFFER_SIZE 128
|
||||
|
|
|
@ -3155,7 +3155,9 @@
|
|||
// Touch-screen LCD for Malyan M200/M300 printers
|
||||
//
|
||||
#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
|
||||
|
|
|
@ -3178,7 +3178,9 @@
|
|||
// 320x240 Nextion 2.8" serial TFT Resistive Touch Screen NX3224T028
|
||||
//
|
||||
#define NEXTION_TFT
|
||||
#define LCD_SERIAL_PORT 1
|
||||
#if ENABLED(NEXTION_TFT)
|
||||
#define LCD_SERIAL_PORT 2
|
||||
#endif
|
||||
|
||||
//
|
||||
// PanelDue touch controller by Escher3D
|
||||
|
|
|
@ -963,7 +963,6 @@
|
|||
// Delta radius and diagonal rod adjustments (mm)
|
||||
//#define DELTA_RADIUS_TRIM_TOWER { 0.0, 0.0, 0.0 }
|
||||
#define DELTA_DIAGONAL_ROD_TRIM_TOWER { 0.0, 0.0, 0.0 }
|
||||
|
||||
#endif
|
||||
|
||||
// @section scara
|
||||
|
@ -1227,7 +1226,6 @@
|
|||
* Override with M92
|
||||
* X, Y, Z [, I [, J [, K...]]], E0 [, E1[, E2...]]
|
||||
*/
|
||||
|
||||
#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
|
||||
// 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
|
||||
#define XY_PROBE_FEEDRATE (66*60)
|
||||
|
@ -3152,7 +3150,9 @@
|
|||
// Touch-screen LCD for Malyan M200/M300 printers
|
||||
//
|
||||
#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
|
||||
|
|
|
@ -2426,7 +2426,7 @@
|
|||
//
|
||||
// G2/G3 Arc Support
|
||||
//
|
||||
#define ARC_SUPPORT // Requires ~3226 bytes
|
||||
//#define ARC_SUPPORT // Requires ~3226 bytes
|
||||
#if ENABLED(ARC_SUPPORT)
|
||||
#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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue