melch
/
Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

✨ BigTreeTech Mini 12864 V1.0 (#23130)

Browse Source 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
x301
Keith Bennett 3 years ago committed by Scott Lahteine
parent af1d603374
commit 018c7b1cf4
10 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File

5
Marlin/Configuration.h
Unescape Escape View File

@ -2458,6 +2458,11 @@
//#define FYSETC_MINI_12864_2_1 // Type A/B. NeoPixel RGB Backlight //#define FYSETC_MINI_12864_2_1 // Type A/B. NeoPixel RGB Backlight
//#define FYSETC_GENERIC_12864_1_1 // Larger display with basic ON/OFF backlight. //#define FYSETC_GENERIC_12864_1_1 // Larger display with basic ON/OFF backlight.
//
// BigTreeTech Mini 12864 V1.0 is an alias for FYSETC_MINI_12864_2_1. Type A/B. NeoPixel RGB Backlight.
//
//#define BTT_MINI_12864_V1
// //
// Factory display for Creality CR-10 // Factory display for Creality CR-10
// https://www.aliexpress.com/item/32833148327.html // https://www.aliexpress.com/item/32833148327.html

2
Marlin/src/HAL/STM32F1/inc/SanityCheck.h
Unescape Escape View File

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

4
Marlin/src/inc/Conditionals_LCD.h
Unescape Escape View File

@ -31,8 +31,8 @@
#define MKS_MINI_12864 #define MKS_MINI_12864
#endif #endif
// MKS_MINI_12864_V3 is simply identical to FYSETC_MINI_12864_2_1 // MKS_MINI_12864_V3 and BTT_MINI_12864_V1 are identical to FYSETC_MINI_12864_2_1
#if ENABLED(MKS_MINI_12864_V3) #if EITHER(MKS_MINI_12864_V3, BTT_MINI_12864_V1)
#define FYSETC_MINI_12864_2_1 #define FYSETC_MINI_12864_2_1
#endif #endif

2
Marlin/src/inc/Conditionals_post.h
Unescape Escape View File

@ -373,7 +373,7 @@
#elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
#define _LCD_CONTRAST_MIN 120 #define _LCD_CONTRAST_MIN 120
#define _LCD_CONTRAST_INIT 195 #define _LCD_CONTRAST_INIT 195
#elif ENABLED(MKS_MINI_12864_V3) #elif EITHER(MKS_MINI_12864_V3, BTT_MINI_12864_V1)
#define _LCD_CONTRAST_MIN 255 #define _LCD_CONTRAST_MIN 255
#define _LCD_CONTRAST_INIT 255 #define _LCD_CONTRAST_INIT 255
#define _LCD_CONTRAST_MAX 255 #define _LCD_CONTRAST_MAX 255

4
Marlin/src/inc/SanityCheck.h
Unescape Escape View File

@ -2657,6 +2657,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
+ (ENABLED(U8GLIB_SSD1306) && DISABLED(IS_U8GLIB_SSD1306)) \ + (ENABLED(U8GLIB_SSD1306) && DISABLED(IS_U8GLIB_SSD1306)) \
+ (ENABLED(MINIPANEL) && NONE(MKS_MINI_12864, ENDER2_STOCKDISPLAY)) \ + (ENABLED(MINIPANEL) && NONE(MKS_MINI_12864, ENDER2_STOCKDISPLAY)) \
+ (ENABLED(MKS_MINI_12864) && NONE(MKS_LCD12864A, MKS_LCD12864B)) \ + (ENABLED(MKS_MINI_12864) && NONE(MKS_LCD12864A, MKS_LCD12864B)) \
+ (ENABLED(FYSETC_MINI_12864_2_1) && NONE(MKS_MINI_12864_V3, BTT_MINI_12864_V1)) \
+ COUNT_ENABLED(MKS_MINI_12864_V3, BTT_MINI_12864_V1) \
+ (ENABLED(EXTENSIBLE_UI) && DISABLED(IS_EXTUI)) \ + (ENABLED(EXTENSIBLE_UI) && DISABLED(IS_EXTUI)) \
+ (DISABLED(IS_LEGACY_TFT) && ENABLED(TFT_GENERIC)) \ + (DISABLED(IS_LEGACY_TFT) && ENABLED(TFT_GENERIC)) \
+ (ENABLED(IS_LEGACY_TFT) && COUNT_ENABLED(TFT_320x240, TFT_320x240_SPI, TFT_480x320, TFT_480x320_SPI)) \ + (ENABLED(IS_LEGACY_TFT) && COUNT_ENABLED(TFT_320x240, TFT_320x240_SPI, TFT_480x320, TFT_480x320_SPI)) \
@ -2664,7 +2666,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
+ COUNT_ENABLED(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY, DGUS_LCD_UI_MKS, DGUS_LCD_UI_RELOADED) \ + COUNT_ENABLED(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY, DGUS_LCD_UI_MKS, DGUS_LCD_UI_RELOADED) \
+ COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY) \ + COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY) \
+ COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) \ + COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) \
+ 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) \ + COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_GENERIC_12864_1_1) \
+ COUNT_ENABLED(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004) \ + COUNT_ENABLED(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004) \
+ COUNT_ENABLED(MKS_12864OLED, MKS_12864OLED_SSD1306) \ + COUNT_ENABLED(MKS_12864OLED, MKS_12864OLED_SSD1306) \
+ 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) \ + 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) \

