bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Update ExtUI sanity checks

Browse Source
This commit is contained in:
Scott Lahteine
2019-07-01 00:49:49 -05:00
parent 10b85be405
commit ced30b1054
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1848,7 +1848,6 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
&& DISABLED(MKS_12864OLED_SSD1306) ) \ && DISABLED(MKS_12864OLED_SSD1306) ) \
+ (ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(BQ_LCD_SMART_CONTROLLER)) \ + (ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(BQ_LCD_SMART_CONTROLLER)) \
+ ENABLED(LCD_FOR_MELZI) \ + ENABLED(LCD_FOR_MELZI) \
+ ENABLED(MALYAN_LCD) \
+ ENABLED(MKS_12864OLED) \ + ENABLED(MKS_12864OLED) \
+ ENABLED(MKS_12864OLED_SSD1306) \ + ENABLED(MKS_12864OLED_SSD1306) \
+ ENABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602) \ + ENABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602) \
@@ -1882,7 +1881,9 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
+ ENABLED(OLED_PANEL_TINYBOY2) \ + ENABLED(OLED_PANEL_TINYBOY2) \
+ ENABLED(ZONESTAR_LCD) \ + ENABLED(ZONESTAR_LCD) \
+ ENABLED(ULTI_CONTROLLER) \ + ENABLED(ULTI_CONTROLLER) \
+ (ENABLED(EXTENSIBLE_UI) && DISABLED(MALYAN_LCD)) + ENABLED(MALYAN_LCD) \
+ ENABLED(DGUS_LCD) \
+ (ENABLED(EXTENSIBLE_UI) && DISABLED(MALYAN_LCD, DGUS_LCD))
#error "Please select no more than one LCD controller option." #error "Please select no more than one LCD controller option."
#endif #endif