Add 4 new LCD displays
This commit is contained in:
@@ -1137,6 +1137,7 @@ static_assert(1 >= 0
|
||||
* Note: BQ_LCD_SMART_CONTROLLER => REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
|
||||
* REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER => REPRAP_DISCOUNT_SMART_CONTROLLER
|
||||
* SAV_3DGLCD => U8GLIB_SH1106 => ULTIMAKERCONTROLLER
|
||||
* MKS_12864OLED => U8GLIB_SH1106 => ULTIMAKERCONTROLLER
|
||||
* miniVIKI => ULTIMAKERCONTROLLER
|
||||
* VIKI2 => ULTIMAKERCONTROLLER
|
||||
* ELB_FULL_GRAPHIC_CONTROLLER => ULTIMAKERCONTROLLER
|
||||
@@ -1144,19 +1145,34 @@ static_assert(1 >= 0
|
||||
*/
|
||||
static_assert(1 >= 0
|
||||
#if ENABLED(ULTIMAKERCONTROLLER) \
|
||||
&& DISABLED(SAV_3DGLCD) && DISABLED(miniVIKI) && DISABLED(VIKI2) \
|
||||
&& DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) && DISABLED(PANEL_ONE)
|
||||
&& DISABLED(SAV_3DGLCD) \
|
||||
&& DISABLED(miniVIKI) \
|
||||
&& DISABLED(VIKI2) \
|
||||
&& DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
|
||||
&& DISABLED(PANEL_ONE) \
|
||||
&& DISABLED(MKS_12864OLED)
|
||||
+ 1
|
||||
#endif
|
||||
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && DISABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(LCD_FOR_MELZI)
|
||||
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) \
|
||||
&& DISABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) \
|
||||
&& DISABLED(LCD_FOR_MELZI) \
|
||||
&& DISABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602) \
|
||||
&& DISABLED(MKS_12864OLED)
|
||||
+ 1
|
||||
#endif
|
||||
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(BQ_LCD_SMART_CONTROLLER)
|
||||
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) \
|
||||
&& DISABLED(BQ_LCD_SMART_CONTROLLER)
|
||||
+ 1
|
||||
#endif
|
||||
#if ENABLED(LCD_FOR_MELZI)
|
||||
+ 1
|
||||
#endif
|
||||
#if ENABLED(MKS_12864OLED)
|
||||
+ 1
|
||||
#endif
|
||||
#if ENABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602)
|
||||
+ 1
|
||||
#endif
|
||||
#if ENABLED(CARTESIO_UI)
|
||||
+ 1
|
||||
#endif
|
||||
@@ -1181,10 +1197,15 @@ static_assert(1 >= 0
|
||||
#if ENABLED(G3D_PANEL)
|
||||
+ 1
|
||||
#endif
|
||||
#if ENABLED(MINIPANEL)
|
||||
#if ENABLED(MINIPANEL) && DISABLED(MKS_MINI_12864)
|
||||
+ 1
|
||||
#endif
|
||||
#if ENABLED(REPRAPWORLD_KEYPAD) && DISABLED(CARTESIO_UI) && DISABLED(ANET_KEYPAD_LCD)
|
||||
#if ENABLED(MKS_MINI_12864)
|
||||
+ 1
|
||||
#endif
|
||||
#if ENABLED(REPRAPWORLD_KEYPAD) \
|
||||
&& DISABLED(CARTESIO_UI) \
|
||||
&& DISABLED(ANET_KEYPAD_LCD)
|
||||
+ 1
|
||||
#endif
|
||||
#if ENABLED(RIGIDBOT_PANEL)
|
||||
@@ -1286,6 +1307,16 @@ static_assert(1 >= 0
|
||||
#error "HAVE_L6470DRIVER requires at least one L6470 stepper to be set."
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Digipot requirement
|
||||
*/
|
||||
#if ENABLED(DIGIPOT_MCP4018)
|
||||
#if !defined(DIGIPOTS_I2C_SDA_X) || !defined(DIGIPOTS_I2C_SDA_Y) || !defined(DIGIPOTS_I2C_SDA_Z) \
|
||||
|| !defined(DIGIPOTS_I2C_SDA_E0) || !defined(DIGIPOTS_I2C_SDA_E1)
|
||||
#error "DIGIPOT_MCP4018 requires DIGIPOTS_I2C_SDA_* pins to be defined."
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Require 4 or more elements in per-axis initializers
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user