2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
Unescape Escape View File

@ -314,7 +314,7 @@
#define BEEPER_PIN -1 #define BEEPER_PIN -1
#endif #endif
#elif ENABLED(MKS_MINI_12864_V3) #elif ENABLED(FYSETC_MINI_12864_2_1)
#define DOGLCD_CS PD13 #define DOGLCD_CS PD13
#define DOGLCD_A0 PC6 #define DOGLCD_A0 PC6
#define LCD_PINS_DC DOGLCD_A0 #define LCD_PINS_DC DOGLCD_A0

2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
Unescape Escape View File

@ -201,7 +201,7 @@
#define DOGLCD_SCK EXP2_09_PIN #define DOGLCD_SCK EXP2_09_PIN
#define DOGLCD_MOSI EXP2_05_PIN #define DOGLCD_MOSI EXP2_05_PIN
#elif ENABLED(MKS_MINI_12864_V3) #elif ENABLED(FYSETC_MINI_12864_2_1)
#define DOGLCD_CS EXP1_08_PIN #define DOGLCD_CS EXP1_08_PIN
#define DOGLCD_A0 EXP1_07_PIN #define DOGLCD_A0 EXP1_07_PIN
#define LCD_PINS_DC DOGLCD_A0 #define LCD_PINS_DC DOGLCD_A0

2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
Unescape Escape View File

@ -338,7 +338,7 @@
#define BEEPER_PIN -1 #define BEEPER_PIN -1
#endif #endif
#elif ENABLED(MKS_MINI_12864_V3) #elif ENABLED(FYSETC_MINI_12864_2_1)
#define DOGLCD_CS PD13 #define DOGLCD_CS PD13
#define DOGLCD_A0 PC6 #define DOGLCD_A0 PC6
#define LCD_PINS_DC DOGLCD_A0 #define LCD_PINS_DC DOGLCD_A0

2
Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
Unescape Escape View File

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

2
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
Unescape Escape View File

@ -335,7 +335,7 @@
//#define MKS_LCD12864B //#define MKS_LCD12864B
//#undef SHOW_BOOTSCREEN //#undef SHOW_BOOTSCREEN
#elif ENABLED(MKS_MINI_12864_V3) #elif ENABLED(FYSETC_MINI_12864_2_1)
#define DOGLCD_CS EXP1_08_PIN #define DOGLCD_CS EXP1_08_PIN
#define DOGLCD_A0 EXP1_07_PIN #define DOGLCD_A0 EXP1_07_PIN
#define LCD_PINS_DC DOGLCD_A0 #define LCD_PINS_DC DOGLCD_A0

Write Preview
Loading…
Cancel
Save