|
@@ -560,6 +560,8 @@
|
560
|
560
|
#error "MEATPACK is now enabled with MEATPACK_ON_SERIAL_PORT_1, MEATPACK_ON_SERIAL_PORT_2, etc."
|
561
|
561
|
#elif defined(CUSTOM_USER_MENUS)
|
562
|
562
|
#error "CUSTOM_USER_MENUS has been replaced by CUSTOM_MENU_MAIN and CUSTOM_MENU_CONFIG."
|
|
563
|
+#elif defined(MKS_LCD12864)
|
|
564
|
+ #error "MKS_LCD12864 is now MKS_LCD12864A or MKS_LCD12864B."
|
563
|
565
|
#endif
|
564
|
566
|
|
565
|
567
|
/**
|
|
@@ -2359,7 +2361,7 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
|
2359
|
2361
|
+ ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) \
|
2360
|
2362
|
+ (ENABLED(U8GLIB_SSD1306) && DISABLED(IS_U8GLIB_SSD1306)) \
|
2361
|
2363
|
+ (ENABLED(MINIPANEL) && NONE(MKS_MINI_12864, ENDER2_STOCKDISPLAY)) \
|
2362
|
|
- + (ENABLED(MKS_MINI_12864) && DISABLED(MKS_LCD12864)) \
|
|
2364
|
+ + (ENABLED(MKS_MINI_12864) && NONE(MKS_LCD12864A, MKS_LCD12864B)) \
|
2363
|
2365
|
+ (ENABLED(EXTENSIBLE_UI) && DISABLED(IS_EXTUI)) \
|
2364
|
2366
|
+ (DISABLED(IS_LEGACY_TFT) && ENABLED(TFT_GENERIC)) \
|
2365
|
2367
|
+ (ENABLED(IS_LEGACY_TFT) && COUNT_ENABLED(TFT_320x240, TFT_320x240_SPI, TFT_480x320, TFT_480x320_SPI)) \
|
|
@@ -2390,7 +2392,8 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
|
2390
|
2392
|
+ ENABLED(MAKRPANEL) \
|
2391
|
2393
|
+ ENABLED(MALYAN_LCD) \
|
2392
|
2394
|
+ ENABLED(NEXTION_TFT) \
|
2393
|
|
- + ENABLED(MKS_LCD12864) \
|
|
2395
|
+ + ENABLED(MKS_LCD12864A) \
|
|
2396
|
+ + ENABLED(MKS_LCD12864B) \
|
2394
|
2397
|
+ ENABLED(OLED_PANEL_TINYBOY2) \
|
2395
|
2398
|
+ ENABLED(OVERLORD_OLED) \
|
2396
|
2399
|
+ ENABLED(PANEL_ONE) \
|