Bladeren bron

✨ BigTreeTech Mini 12864 V1.0 (#23130)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Keith Bennett 3 jaren geleden
bovenliggende
commit
6ac0d4727c
No account linked to committer's email address

+ 5
- 0
Marlin/Configuration.h Bestand weergeven

@@ -2459,6 +2459,11 @@
2459 2459
 //#define FYSETC_GENERIC_12864_1_1 // Larger display with basic ON/OFF backlight.
2460 2460
 
2461 2461
 //
2462
+// BigTreeTech Mini 12864 V1.0 is an alias for FYSETC_MINI_12864_2_1. Type A/B. NeoPixel RGB Backlight.
2463
+//
2464
+//#define BTT_MINI_12864_V1
2465
+
2466
+//
2462 2467
 // Factory display for Creality CR-10
2463 2468
 // https://www.aliexpress.com/item/32833148327.html
2464 2469
 //

+ 1
- 1
Marlin/src/HAL/STM32F1/inc/SanityCheck.h Bestand weergeven

@@ -39,7 +39,7 @@
39 39
   #error "SERIAL_STATS_DROPPED_RX is not supported on the STM32F1 platform."
40 40
 #endif
41 41
 
42
-#if ENABLED(NEOPIXEL_LED) && DISABLED(MKS_MINI_12864_V3)
42
+#if ENABLED(NEOPIXEL_LED) && DISABLED(FYSETC_MINI_12864_2_1)
43 43
   #error "NEOPIXEL_LED (Adafruit NeoPixel) is not supported for HAL/STM32F1. Comment out this line to proceed at your own risk!"
44 44
 #endif
45 45
 

+ 2
- 2
Marlin/src/inc/Conditionals_LCD.h Bestand weergeven

@@ -31,8 +31,8 @@
31 31
   #define MKS_MINI_12864
32 32
 #endif
33 33
 
34
-// MKS_MINI_12864_V3 is simply identical to FYSETC_MINI_12864_2_1
35
-#if ENABLED(MKS_MINI_12864_V3)
34
+// MKS_MINI_12864_V3 and BTT_MINI_12864_V1 are identical to FYSETC_MINI_12864_2_1
35
+#if EITHER(MKS_MINI_12864_V3, BTT_MINI_12864_V1)
36 36
   #define FYSETC_MINI_12864_2_1
37 37
 #endif
38 38
 

+ 1
- 1
Marlin/src/inc/Conditionals_post.h Bestand weergeven

@@ -373,7 +373,7 @@
373 373
 #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
374 374
   #define _LCD_CONTRAST_MIN  120
375 375
   #define _LCD_CONTRAST_INIT 195
376
-#elif ENABLED(MKS_MINI_12864_V3)
376
+#elif EITHER(MKS_MINI_12864_V3, BTT_MINI_12864_V1)
377 377
   #define _LCD_CONTRAST_MIN  255
378 378
   #define _LCD_CONTRAST_INIT 255
379 379
   #define _LCD_CONTRAST_MAX  255

+ 3
- 1
Marlin/src/inc/SanityCheck.h Bestand weergeven

@@ -2630,6 +2630,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
2630 2630
   + (ENABLED(U8GLIB_SSD1306) && DISABLED(IS_U8GLIB_SSD1306)) \
2631 2631
   + (ENABLED(MINIPANEL) && NONE(MKS_MINI_12864, ENDER2_STOCKDISPLAY)) \
2632 2632
   + (ENABLED(MKS_MINI_12864) && NONE(MKS_LCD12864A, MKS_LCD12864B)) \
2633
+  + (ENABLED(FYSETC_MINI_12864_2_1) && NONE(MKS_MINI_12864_V3, BTT_MINI_12864_V1)) \
2634
+  + COUNT_ENABLED(MKS_MINI_12864_V3, BTT_MINI_12864_V1) \
2633 2635
   + (ENABLED(EXTENSIBLE_UI) && DISABLED(IS_EXTUI)) \
2634 2636
   + (DISABLED(IS_LEGACY_TFT) && ENABLED(TFT_GENERIC)) \
2635 2637
   + (ENABLED(IS_LEGACY_TFT) && COUNT_ENABLED(TFT_320x240, TFT_320x240_SPI, TFT_480x320, TFT_480x320_SPI)) \
@@ -2637,7 +2639,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
2637 2639
   + COUNT_ENABLED(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY, DGUS_LCD_UI_MKS, DGUS_LCD_UI_RELOADED) \
2638 2640
   + COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY) \
