Selaa lähdekoodia

Add MKS_LCD12864B

Scott Lahteine 3 vuotta sitten
vanhempi
commit
301ee6c57a

+ 2
- 1
Marlin/Configuration.h Näytä tiedosto

@@ -2260,7 +2260,8 @@
2260 2260
 // MKS LCD12864A/B with graphic controller and SD support. Follows MKS_MINI_12864 pinout.
2261 2261
 // https://www.aliexpress.com/item/33018110072.html
2262 2262
 //
2263
-//#define MKS_LCD12864
2263
+//#define MKS_LCD12864A
2264
+//#define MKS_LCD12864B
2264 2265
 
2265 2266
 //
2266 2267
 // FYSETC variant of the MINI12864 graphic controller with SD support

+ 2
- 2
Marlin/src/inc/Conditionals_LCD.h Näytä tiedosto

@@ -26,8 +26,8 @@
26 26
  * Conditionals that need to be set before Configuration_adv.h or pins.h
27 27
  */
28 28
 
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)
31 31
   #define MKS_MINI_12864
32 32
 #endif
33 33
 

+ 1
- 1
Marlin/src/inc/Conditionals_post.h Näytä tiedosto

@@ -270,7 +270,7 @@
270 270
 #elif ENABLED(AZSMZ_12864)
271 271
   #define _LCD_CONTRAST_MIN  120
272 272
   #define _LCD_CONTRAST_INIT 190
273
-#elif ENABLED(MKS_LCD12864)
273
+#elif EITHER(MKS_LCD12864A, MKS_LCD12864B)
274 274
   #define _LCD_CONTRAST_MIN  120
275 275
   #define _LCD_CONTRAST_INIT 205
276 276
 #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)

+ 5
- 2
Marlin/src/inc/SanityCheck.h Näytä tiedosto

@@ -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) \

+ 1
- 1
Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h Näytä tiedosto

@@ -222,7 +222,7 @@
222 222
     #define LCD_BACKLIGHT_PIN               -1
223 223
 
224 224
   #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."
226 226
   #endif
227 227
 
228 228
 #endif // HAS_WIRED_LCD

Loading…
Peruuta
Tallenna