Skip to content

Commit 73ed511

Browse files
committed
♻️ BTT_MINI_12864_V1 => BTT_MINI_12864
1 parent 41d78a2 commit 73ed511

File tree

7 files changed

+13
-11
lines changed

7 files changed

+13
-11
lines changed

Marlin/Configuration.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2830,7 +2830,7 @@
28302830
//
28312831
// BigTreeTech Mini 12864 V1.0 is an alias for FYSETC_MINI_12864_2_1. Type A/B. NeoPixel RGB Backlight.
28322832
//
2833-
//#define BTT_MINI_12864_V1
2833+
//#define BTT_MINI_12864
28342834

28352835
//
28362836
// Factory display for Creality CR-10

Marlin/src/inc/Conditionals_LCD.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
#define MKS_MINI_12864
3232
#endif
3333

34-
// MKS_MINI_12864_V3 and BTT_MINI_12864_V1 are identical to FYSETC_MINI_12864_2_1
35-
#if ANY(MKS_MINI_12864_V3, BTT_MINI_12864_V1)
34+
// MKS_MINI_12864_V3 and BTT_MINI_12864 are identical to FYSETC_MINI_12864_2_1
35+
#if ANY(MKS_MINI_12864_V3, BTT_MINI_12864)
3636
#define FYSETC_MINI_12864_2_1
3737
#endif
3838

Marlin/src/inc/Conditionals_post.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@
457457
#elif ANY(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
458458
#define _LCD_CONTRAST_MIN 120
459459
#define _LCD_CONTRAST_INIT 195
460-
#elif ANY(MKS_MINI_12864_V3, BTT_MINI_12864_V1)
460+
#elif ANY(MKS_MINI_12864_V3, BTT_MINI_12864)
461461
#define _LCD_CONTRAST_MIN 255
462462
#define _LCD_CONTRAST_INIT 255
463463
#elif ENABLED(FYSETC_MINI_12864)

Marlin/src/inc/SanityCheck.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -660,6 +660,8 @@
660660
#error "(POLAR|DELTA|SCARA|TPARA)_SEGMENTS_PER_SECOND is now DEFAULT_SEGMENTS_PER_SECOND."
661661
#elif defined(TMC_SW_MOSI) || defined(TMC_SW_MISO) || defined(TMC_SW_SCK)
662662
#error "TMC_SW_(MOSI|MISO|SCK) is now TMC_SPI_(MOSI|MISO|SCK)."
663+
#elif defined(BTT_MINI_12864_V1)
664+
#error "BTT_MINI_12864_V1 is now BTT_MINI_12864."
663665
#endif
664666

665667
// 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
30273029
+ (ENABLED(U8GLIB_SSD1306) && DISABLED(IS_U8GLIB_SSD1306)) \
30283030
+ (ENABLED(MINIPANEL) && NONE(MKS_MINI_12864, ENDER2_STOCKDISPLAY)) \
30293031
+ (ENABLED(MKS_MINI_12864) && NONE(MKS_LCD12864A, MKS_LCD12864B)) \
3030-
+ (ENABLED(FYSETC_MINI_12864_2_1) && NONE(MKS_MINI_12864_V3, BTT_MINI_12864_V1)) \
3031-
+ COUNT_ENABLED(MKS_MINI_12864_V3, BTT_MINI_12864_V1) \
3032+
+ (ENABLED(FYSETC_MINI_12864_2_1) && NONE(MKS_MINI_12864_V3, BTT_MINI_12864)) \
3033+
+ COUNT_ENABLED(MKS_MINI_12864_V3, BTT_MINI_12864) \
30323034
+ (ENABLED(EXTENSIBLE_UI) && DISABLED(IS_EXTUI)) \
30333035
+ (DISABLED(IS_LEGACY_TFT) && ENABLED(TFT_GENERIC)) \
30343036
+ (ENABLED(IS_LEGACY_TFT) && COUNT_ENABLED(TFT_320x240, TFT_320x240_SPI, TFT_480x320, TFT_480x320_SPI)) \

Marlin/src/pins/esp32/pins_MKS_TINYBEE.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
#define DOGLCD_A0 EXP1_07_PIN
172172
#define LCD_RESET_PIN -1
173173
#elif ENABLED(FYSETC_MINI_12864_2_1)
174-
// MKS_MINI_12864_V3, BTT_MINI_12864_V1, FYSETC_MINI_12864_2_1
174+
// MKS_MINI_12864_V3, BTT_MINI_12864, FYSETC_MINI_12864_2_1
175175
#define DOGLCD_CS EXP1_03_PIN
176176
#define DOGLCD_A0 EXP1_04_PIN
177177
#define LCD_RESET_PIN EXP1_05_PIN

Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@
237237
#endif
238238

239239
/**
240-
* FYSETC_MINI_12864_2_1 / MKS_MINI_12864_V3 / BTT_MINI_12864_V1 display pinout
240+
* FYSETC_MINI_12864_2_1 / MKS_MINI_12864_V3 / BTT_MINI_12864 display pinout
241241
*
242242
* Board Display
243243
* ------ ------

Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,11 +275,11 @@
275275
#elif ENABLED(FYSETC_MINI_12864_2_1)
276276

277277
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
278-
#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.)"
278+
#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.)"
279279
#endif
280280

281281
/**
282-
* FYSETC_MINI_12864_2_1 / MKS_MINI_12864_V3 / BTT_MINI_12864_V1 display pinout
282+
* FYSETC_MINI_12864_2_1 / MKS_MINI_12864_V3 / BTT_MINI_12864 display pinout
283283
*
284284
* Board Display
285285
* ------ ------
@@ -337,7 +337,7 @@
337337
#define FORCE_SOFT_SPI
338338

339339
#else
340-
#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."
340+
#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."
341341
#endif
342342

343343
#endif // HAS_WIRED_LCD

0 commit comments

Comments
 (0)