Suppress redundant serial errors
This commit is contained in:
parent
a8f8201c90
commit
05d7d37872
@ -84,10 +84,13 @@
|
|||||||
#define MYSERIAL1 UsbSerial
|
#define MYSERIAL1 UsbSerial
|
||||||
#elif WITHIN(SERIAL_PORT, 1, NUM_UARTS)
|
#elif WITHIN(SERIAL_PORT, 1, NUM_UARTS)
|
||||||
#define MYSERIAL1 MSERIAL(SERIAL_PORT)
|
#define MYSERIAL1 MSERIAL(SERIAL_PORT)
|
||||||
#elif NUM_UARTS == 5
|
|
||||||
#error "SERIAL_PORT must be -1 or from 1 to 5. Please update your configuration."
|
|
||||||
#else
|
#else
|
||||||
#error "SERIAL_PORT must be -1 or from 1 to 3. Please update your configuration."
|
#define MYSERIAL1 MSERIAL(1) // dummy port
|
||||||
|
#if NUM_UARTS == 5
|
||||||
|
#error "SERIAL_PORT must be -1 or from 1 to 5. Please update your configuration."
|
||||||
|
#else
|
||||||
|
#error "SERIAL_PORT must be -1 or from 1 to 3. Please update your configuration."
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef SERIAL_PORT_2
|
#ifdef SERIAL_PORT_2
|
||||||
@ -95,10 +98,13 @@
|
|||||||
#define MYSERIAL2 UsbSerial
|
#define MYSERIAL2 UsbSerial
|
||||||
#elif WITHIN(SERIAL_PORT_2, 1, NUM_UARTS)
|
#elif WITHIN(SERIAL_PORT_2, 1, NUM_UARTS)
|
||||||
#define MYSERIAL2 MSERIAL(SERIAL_PORT_2)
|
#define MYSERIAL2 MSERIAL(SERIAL_PORT_2)
|
||||||
#elif NUM_UARTS == 5
|
|
||||||
#error "SERIAL_PORT_2 must be -1 or from 1 to 5. Please update your configuration."
|
|
||||||
#else
|
#else
|
||||||
#error "SERIAL_PORT_2 must be -1 or from 1 to 3. Please update your configuration."
|
#define MYSERIAL2 MSERIAL(1) // dummy port
|
||||||
|
#if NUM_UARTS == 5
|
||||||
|
#error "SERIAL_PORT_2 must be -1 or from 1 to 5. Please update your configuration."
|
||||||
|
#else
|
||||||
|
#error "SERIAL_PORT_2 must be -1 or from 1 to 3. Please update your configuration."
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -107,10 +113,13 @@
|
|||||||
#define MMU2_SERIAL UsbSerial
|
#define MMU2_SERIAL UsbSerial
|
||||||
#elif WITHIN(MMU2_SERIAL_PORT, 1, NUM_UARTS)
|
#elif WITHIN(MMU2_SERIAL_PORT, 1, NUM_UARTS)
|
||||||
#define MMU2_SERIAL MSERIAL(MMU2_SERIAL_PORT)
|
#define MMU2_SERIAL MSERIAL(MMU2_SERIAL_PORT)
|
||||||
#elif NUM_UARTS == 5
|
|
||||||
#error "MMU2_SERIAL_PORT must be -1 or from 1 to 5. Please update your configuration."
|
|
||||||
#else
|
#else
|
||||||
#error "MMU2_SERIAL_PORT must be -1 or from 1 to 3. Please update your configuration."
|
#define MMU2_SERIAL MSERIAL(1) // dummy port
|
||||||
|
#if NUM_UARTS == 5
|
||||||
|
#error "MMU2_SERIAL_PORT must be -1 or from 1 to 5. Please update your configuration."
|
||||||
|
#else
|
||||||
|
#error "MMU2_SERIAL_PORT must be -1 or from 1 to 3. Please update your configuration."
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -119,10 +128,13 @@
|
|||||||
#define LCD_SERIAL UsbSerial
|
#define LCD_SERIAL UsbSerial
|
||||||
#elif WITHIN(LCD_SERIAL_PORT, 1, NUM_UARTS)
|
#elif WITHIN(LCD_SERIAL_PORT, 1, NUM_UARTS)
|
||||||
#define LCD_SERIAL MSERIAL(LCD_SERIAL_PORT)
|
#define LCD_SERIAL MSERIAL(LCD_SERIAL_PORT)
|
||||||
#elif NUM_UARTS == 5
|
|
||||||
#error "LCD_SERIAL_PORT must be -1 or from 1 to 5. Please update your configuration."
|
|
||||||
#else
|
#else
|
||||||
#error "LCD_SERIAL_PORT must be -1 or from 1 to 3. Please update your configuration."
|
#define LCD_SERIAL MSERIAL(1) // dummy port
|
||||||
|
#if NUM_UARTS == 5
|
||||||
|
#error "LCD_SERIAL_PORT must be -1 or from 1 to 5. Please update your configuration."
|
||||||
|
#else
|
||||||
|
#error "LCD_SERIAL_PORT must be -1 or from 1 to 3. Please update your configuration."
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#if HAS_DGUS_LCD
|
#if HAS_DGUS_LCD
|
||||||
#define SERIAL_GET_TX_BUFFER_FREE() LCD_SERIAL.availableForWrite()
|
#define SERIAL_GET_TX_BUFFER_FREE() LCD_SERIAL.availableForWrite()
|
||||||
|
@ -733,7 +733,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
|
|||||||
|
|
||||||
|
|
||||||
// SDCard File listing
|
// SDCard File listing
|
||||||
|
|
||||||
#if ENABLED(SDSUPPORT)
|
#if ENABLED(SDSUPPORT)
|
||||||
VPHELPER(VP_SD_FileSelected, nullptr, ScreenHandler.DGUSLCD_SD_FileSelected, nullptr),
|
VPHELPER(VP_SD_FileSelected, nullptr, ScreenHandler.DGUSLCD_SD_FileSelected, nullptr),
|
||||||
VPHELPER(VP_SD_ScrollEvent, nullptr, ScreenHandler.DGUSLCD_SD_ScrollFilelist, nullptr),
|
VPHELPER(VP_SD_ScrollEvent, nullptr, ScreenHandler.DGUSLCD_SD_ScrollFilelist, nullptr),
|
||||||
@ -760,7 +760,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
|
|||||||
VPHELPER(VP_OFFSET_Y, &probe.offset.y, ScreenHandler.GetOffsetValue,ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
|
VPHELPER(VP_OFFSET_Y, &probe.offset.y, ScreenHandler.GetOffsetValue,ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
|
||||||
VPHELPER(VP_OFFSET_Z, &probe.offset.z, ScreenHandler.GetOffsetValue,ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
|
VPHELPER(VP_OFFSET_Z, &probe.offset.z, ScreenHandler.GetOffsetValue,ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
VPHELPER(VP_SD_FileSelected, nullptr, ScreenHandler.PrintReturn, nullptr),
|
VPHELPER(VP_SD_FileSelected, nullptr, ScreenHandler.PrintReturn, nullptr),
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -158,7 +158,6 @@ public:
|
|||||||
static void GetManualFilamentSpeed(DGUS_VP_Variable &var, void *val_ptr);
|
static void GetManualFilamentSpeed(DGUS_VP_Variable &var, void *val_ptr);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#if ENABLED(SDSUPPORT)
|
#if ENABLED(SDSUPPORT)
|
||||||
// Callback for VP "Display wants to change screen when there is a SD card"
|
// Callback for VP "Display wants to change screen when there is a SD card"
|
||||||
static void ScreenChangeHookIfSD(DGUS_VP_Variable &var, void *val_ptr);
|
static void ScreenChangeHookIfSD(DGUS_VP_Variable &var, void *val_ptr);
|
||||||
@ -184,7 +183,7 @@ public:
|
|||||||
static void SDCardError();
|
static void SDCardError();
|
||||||
// Marlin informed us about SD print completion.
|
// Marlin informed us about SD print completion.
|
||||||
static void SDPrintingFinished();
|
static void SDPrintingFinished();
|
||||||
#else
|
#else
|
||||||
static void PrintReturn(DGUS_VP_Variable &var, void *val_ptr);
|
static void PrintReturn(DGUS_VP_Variable &var, void *val_ptr);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ opt_set MOTHERBOARD BOARD_BTT_SKR_PRO_V1_1 SERIAL_PORT -1 \
|
|||||||
CUTTER_POWER_UNIT PERCENT \
|
CUTTER_POWER_UNIT PERCENT \
|
||||||
SPINDLE_LASER_PWM_PIN HEATER_1_PIN SPINDLE_LASER_ENA_PIN HEATER_2_PIN \
|
SPINDLE_LASER_PWM_PIN HEATER_1_PIN SPINDLE_LASER_ENA_PIN HEATER_2_PIN \
|
||||||
TEMP_SENSOR_COOLER 1000 TEMP_COOLER_PIN PD13
|
TEMP_SENSOR_COOLER 1000 TEMP_COOLER_PIN PD13
|
||||||
opt_enable LASER_FEATURE REPRAP_DISCOUNT_SMART_CONTROLLER
|
opt_enable LASER_FEATURE REPRAP_DISCOUNT_SMART_CONTROLLER
|
||||||
exec_test $1 $2 "BigTreeTech SKR Pro | Laser (Percent) | Cooling | LCD" "$3"
|
exec_test $1 $2 "BigTreeTech SKR Pro | Laser (Percent) | Cooling | LCD" "$3"
|
||||||
|
|
||||||
# clean up
|
# clean up
|
||||||
|
Loading…
Reference in New Issue
Block a user