Skip to content

Commit 5f30e9f

Browse files
committed
Add MKS_LCD12864B
1 parent fccfcfb commit 5f30e9f

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

Marlin/Configuration.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2260,7 +2260,8 @@
22602260
// MKS LCD12864A/B with graphic controller and SD support. Follows MKS_MINI_12864 pinout.
22612261
// https://www.aliexpress.com/item/33018110072.html
22622262
//
2263-
//#define MKS_LCD12864
2263+
//#define MKS_LCD12864A
2264+
//#define MKS_LCD12864B
22642265

22652266
//
22662267
// FYSETC variant of the MINI12864 graphic controller with SD support

Marlin/src/inc/Conditionals_LCD.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
* Conditionals that need to be set before Configuration_adv.h or pins.h
2727
*/
2828

29-
// MKS_LCD12864 is a variant of MKS_MINI_12864
30-
#if ENABLED(MKS_LCD12864)
29+
// MKS_LCD12864A/B is a variant of MKS_MINI_12864
30+
#if EITHER(MKS_LCD12864A, MKS_LCD12864B)
3131
#define MKS_MINI_12864
3232
#endif
3333

Marlin/src/inc/Conditionals_post.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@
270270
#elif ENABLED(AZSMZ_12864)
271271
#define _LCD_CONTRAST_MIN 120
272272
#define _LCD_CONTRAST_INIT 190
273-
#elif ENABLED(MKS_LCD12864)
273+
#elif EITHER(MKS_LCD12864A, MKS_LCD12864B)
274274
#define _LCD_CONTRAST_MIN 120
275275
#define _LCD_CONTRAST_INIT 205
276276
#elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)

Marlin/src/inc/SanityCheck.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2359,7 +2359,7 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
23592359
+ ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) \
23602360
+ (ENABLED(U8GLIB_SSD1306) && DISABLED(IS_U8GLIB_SSD1306)) \
23612361
+ (ENABLED(MINIPANEL) && NONE(MKS_MINI_12864, ENDER2_STOCKDISPLAY)) \
2362-
+ (ENABLED(MKS_MINI_12864) && DISABLED(MKS_LCD12864)) \
2362+
+ (ENABLED(MKS_MINI_12864) && NONE(MKS_LCD12864A, MKS_LCD12864B)) \
23632363
+ (ENABLED(EXTENSIBLE_UI) && DISABLED(IS_EXTUI)) \
23642364
+ (DISABLED(IS_LEGACY_TFT) && ENABLED(TFT_GENERIC)) \
23652365
+ (ENABLED(IS_LEGACY_TFT) && COUNT_ENABLED(TFT_320x240, TFT_320x240_SPI, TFT_480x320, TFT_480x320_SPI)) \
@@ -2390,7 +2390,8 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
23902390
+ ENABLED(MAKRPANEL) \
23912391
+ ENABLED(MALYAN_LCD) \
23922392
+ ENABLED(NEXTION_TFT) \
2393-
+ ENABLED(MKS_LCD12864) \
2393+
+ ENABLED(MKS_LCD12864A) \
2394+
+ ENABLED(MKS_LCD12864B) \
23942395
+ ENABLED(OLED_PANEL_TINYBOY2) \
23952396
+ ENABLED(OVERLORD_OLED) \
23962397
+ ENABLED(PANEL_ONE) \

Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@
222222
#define LCD_BACKLIGHT_PIN -1
223223

224224
#else
225-
#error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, and MKS_LCD12864 are currently supported on the BIGTREE_SKR_E3_DIP."
225+
#error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, and MKS_LCD12864A/B are currently supported on the BIGTREE_SKR_E3_DIP."
226226
#endif
227227

228228
#endif // HAS_WIRED_LCD

0 commit comments

Comments
 (0)