|
|
@ -1289,6 +1289,7 @@ static_assert(1 >= 0
|
|
|
|
* REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER => REPRAP_DISCOUNT_SMART_CONTROLLER
|
|
|
|
* REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER => REPRAP_DISCOUNT_SMART_CONTROLLER
|
|
|
|
* SAV_3DGLCD => U8GLIB_SH1106 => ULTIMAKERCONTROLLER
|
|
|
|
* SAV_3DGLCD => U8GLIB_SH1106 => ULTIMAKERCONTROLLER
|
|
|
|
* MKS_12864OLED => U8GLIB_SH1106 => ULTIMAKERCONTROLLER
|
|
|
|
* MKS_12864OLED => U8GLIB_SH1106 => ULTIMAKERCONTROLLER
|
|
|
|
|
|
|
|
* MKS_12864OLED_SSD1306 => U8GLIB_SSD1306 => ULTIMAKERCONTROLLER
|
|
|
|
* miniVIKI => ULTIMAKERCONTROLLER
|
|
|
|
* miniVIKI => ULTIMAKERCONTROLLER
|
|
|
|
* VIKI2 => ULTIMAKERCONTROLLER
|
|
|
|
* VIKI2 => ULTIMAKERCONTROLLER
|
|
|
|
* ELB_FULL_GRAPHIC_CONTROLLER => ULTIMAKERCONTROLLER
|
|
|
|
* ELB_FULL_GRAPHIC_CONTROLLER => ULTIMAKERCONTROLLER
|
|
|
@ -1303,14 +1304,16 @@ static_assert(1 >= 0
|
|
|
|
&& DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
|
|
|
|
&& DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
|
|
|
|
&& DISABLED(AZSMZ_12864) \
|
|
|
|
&& DISABLED(AZSMZ_12864) \
|
|
|
|
&& DISABLED(PANEL_ONE) \
|
|
|
|
&& DISABLED(PANEL_ONE) \
|
|
|
|
&& DISABLED(MKS_12864OLED)
|
|
|
|
&& DISABLED(MKS_12864OLED) \
|
|
|
|
|
|
|
|
&& DISABLED(MKS_12864OLED_SSD1306)
|
|
|
|
+ 1
|
|
|
|
+ 1
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) \
|
|
|
|
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) \
|
|
|
|
&& DISABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) \
|
|
|
|
&& DISABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) \
|
|
|
|
&& DISABLED(LCD_FOR_MELZI) \
|
|
|
|
&& DISABLED(LCD_FOR_MELZI) \
|
|
|
|
&& DISABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602) \
|
|
|
|
&& DISABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602) \
|
|
|
|
&& DISABLED(MKS_12864OLED)
|
|
|
|
&& DISABLED(MKS_12864OLED) \
|
|
|
|
|
|
|
|
&& DISABLED(MKS_12864OLED_SSD1306)
|
|
|
|
+ 1
|
|
|
|
+ 1
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) \
|
|
|
|
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) \
|
|
|
@ -1323,6 +1326,9 @@ static_assert(1 >= 0
|
|
|
|
#if ENABLED(MKS_12864OLED)
|
|
|
|
#if ENABLED(MKS_12864OLED)
|
|
|
|
+ 1
|
|
|
|
+ 1
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if ENABLED(MKS_12864OLED_SSD1306)
|
|
|
|
|
|
|
|
+ 1
|
|
|
|
|
|
|
|
#endif
|
|
|
|
#if ENABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602)
|
|
|
|
#if ENABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602)
|
|
|
|
+ 1
|
|
|
|
+ 1
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
@ -1382,7 +1388,7 @@ static_assert(1 >= 0
|
|
|
|
#if ENABLED(LCD_I2C_VIKI)
|
|
|
|
#if ENABLED(LCD_I2C_VIKI)
|
|
|
|
+ 1
|
|
|
|
+ 1
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#if ENABLED(U8GLIB_SSD1306) && DISABLED(OLED_PANEL_TINYBOY2)
|
|
|
|
#if ENABLED(U8GLIB_SSD1306) && DISABLED(OLED_PANEL_TINYBOY2) && DISABLED(MKS_12864OLED_SSD1306)
|
|
|
|
+ 1
|
|
|
|
+ 1
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#if ENABLED(SAV_3DLCD)
|
|
|
|
#if ENABLED(SAV_3DLCD)
|
|
|
|