3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-26 21:36:21 +00:00
Code Issues Releases Wiki Activity

🔧 BTT_MINI_12864_V1 => BTT_MINI_12864 (#26160)

Browse Source
This commit is contained in:
Keith Bennett 2023-10-08 18:07:09 -07:00 committed by GitHub
parent 047bce0cdd
commit b58d5dabf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Configuration.h
View File

@ -2988,10 +2988,10 @@
//#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. // BigTreeTech Mini 12864 V1.0 / V2.0 is an alias for FYSETC_MINI_12864_2_1. Type A/B. NeoPixel RGB Backlight.
// https://github.com/bigtreetech/MINI-12864/tree/master/mini12864_v1.0 // https://github.com/bigtreetech/MINI-12864
// //
//#define BTT_MINI_12864_V1 //#define BTT_MINI_12864
// //
// Factory display for Creality CR-10 / CR-7 / Ender-3 // Factory display for Creality CR-10 / CR-7 / Ender-3

2
Marlin/src/inc/Changes.h
View File

@ -663,6 +663,8 @@
#error "INTEGRATED_BABYSTEPPING is no longer needed and should be removed." #error "INTEGRATED_BABYSTEPPING is no longer needed and should be removed."
#elif defined(FOLDER_SORTING) #elif defined(FOLDER_SORTING)
#error "FOLDER_SORTING is now SDSORT_FOLDERS." #error "FOLDER_SORTING is now SDSORT_FOLDERS."
#elif defined(BTT_MINI_12864_V1)
#error "BTT_MINI_12864_V1 is now BTT_MINI_12864."
#endif #endif
// L64xx stepper drivers have been removed // L64xx stepper drivers have been removed

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

@ -35,8 +35,8 @@
#define MKS_MINI_12864 #define MKS_MINI_12864
#endif #endif
// MKS_MINI_12864_V3 and BTT_MINI_12864_V1 are identical to FYSETC_MINI_12864_2_1 // MKS_MINI_12864_V3 and BTT_MINI_12864 have identical pinouts to FYSETC_MINI_12864_2_1
#if ANY(MKS_MINI_12864_V3, BTT_MINI_12864_V1) #if ANY(MKS_MINI_12864_V3, BTT_MINI_12864)
#define FYSETC_MINI_12864_2_1 #define FYSETC_MINI_12864_2_1
#endif #endif

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

@ -2563,8 +2563,8 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
+ (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)) \ + (ENABLED(FYSETC_MINI_12864_2_1) && NONE(MKS_MINI_12864_V3, BTT_MINI_12864)) \
+ COUNT_ENABLED(MKS_MINI_12864_V3, BTT_MINI_12864_V1) \ + COUNT_ENABLED(MKS_MINI_12864_V3, BTT_MINI_12864) \
+ (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)) \

2
Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
View File

@ -169,7 +169,7 @@
#define DOGLCD_A0 EXP1_07_PIN #define DOGLCD_A0 EXP1_07_PIN
#define LCD_RESET_PIN -1 #define LCD_RESET_PIN -1
#elif ENABLED(FYSETC_MINI_12864_2_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_CS EXP1_03_PIN
#define DOGLCD_A0 EXP1_04_PIN #define DOGLCD_A0 EXP1_04_PIN
#define LCD_RESET_PIN EXP1_05_PIN #define LCD_RESET_PIN EXP1_05_PIN

2
Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
View File

@ -238,7 +238,7 @@
#endif #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 * Board Display
* ------ ------ * ------ ------

6
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
View File

@ -275,11 +275,11 @@
#elif ENABLED(FYSETC_MINI_12864_2_1) #elif ENABLED(FYSETC_MINI_12864_2_1)
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING #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 #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 * Board Display
* ------ ------ * ------ ------
@ -337,7 +337,7 @@
#define FORCE_SOFT_SPI #define FORCE_SOFT_SPI
#else #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
#endif // HAS_WIRED_LCD #endif // HAS_WIRED_LCD

4
Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h
View File

@ -406,7 +406,7 @@
// LCDs and Controllers // LCDs and Controllers
// //
#if ENABLED(BTT_MINI_12864_V1) // BTT Mini 12864 V2.0 connected via 18-pin FCP cable #if ENABLED(BTT_MINI_12864) // BTT Mini 12864 V2.0 connected via 18-pin FPC cable
#define BEEPER_PIN EXP1_01_PIN #define BEEPER_PIN EXP1_01_PIN
#define BTN_ENC EXP1_02_PIN #define BTN_ENC EXP1_02_PIN
@ -435,7 +435,7 @@
#define NEOPIXEL_PIN EXP1_06_PIN #define NEOPIXEL_PIN EXP1_06_PIN
#elif HAS_WIRED_LCD #elif HAS_WIRED_LCD
#error "Only BTT_MINI_12864_V1 is currently supported on the BIGTREE_OCTOPUS_MAX_EZ." #error "Only BTT_MINI_12864 (BTT Mini 12864 V2.0 with FPC cable) is currently supported on the BIGTREE_OCTOPUS_MAX_EZ."
#endif #endif
// //