SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Group some sanity checks

Browse source
This commit is contained in:
Scott Lahteine 2020-05-31 02:13:53 -05:00
parent bda380513a
commit 785f442c8c
4 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Marlin/src/HAL/LPC1768/inc/SanityCheck.h
View file

@ -254,8 +254,6 @@ static_assert(DISABLED(BAUD_RATE_GCODE), "BAUD_RATE_GCODE is not yet supported o
#if ENABLED(SERIAL_STATS_MAX_RX_QUEUED) #if ENABLED(SERIAL_STATS_MAX_RX_QUEUED)
#error "SERIAL_STATS_MAX_RX_QUEUED is not supported on this platform." #error "SERIAL_STATS_MAX_RX_QUEUED is not supported on this platform."
#endif #elif ENABLED(SERIAL_STATS_DROPPED_RX)
#if ENABLED(SERIAL_STATS_DROPPED_RX)
#error "SERIAL_STATS_DROPPED_RX is not supported on this platform." #error "SERIAL_STATS_DROPPED_RX is not supported on this platform."
#endif #endif

6
Marlin/src/HAL/STM32/inc/SanityCheck.h
View file

@ -51,8 +51,6 @@
#if ENABLED(SERIAL_STATS_MAX_RX_QUEUED) #if ENABLED(SERIAL_STATS_MAX_RX_QUEUED)
#error "SERIAL_STATS_MAX_RX_QUEUED is not supported on this platform." #error "SERIAL_STATS_MAX_RX_QUEUED is not supported on this platform."
#endif #elif ENABLED(SERIAL_STATS_DROPPED_RX)
#if ENABLED(SERIAL_STATS_DROPPED_RX)
#error "SERIAL_STATS_DROPPED_RX is not supported on this platform." #error "SERIAL_STATS_DROPPED_RX is not supported on this platform."
#endif #endif

6
Marlin/src/HAL/STM32F1/inc/SanityCheck.h
View file

@ -52,8 +52,6 @@
#if ENABLED(SERIAL_STATS_MAX_RX_QUEUED) #if ENABLED(SERIAL_STATS_MAX_RX_QUEUED)
#error "SERIAL_STATS_MAX_RX_QUEUED is not supported on this platform." #error "SERIAL_STATS_MAX_RX_QUEUED is not supported on this platform."
#endif #elif ENABLED(SERIAL_STATS_DROPPED_RX)
#if ENABLED(SERIAL_STATS_DROPPED_RX)
#error "SERIAL_STATS_DROPPED_RX is not supported on this platform." #error "SERIAL_STATS_DROPPED_RX is not supported on this platform."
#endif #endif

2
Marlin/src/lcd/dogm/dogm_Statusscreen.h
View file

@ -1520,7 +1520,7 @@
#endif #endif
#ifndef STATUS_HOTEND8_TEXT_X #ifndef STATUS_HOTEND8_TEXT_X
#define STATUS_HOTEND8_TEXT_X STATUS_HOTEND7_TEXT_X + STATUS_HEATERS_XSPACE #define STATUS_HOTEND8_TEXT_X STATUS_HOTEND7_TEXT_X + STATUS_HEATERS_XSPACE
#endif #endif
constexpr uint8_t status_hotend_text_x[] = ARRAY_N(HOTENDS, STATUS_HOTEND1_TEXT_X, STATUS_HOTEND2_TEXT_X, STATUS_HOTEND3_TEXT_X, STATUS_HOTEND4_TEXT_X, STATUS_HOTEND5_TEXT_X, STATUS_HOTEND6_TEXT_X, STATUS_HOTEND7_TEXT_X, STATUS_HOTEND8_TEXT_X); constexpr uint8_t status_hotend_text_x[] = ARRAY_N(HOTENDS, STATUS_HOTEND1_TEXT_X, STATUS_HOTEND2_TEXT_X, STATUS_HOTEND3_TEXT_X, STATUS_HOTEND4_TEXT_X, STATUS_HOTEND5_TEXT_X, STATUS_HOTEND6_TEXT_X, STATUS_HOTEND7_TEXT_X, STATUS_HOTEND8_TEXT_X);
#define STATUS_HOTEND_TEXT_X(N) status_hotend_text_x[N] #define STATUS_HOTEND_TEXT_X(N) status_hotend_text_x[N]
#else #else