mirror of
https://github.com/MarlinFirmware/Marlin.git
synced 2024-11-23 12:04:19 +00:00
♻️ BTT_MINI_12864_V1 => BTT_MINI_12864
This commit is contained in:
parent
41d78a2b64
commit
73ed511eed
@ -2830,7 +2830,7 @@
|
||||
//
|
||||
// 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
|
||||
//#define BTT_MINI_12864
|
||||
|
||||
//
|
||||
// Factory display for Creality CR-10
|
||||
|
@ -31,8 +31,8 @@
|
||||
#define MKS_MINI_12864
|
||||
#endif
|
||||
|
||||
// MKS_MINI_12864_V3 and BTT_MINI_12864_V1 are identical to FYSETC_MINI_12864_2_1
|
||||
#if ANY(MKS_MINI_12864_V3, BTT_MINI_12864_V1)
|
||||
// MKS_MINI_12864_V3 and BTT_MINI_12864 are identical to FYSETC_MINI_12864_2_1
|
||||
#if ANY(MKS_MINI_12864_V3, BTT_MINI_12864)
|
||||
#define FYSETC_MINI_12864_2_1
|
||||
#endif
|
||||
|
||||
|
@ -457,7 +457,7 @@
|
||||
#elif ANY(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
|
||||
#define _LCD_CONTRAST_MIN 120
|
||||
#define _LCD_CONTRAST_INIT 195
|
||||
#elif ANY(MKS_MINI_12864_V3, BTT_MINI_12864_V1)
|
||||
#elif ANY(MKS_MINI_12864_V3, BTT_MINI_12864)
|
||||
#define _LCD_CONTRAST_MIN 255
|
||||
#define _LCD_CONTRAST_INIT 255
|
||||
#elif ENABLED(FYSETC_MINI_12864)
|
||||
|
@ -660,6 +660,8 @@
|
||||
#error "(POLAR|DELTA|SCARA|TPARA)_SEGMENTS_PER_SECOND is now DEFAULT_SEGMENTS_PER_SECOND."
|
||||
#elif defined(TMC_SW_MOSI) || defined(TMC_SW_MISO) || defined(TMC_SW_SCK)
|
||||
#error "TMC_SW_(MOSI|MISO|SCK) is now TMC_SPI_(MOSI|MISO|SCK)."
|
||||
#elif defined(BTT_MINI_12864_V1)
|
||||
#error "BTT_MINI_12864_V1 is now BTT_MINI_12864."
|
||||
#endif
|
||||
|
||||
// L64xx stepper drivers have been removed
|
||||
@ -3027,8 +3029,8 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE, "Movement bounds (X_MIN_POS, X_MAX_POS
|
||||
+ (ENABLED(U8GLIB_SSD1306) && DISABLED(IS_U8GLIB_SSD1306)) \
|
||||
+ (ENABLED(MINIPANEL) && NONE(MKS_MINI_12864, ENDER2_STOCKDISPLAY)) \
|
||||
+ (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(FYSETC_MINI_12864_2_1) && NONE(MKS_MINI_12864_V3, BTT_MINI_12864)) \
|
||||
+ COUNT_ENABLED(MKS_MINI_12864_V3, BTT_MINI_12864) \
|
||||
+ (ENABLED(EXTENSIBLE_UI) && DISABLED(IS_EXTUI)) \
|
||||
+ (DISABLED(IS_LEGACY_TFT) && ENABLED(TFT_GENERIC)) \
|
||||
+ (ENABLED(IS_LEGACY_TFT) && COUNT_ENABLED(TFT_320x240, TFT_320x240_SPI, TFT_480x320, TFT_480x320_SPI)) \
|
||||
|
@ -171,7 +171,7 @@
|
||||
#define DOGLCD_A0 EXP1_07_PIN
|
||||
#define LCD_RESET_PIN -1
|
||||
#elif ENABLED(FYSETC_MINI_12864_2_1)
|
||||
// MKS_MINI_12864_V3, BTT_MINI_12864_V1, FYSETC_MINI_12864_2_1
|
||||
// MKS_MINI_12864_V3, BTT_MINI_12864, FYSETC_MINI_12864_2_1
|
||||
#define DOGLCD_CS EXP1_03_PIN
|
||||
#define DOGLCD_A0 EXP1_04_PIN
|
||||
#define LCD_RESET_PIN EXP1_05_PIN
|
||||
|
@ -237,7 +237,7 @@
|
||||
#endif
|
||||
|
||||
/**
|
||||
* FYSETC_MINI_12864_2_1 / MKS_MINI_12864_V3 / BTT_MINI_12864_V1 display pinout
|
||||
* FYSETC_MINI_12864_2_1 / MKS_MINI_12864_V3 / BTT_MINI_12864 display pinout
|
||||
*
|
||||
* Board Display
|
||||
* ------ ------
|
||||
|
@ -275,11 +275,11 @@
|
||||
#elif ENABLED(FYSETC_MINI_12864_2_1)
|
||||
|
||||
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
|
||||
#error "CAUTION! FYSETC_MINI_12864_2_1 / MKS_MINI_12864_V3 / BTT_MINI_12864_V1 requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
|
||||
#error "CAUTION! FYSETC_MINI_12864_2_1 / MKS_MINI_12864_V3 / BTT_MINI_12864 requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
|
||||
#endif
|
||||
|
||||
/**
|
||||
* FYSETC_MINI_12864_2_1 / MKS_MINI_12864_V3 / BTT_MINI_12864_V1 display pinout
|
||||
* FYSETC_MINI_12864_2_1 / MKS_MINI_12864_V3 / BTT_MINI_12864 display pinout
|
||||
*
|
||||
* Board Display
|
||||
* ------ ------
|
||||
@ -337,7 +337,7 @@
|
||||
#define FORCE_SOFT_SPI
|
||||
|
||||
#else
|
||||
#error "Only CR10_STOCKDISPLAY, LCD_FOR_MELZI, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, TFTGLCD_PANEL_(SPI|I2C), FYSETC_MINI_12864_2_1, MKS_MINI_12864_V3, and BTT_MINI_12864_V1 are currently supported on the BIGTREE_SKR_MINI_E3."
|
||||
#error "Only CR10_STOCKDISPLAY, LCD_FOR_MELZI, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, TFTGLCD_PANEL_(SPI|I2C), FYSETC_MINI_12864_2_1, MKS_MINI_12864_V3, and BTT_MINI_12864 are currently supported on the BIGTREE_SKR_MINI_E3."
|
||||
#endif
|
||||
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
Loading…
Reference in New Issue
Block a user