2639 2641
   + COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) \
2640
-  + COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1, FYSETC_GENERIC_12864_1_1) \
2642
+  + COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_GENERIC_12864_1_1) \
2641 2643
   + COUNT_ENABLED(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004) \
2642 2644
   + COUNT_ENABLED(MKS_12864OLED, MKS_12864OLED_SSD1306) \
2643 2645
   + COUNT_ENABLED(MKS_TS35_V2_0, MKS_ROBIN_TFT24, MKS_ROBIN_TFT28, MKS_ROBIN_TFT32, MKS_ROBIN_TFT35, MKS_ROBIN_TFT43, MKS_ROBIN_TFT_V1_1R, ANET_ET4_TFT28, ANET_ET5_TFT35, BIQU_BX_TFT70, BTT_TFT35_SPI_V1_0) \

+ 1
- 1
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h Bestand weergeven

@@ -314,7 +314,7 @@
314 314
       #define BEEPER_PIN                    -1
315 315
     #endif
316 316
 
317
-  #elif ENABLED(MKS_MINI_12864_V3)
317
+  #elif ENABLED(FYSETC_MINI_12864_2_1)
318 318
     #define DOGLCD_CS                       PD13
319 319
     #define DOGLCD_A0                       PC6
320 320
     #define LCD_PINS_DC                DOGLCD_A0

+ 1
- 1
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h Bestand weergeven

@@ -201,7 +201,7 @@
201 201
     #define DOGLCD_SCK               EXP2_09_PIN
202 202
     #define DOGLCD_MOSI              EXP2_05_PIN
203 203
 
204
-  #elif ENABLED(MKS_MINI_12864_V3)
204
+  #elif ENABLED(FYSETC_MINI_12864_2_1)
205 205
     #define DOGLCD_CS                EXP1_08_PIN
206 206
     #define DOGLCD_A0                EXP1_07_PIN
207 207
     #define LCD_PINS_DC                DOGLCD_A0

+ 1
- 1
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h Bestand weergeven

@@ -338,7 +338,7 @@
338 338
       #define BEEPER_PIN                    -1
339 339
     #endif
340 340
 
341
-  #elif ENABLED(MKS_MINI_12864_V3)
341
+  #elif ENABLED(FYSETC_MINI_12864_2_1)
342 342
     #define DOGLCD_CS                       PD13
343 343
     #define DOGLCD_A0                       PC6
344 344
     #define LCD_PINS_DC                DOGLCD_A0

+ 1
- 1
Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h Bestand weergeven

@@ -346,7 +346,7 @@
346 346
     //#define DOGLCD_SCK             EXP2_09_PIN
347 347
     //#define DOGLCD_MOSI            EXP2_05_PIN
348 348
 
349
-  #elif ENABLED(MKS_MINI_12864_V3)
349
+  #elif ENABLED(FYSETC_MINI_12864_2_1)
350 350
     #define DOGLCD_CS                EXP1_08_PIN
351 351
     #define DOGLCD_A0                EXP1_07_PIN
352 352
     #define LCD_PINS_DC                DOGLCD_A0

+ 1
- 1
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h Bestand weergeven

@@ -335,7 +335,7 @@
335 335
     //#define MKS_LCD12864B
336 336
     //#undef SHOW_BOOTSCREEN
337 337
 
338
-  #elif ENABLED(MKS_MINI_12864_V3)
338
+  #elif ENABLED(FYSETC_MINI_12864_2_1)
339 339
     #define DOGLCD_CS                EXP1_08_PIN
340 340
     #define DOGLCD_A0                EXP1_07_PIN
341 341
     #define LCD_PINS_DC                DOGLCD_A0

Laden…
Annuleren
Opslaan