From 2ed1e7f12a09ef5acace026f2162b22ca0c2eb6c Mon Sep 17 00:00:00 2001 From: greppp Date: Thu, 26 Dec 2019 22:29:19 -0500 Subject: [PATCH 1/5] fix : correct pins for Ender 2 display, add BTN_ENC Resolving #15624 Fixing Ender 2 stock LCD pinout for use with SKR V1.3 Boards. Board pinout : https://github.com/bigtreetech/BIGTREETECH-SKR-V1.3/blob/master/BTT%20SKR%20V1.3/hardware/SKR-V1.3-PIN.pdf Used tested pinout from https://github.com/MarlinFirmware/Marlin/issues/15624#issuecomment-545207820, and used tip from https://github.com/MarlinFirmware/Marlin/pull/15997 to add the missing pin BTN_ENC. --- Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h | 24 +++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h index e6738071285a..38cca8dc188b 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h @@ -271,11 +271,27 @@ #else // !FYSETC_MINI_12864 #if ENABLED(MKS_MINI_12864) - #define DOGLCD_CS P1_21 - #define DOGLCD_A0 P1_22 - #define DOGLCD_SCK P0_15 - #define DOGLCD_MOSI P0_18 + + /** Creality Ender-2 display pinout + * _____ + * 5V | · · | GND + * (MOSI) P1_23 | · · | P1_22 (LCD_CS) + * (LCD_A0) P1_21 | · · | P1_20 (BTN_EN2) + * RESET P1.19 | · · | P1_18 (BTN_EN1) + * (BTN_ENC) P0_28 | · · | P1_30 (SCK) + * ----- + * EXP1 + */ + + #define BTN_EN1 P1_18 + #define BTN_EN2 P1_20 + #define BTN_ENC P0_28 + #define DOGLCD_CS P1_22 + #define DOGLCD_A0 P1_21 + #define DOGLCD_SCK P1_30 + #define DOGLCD_MOSI P1_23 #define FORCE_SOFT_SPI + #define LCD_BACKLIGHT_PIN -1 #endif #if ENABLED(ULTIPANEL) From f81752d6a68656b29246a8f1250e9da084546ac9 Mon Sep 17 00:00:00 2001 From: greppp Date: Thu, 26 Dec 2019 22:55:48 -0500 Subject: [PATCH 2/5] filament diameter, 3.0 to 1.75 filament diameter on this machine is 1.75, not 3.0 --- config/examples/Creality/Ender-2/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/examples/Creality/Ender-2/Configuration.h b/config/examples/Creality/Ender-2/Configuration.h index d0dd66108866..22145d74a40b 100644 --- a/config/examples/Creality/Ender-2/Configuration.h +++ b/config/examples/Creality/Ender-2/Configuration.h @@ -147,7 +147,7 @@ #define EXTRUDERS 1 // Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc. -#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0 +#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE From 4959133f8e417d0ae3042533d8bafa2563311d98 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 1 Jan 2020 15:37:24 -0600 Subject: [PATCH 3/5] Add ENDER2_STOCKDISPLAY MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …for your consideration…. --- Marlin/Configuration.h | 5 ++++ Marlin/src/inc/Conditionals_LCD.h | 2 +- Marlin/src/inc/Conditionals_post.h | 2 +- Marlin/src/inc/SanityCheck.h | 3 ++- .../lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp | 2 +- Marlin/src/lcd/dogm/ultralcd_DOGM.h | 2 +- Marlin/src/pins/linux/pins_RAMPS_LINUX.h | 2 +- Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h | 4 +-- Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h | 25 ++++++++++--------- Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h | 2 +- Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h | 2 +- Marlin/src/pins/mega/pins_GT2560_REV_A.h | 2 +- Marlin/src/pins/ramps/pins_FYSETC_F6_13.h | 2 +- Marlin/src/pins/ramps/pins_RAMPS.h | 2 +- Marlin/src/pins/ramps/pins_TT_OSCAR.h | 2 +- Marlin/src/pins/sam/pins_RURAMPS4D_13.h | 2 +- .../src/pins/sanguino/pins_MELZI_CREALITY.h | 6 ++--- Marlin/src/pins/stm32/pins_ARMED.h | 2 +- Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h | 2 +- Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h | 4 +-- Marlin/src/pins/stm32/pins_FYSETC_S6.h | 2 +- Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE.h | 2 +- Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE3.h | 2 +- Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h | 6 ++--- config/default/Configuration.h | 5 ++++ .../examples/3DFabXYZ/Migbot/Configuration.h | 5 ++++ .../ADIMLab/Gantry v1/Configuration.h | 5 ++++ .../ADIMLab/Gantry v2/Configuration.h | 5 ++++ .../AlephObjects/TAZ4/Configuration.h | 5 ++++ .../Alfawise/U20-bltouch/Configuration.h | 5 ++++ config/examples/Alfawise/U20/Configuration.h | 5 ++++ .../AliExpress/CL-260/Configuration.h | 5 ++++ .../AliExpress/UM2pExt/Configuration.h | 5 ++++ config/examples/Anet/A2/Configuration.h | 5 ++++ config/examples/Anet/A2plus/Configuration.h | 5 ++++ config/examples/Anet/A6/Configuration.h | 5 ++++ config/examples/Anet/A8/Configuration.h | 5 ++++ config/examples/Anet/A8plus/Configuration.h | 5 ++++ config/examples/Anet/E16/Configuration.h | 5 ++++ config/examples/AnyCubic/i3/Configuration.h | 5 ++++ config/examples/ArmEd/Configuration.h | 5 ++++ .../Artillery/Sidewinder X1/Configuration.h | 5 ++++ config/examples/Azteeg/X5GT/Configuration.h | 5 ++++ .../BIBO/TouchX/cyclops/Configuration.h | 5 ++++ .../BIBO/TouchX/default/Configuration.h | 5 ++++ config/examples/BQ/Hephestos/Configuration.h | 5 ++++ .../examples/BQ/Hephestos_2/Configuration.h | 5 ++++ config/examples/BQ/WITBOX/Configuration.h | 5 ++++ .../SKR Mini E3 1.0/Configuration.h | 5 ++++ .../SKR Mini E3 1.2/Configuration.h | 5 ++++ config/examples/Cartesio/Configuration.h | 5 ++++ .../examples/Creality/CR-10/Configuration.h | 5 ++++ .../examples/Creality/CR-10S/Configuration.h | 5 ++++ .../Creality/CR-10_5S/Configuration.h | 5 ++++ .../Creality/CR-10mini/Configuration.h | 5 ++++ .../Creality/CR-20 Pro/Configuration.h | 5 ++++ .../examples/Creality/CR-20/Configuration.h | 5 ++++ config/examples/Creality/CR-8/Configuration.h | 5 ++++ .../examples/Creality/Ender-2/Configuration.h | 7 +++++- .../examples/Creality/Ender-3/Configuration.h | 5 ++++ .../examples/Creality/Ender-4/Configuration.h | 5 ++++ .../Creality/Ender-5 Pro/Configuration.h | 5 ++++ .../examples/Creality/Ender-5/Configuration.h | 5 ++++ .../Dagoma/Disco Ultimate/Configuration.h | 5 ++++ .../Imprimante multifonction/Configuration.h | 5 ++++ config/examples/Einstart-S/Configuration.h | 5 ++++ config/examples/FYSETC/AIO_II/Configuration.h | 5 ++++ .../Cheetah 1.2/BLTouch/Configuration.h | 5 ++++ .../FYSETC/Cheetah 1.2/base/Configuration.h | 5 ++++ .../FYSETC/Cheetah/BLTouch/Configuration.h | 5 ++++ .../FYSETC/Cheetah/base/Configuration.h | 5 ++++ config/examples/FYSETC/F6_13/Configuration.h | 5 ++++ config/examples/FYSETC/S6/Configuration.h | 5 ++++ config/examples/Felix/DUAL/Configuration.h | 5 ++++ config/examples/Felix/Single/Configuration.h | 5 ++++ .../FlashForge/CreatorPro/Configuration.h | 5 ++++ .../FolgerTech/i3-2020/Configuration.h | 5 ++++ .../examples/Formbot/Raptor/Configuration.h | 5 ++++ .../examples/Formbot/T_Rex_2+/Configuration.h | 5 ++++ .../examples/Formbot/T_Rex_3/Configuration.h | 5 ++++ config/examples/Geeetech/A10/Configuration.h | 5 ++++ config/examples/Geeetech/A10D/Configuration.h | 5 ++++ config/examples/Geeetech/A10M/Configuration.h | 5 ++++ config/examples/Geeetech/A10T/Configuration.h | 5 ++++ config/examples/Geeetech/A20/Configuration.h | 5 ++++ config/examples/Geeetech/A20M/Configuration.h | 5 ++++ config/examples/Geeetech/A20T/Configuration.h | 5 ++++ config/examples/Geeetech/A30/Configuration.h | 5 ++++ config/examples/Geeetech/E180/Configuration.h | 5 ++++ .../examples/Geeetech/GT2560/Configuration.h | 5 ++++ .../Geeetech/I3_Pro_X-GT2560/Configuration.h | 5 ++++ .../Geeetech/MeCreator2/Configuration.h | 5 ++++ .../Geeetech/PI3A PRO/Configuration.h | 5 ++++ .../Prusa i3 Pro B/bltouch/Configuration.h | 5 ++++ .../Prusa i3 Pro B/noprobe/Configuration.h | 5 ++++ .../Geeetech/Prusa i3 Pro C/Configuration.h | 5 ++++ .../Geeetech/Prusa i3 Pro W/Configuration.h | 5 ++++ config/examples/HMS434/Configuration.h | 5 ++++ .../examples/Infitary/i3-M508/Configuration.h | 5 ++++ config/examples/JGAurora/A1/Configuration.h | 5 ++++ config/examples/JGAurora/A5/Configuration.h | 5 ++++ config/examples/JGAurora/A5S/Configuration.h | 5 ++++ config/examples/MakerParts/Configuration.h | 5 ++++ config/examples/Malyan/M150/Configuration.h | 5 ++++ config/examples/Malyan/M200/Configuration.h | 5 ++++ .../Micromake/C1/basic/Configuration.h | 5 ++++ .../Micromake/C1/enhanced/Configuration.h | 5 ++++ config/examples/Mks/Robin/Configuration.h | 5 ++++ .../examples/Mks/Robin_Lite3/Configuration.h | 5 ++++ config/examples/Mks/Robin_Pro/Configuration.h | 5 ++++ config/examples/Mks/Sbase/Configuration.h | 5 ++++ config/examples/Modix/Big60/Configuration.h | 5 ++++ .../Printrbot/PrintrboardG2/Configuration.h | 5 ++++ .../examples/RapideLite/RL200/Configuration.h | 5 ++++ .../examples/Renkforce/RF100/Configuration.h | 5 ++++ .../Renkforce/RF100XL/Configuration.h | 5 ++++ .../Renkforce/RF100v2/Configuration.h | 5 ++++ .../examples/RepRapPro/Huxley/Configuration.h | 5 ++++ .../RepRapWorld/Megatronics/Configuration.h | 5 ++++ config/examples/RigidBot/Configuration.h | 5 ++++ .../examples/SCARA/MP_SCARA/Configuration.h | 5 ++++ config/examples/SCARA/Morgan/Configuration.h | 5 ++++ .../STM32/Black_STM32F407VET6/Configuration.h | 5 ++++ .../STM32/STM32F103RE/Configuration.h | 5 ++++ config/examples/STM32/STM32F4/Configuration.h | 5 ++++ .../STM32/stm32f103ret6/Configuration.h | 5 ++++ config/examples/Sanguinololu/Configuration.h | 5 ++++ .../Tevo/Michelangelo/Configuration.h | 5 ++++ config/examples/Tevo/Nereus/Configuration.h | 5 ++++ .../Tevo/Tarantula Pro/Configuration.h | 5 ++++ .../Tornado/V1 (MKS Base)/Configuration.h | 5 ++++ .../Tornado/V2 (MKS GEN-L)/Configuration.h | 5 ++++ config/examples/TheBorg/Configuration.h | 5 ++++ config/examples/TinyBoy2/Configuration.h | 5 ++++ config/examples/Tronxy/X1/Configuration.h | 5 ++++ config/examples/Tronxy/X3A/Configuration.h | 5 ++++ config/examples/Tronxy/X5S-2E/Configuration.h | 5 ++++ config/examples/Tronxy/X5S/Configuration.h | 5 ++++ config/examples/Tronxy/XY100/Configuration.h | 5 ++++ .../UltiMachine/Archim1/Configuration.h | 5 ++++ .../UltiMachine/Archim2/Configuration.h | 5 ++++ config/examples/VORONDesign/Configuration.h | 5 ++++ .../examples/Velleman/K8200/Configuration.h | 5 ++++ .../Velleman/K8400/Dual-head/Configuration.h | 5 ++++ .../K8400/Single-head/Configuration.h | 5 ++++ .../examples/WASP/PowerWASP/Configuration.h | 5 ++++ .../Wanhao/Duplicator 6/Configuration.h | 5 ++++ .../Wanhao/Duplicator i3 2.1/Configuration.h | 5 ++++ .../Wanhao/Duplicator i3 Mini/Configuration.h | 5 ++++ .../examples/adafruit/ST7565/Configuration.h | 5 ++++ .../delta/Anycubic/Kossel/Configuration.h | 5 ++++ .../delta/Dreammaker/Overlord/Configuration.h | 5 ++++ .../Dreammaker/Overlord_Pro/Configuration.h | 5 ++++ .../examples/delta/FLSUN/QQ-S/Configuration.h | 5 ++++ .../FLSUN/auto_calibrate/Configuration.h | 5 ++++ .../delta/FLSUN/kossel/Configuration.h | 5 ++++ .../delta/FLSUN/kossel_mini/Configuration.h | 5 ++++ .../Geeetech/Rostock 301/Configuration.h | 5 ++++ .../delta/Hatchbox_Alpha/Configuration.h | 5 ++++ .../examples/delta/MKS/SBASE/Configuration.h | 5 ++++ .../delta/Tevo Little Monster/Configuration.h | 5 ++++ config/examples/delta/generic/Configuration.h | 5 ++++ .../delta/kossel_clear/Configuration.h | 5 ++++ .../delta/kossel_mini/Configuration.h | 5 ++++ .../examples/delta/kossel_pro/Configuration.h | 5 ++++ .../examples/delta/kossel_xl/Configuration.h | 5 ++++ .../examples/gCreate/gMax1.5+/Configuration.h | 5 ++++ config/examples/makibox/Configuration.h | 5 ++++ config/examples/tvrrug/Round2/Configuration.h | 5 ++++ config/examples/wt150/Configuration.h | 5 ++++ 170 files changed, 778 insertions(+), 41 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 9e0970a56ef4..f4c9de3a79fd 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h index a3cc22230830..1fbf222bfcf2 100644 --- a/Marlin/src/inc/Conditionals_LCD.h +++ b/Marlin/src/inc/Conditionals_LCD.h @@ -110,7 +110,7 @@ #define IS_RRD_SC #define IS_U8GLIB_SSD1306 -#elif ENABLED(MKS_MINI_12864) +#elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) #define MINIPANEL diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index 28c1c93a0fa4..ec0b06f66055 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -259,7 +259,7 @@ #elif ENABLED(MKS_LCD12864B) #define _LCD_CONTRAST_MIN 120 #define _LCD_CONTRAST_INIT 205 -#elif ENABLED(MKS_MINI_12864) +#elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) #define _LCD_CONTRAST_MIN 120 #define _LCD_CONTRAST_INIT 195 #elif ANY(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1) diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index 35a9ffc9b320..8bb487e0a23d 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -1866,7 +1866,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS + (ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(IS_RRD_FG_SC)) \ + (ENABLED(ULTRA_LCD) && DISABLED(IS_ULTRA_LCD)) \ + (ENABLED(U8GLIB_SSD1306) && DISABLED(IS_U8GLIB_SSD1306)) \ - + (ENABLED(MINIPANEL) && DISABLED(MKS_MINI_12864)) \ + + (ENABLED(MINIPANEL) && DISABLED(MKS_MINI_12864, ENDER2_STOCKDISPLAY)) \ + (ENABLED(REPRAPWORLD_KEYPAD) && DISABLED(IS_RRW_KEYPAD)) \ + (ENABLED(EXTENSIBLE_UI) && DISABLED(IS_EXTUI)) \ + (ENABLED(ULTIPANEL) && DISABLED(IS_ULTIPANEL)) \ @@ -1895,6 +1895,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS + ENABLED(LCD_FOR_MELZI) \ + ENABLED(ULTI_CONTROLLER) \ + ENABLED(MKS_MINI_12864) \ + + ENABLED(ENDER2_STOCKDISPLAY) \ + ENABLED(FYSETC_MINI_12864_X_X) \ + ENABLED(FYSETC_MINI_12864_1_2) \ + ENABLED(FYSETC_MINI_12864_2_0) \ diff --git a/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp b/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp index 1e12ba84d0ee..cd41373ab45c 100644 --- a/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp +++ b/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp @@ -118,7 +118,7 @@ static const uint8_t u8g_dev_uc1701_mini12864_HAL_init_seq[] PROGMEM = { static const uint8_t u8g_dev_uc1701_mini12864_HAL_data_start[] PROGMEM = { U8G_ESC_ADR(0), // instruction mode U8G_ESC_CS(1), // enable chip - #if ENABLED(MKS_MINI_12864) + #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) UC1701_START_LINE(0), // set display start line to 0 UC1701_ADC_REVERSE(0), // ADC set to reverse UC1701_OUT_MODE(1), // common output mode diff --git a/Marlin/src/lcd/dogm/ultralcd_DOGM.h b/Marlin/src/lcd/dogm/ultralcd_DOGM.h index 8ff2dbc85b91..576de494853d 100644 --- a/Marlin/src/lcd/dogm/ultralcd_DOGM.h +++ b/Marlin/src/lcd/dogm/ultralcd_DOGM.h @@ -147,7 +147,7 @@ #define U8G_CLASS U8GLIB_MINI12864_2X_HAL // 4 stripes -#elif ENABLED(MKS_MINI_12864) +#elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) // The MKS_MINI_12864 V1/V2 aren't exact copies of the MiniPanel. // Panel management is in u8g_dev_uc1701_mini12864_HAL.cpp with diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h index 48cdb1dd62b3..f07f8158e59a 100644 --- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h +++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h @@ -529,7 +529,7 @@ #define SD_DETECT_PIN 49 #define KILL_PIN 41 - #elif ENABLED(MKS_MINI_12864) // Added in Marlin 1.1.6 + #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) #define DOGLCD_A0 27 #define DOGLCD_CS 25 diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h index afcae1cad1a4..0cb24292497d 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h @@ -77,7 +77,7 @@ #define LCD_PINS_ENABLE P0_18 #define LCD_PINS_D4 P0_15 - #if ENABLED(MKS_MINI_12864) + #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) #define DOGLCD_CS P2_06 #define DOGLCD_A0 P0_16 #endif @@ -90,7 +90,7 @@ // requires jumpers on the SKR V1.1 board as documented here: // https://www.facebook.com/groups/505736576548648/permalink/630639874058317/ #ifndef SDCARD_CONNECTION - #if ENABLED(MKS_MINI_12864) + #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) #define SDCARD_CONNECTION LCD #else #define SDCARD_CONNECTION ONBOARD diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h index 38cca8dc188b..926f64447d17 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h @@ -270,18 +270,19 @@ #else // !FYSETC_MINI_12864 - #if ENABLED(MKS_MINI_12864) - - /** Creality Ender-2 display pinout - * _____ - * 5V | · · | GND - * (MOSI) P1_23 | · · | P1_22 (LCD_CS) - * (LCD_A0) P1_21 | · · | P1_20 (BTN_EN2) - * RESET P1.19 | · · | P1_18 (BTN_EN1) - * (BTN_ENC) P0_28 | · · | P1_30 (SCK) - * ----- - * EXP1 - */ + #if ENABLED(ENDER2_STOCKDISPLAY) + + /** + * Creality Ender-2 display pinout + * _____ + * 5V | · · | GND + * (MOSI) P1_23 | · · | P1_22 (LCD_CS) + * (LCD_A0) P1_21 | · · | P1_20 (BTN_EN2) + * RESET P1.19 | · · | P1_18 (BTN_EN1) + * (BTN_ENC) P0_28 | · · | P1_30 (SCK) + * ----- + * EXP1 + */ #define BTN_EN1 P1_18 #define BTN_EN2 P1_20 diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h index 8e2a0cec231a..e0aefabf2bbc 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h @@ -246,7 +246,7 @@ #else // !FYSETC_MINI_12864 - #if ENABLED(MKS_MINI_12864) + #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) #define DOGLCD_CS P1_21 #define DOGLCD_A0 P1_22 #define DOGLCD_SCK P0_15 diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h index a47e9e038326..c62620c4a58d 100644 --- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h +++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h @@ -266,7 +266,7 @@ #else // !FYSETC_MINI_12864 - #if ENABLED(MKS_MINI_12864) + #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) #define DOGLCD_CS P0_17 #define DOGLCD_A0 P1_00 #endif diff --git a/Marlin/src/pins/mega/pins_GT2560_REV_A.h b/Marlin/src/pins/mega/pins_GT2560_REV_A.h index 16bd5688df53..adecc5f7037a 100644 --- a/Marlin/src/pins/mega/pins_GT2560_REV_A.h +++ b/Marlin/src/pins/mega/pins_GT2560_REV_A.h @@ -101,7 +101,7 @@ #if ENABLED(NEWPANEL) - #if ENABLED(MKS_MINI_12864) + #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) #define DOGLCD_A0 5 #define DOGLCD_CS 21 #define BTN_EN1 40 diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h index 4c6f59aaae8a..ea3ae0a31c29 100644 --- a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h +++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h @@ -254,7 +254,7 @@ #define LCD_PINS_D6 27 #define LCD_PINS_D7 29 - #if ENABLED(MKS_MINI_12864) + #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) #define DOGLCD_CS 25 #define DOGLCD_A0 27 #endif diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h index 676197b84d0c..2651b34d6e76 100644 --- a/Marlin/src/pins/ramps/pins_RAMPS.h +++ b/Marlin/src/pins/ramps/pins_RAMPS.h @@ -581,7 +581,7 @@ #define KILL_PIN 41 #endif - #if ENABLED(MKS_MINI_12864) // Added in Marlin 1.1.6 + #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) // Added in Marlin 1.1.6 #define DOGLCD_A0 27 #define DOGLCD_CS 25 diff --git a/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin/src/pins/ramps/pins_TT_OSCAR.h index 1c40729a8788..8311013b4cfc 100644 --- a/Marlin/src/pins/ramps/pins_TT_OSCAR.h +++ b/Marlin/src/pins/ramps/pins_TT_OSCAR.h @@ -430,7 +430,7 @@ #define SD_DETECT_PIN 49 //#define KILL_PIN 41 - #elif ENABLED(MKS_MINI_12864) + #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) #define DOGLCD_A0 27 #define DOGLCD_CS 25 diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h index c8ff71673bf3..7a69e05a8ec8 100644 --- a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h +++ b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h @@ -238,7 +238,7 @@ #define NEOPIXEL_PIN 50 // D5 #endif - #elif ENABLED(MKS_MINI_12864) + #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) #define ORIG_BEEPER_PIN 62 diff --git a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h index 66fbd4789009..59faeee770bf 100644 --- a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h +++ b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h @@ -35,9 +35,9 @@ #include "pins_MELZI.h" -// For the stock CR-10 use the REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER -// option for the display in Configuration.h - +// +// For the stock CR-10 enable CR10_STOCKDISPLAY in Configuration.h +// #undef LCD_SDSS #undef LED_PIN #undef LCD_PINS_RS diff --git a/Marlin/src/pins/stm32/pins_ARMED.h b/Marlin/src/pins/stm32/pins_ARMED.h index 495654a82cbf..916477ef8779 100644 --- a/Marlin/src/pins/stm32/pins_ARMED.h +++ b/Marlin/src/pins/stm32/pins_ARMED.h @@ -173,7 +173,7 @@ #define LCD_PINS_D6 PB14 #define LCD_PINS_D7 PB15 - #if ENABLED(MKS_MINI_12864) + #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) #define DOGLCD_CS PB13 #define DOGLCD_A0 PB14 #endif diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h b/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h index 2618e3462e7a..b23ab1c2db72 100644 --- a/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h +++ b/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h @@ -185,7 +185,7 @@ #define LCD_PINS_ENABLE PB7 #define LCD_PINS_D4 PB9 - #elif ENABLED(MKS_MINI_12864) + #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) /** Creality Ender-2 display pinout * _____ diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h index 26e232703283..82a1f62009ec 100644 --- a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h +++ b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h @@ -138,7 +138,7 @@ #define LCD_PINS_D7 PB5 #define ADC_KEYPAD_PIN PA1 // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD! - #elif ENABLED(MKS_MINI_12864) + #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) /** Creality Ender-2 display pinout * _____ @@ -163,7 +163,7 @@ #else - #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, and MKS_MINI_12864 are currently supported on the BIGTREE_SKR_MINI_E3." + #error "Only ZONESTAR_LCD, MKS_MINI_12864, ENDER2_STOCKDISPLAY, and CR10_STOCKDISPLAY are currently supported on the BIGTREE_SKR_MINI_E3." #endif diff --git a/Marlin/src/pins/stm32/pins_FYSETC_S6.h b/Marlin/src/pins/stm32/pins_FYSETC_S6.h index 227fe4cd559e..99bb058fe938 100644 --- a/Marlin/src/pins/stm32/pins_FYSETC_S6.h +++ b/Marlin/src/pins/stm32/pins_FYSETC_S6.h @@ -198,7 +198,7 @@ #define LCD_PINS_D6 PD0 #define LCD_PINS_D7 PD1 - #if ENABLED(MKS_MINI_12864) + #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) #define DOGLCD_CS PC12 #define DOGLCD_A0 PD0 #endif diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE.h index c86b62cddd0c..e6b41d9e5f0f 100644 --- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE.h +++ b/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE.h @@ -91,7 +91,7 @@ #define LCD_PINS_ENABLE PC2 - #if ENABLED(MKS_MINI_12864) + #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) #define LCD_BACKLIGHT_PIN -1 #define LCD_RESET_PIN -1 diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE3.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE3.h index 6d6787903b70..ee128d0317c5 100644 --- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE3.h +++ b/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE3.h @@ -106,7 +106,7 @@ #define BTN_EN2 PB0 // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor) - #if ENABLED(MKS_MINI_12864) + #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) #define LCD_BACKLIGHT_PIN -1 #define LCD_RESET_PIN -1 diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h index f29de56120f5..75ebc0033fd1 100644 --- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h +++ b/Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h @@ -242,7 +242,7 @@ #define BTN_EN2 PG4 // MKS MINI12864 and MKS LCD12864B. If using MKS LCD12864A (Need to remove RPK2 resistor) - #if ENABLED(MKS_MINI_12864) + #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) #define LCD_BACKLIGHT_PIN -1 #define LCD_RESET_PIN -1 @@ -251,7 +251,7 @@ #define DOGLCD_SCK PB13 #define DOGLCD_MOSI PB15 - #else // !MKS_MINI_12864 + #else // !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY #define LCD_PINS_D4 PF14 #if ENABLED(ULTIPANEL) @@ -260,7 +260,7 @@ #define LCD_PINS_D7 PF13 #endif - #endif // !MKS_MINI_12864 + #endif // !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY #endif #ifndef ST7920_DELAY_1 diff --git a/config/default/Configuration.h b/config/default/Configuration.h index 9e0970a56ef4..f4c9de3a79fd 100644 --- a/config/default/Configuration.h +++ b/config/default/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/3DFabXYZ/Migbot/Configuration.h b/config/examples/3DFabXYZ/Migbot/Configuration.h index d9f5d9668121..4045424deba7 100644 --- a/config/examples/3DFabXYZ/Migbot/Configuration.h +++ b/config/examples/3DFabXYZ/Migbot/Configuration.h @@ -1989,6 +1989,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/ADIMLab/Gantry v1/Configuration.h b/config/examples/ADIMLab/Gantry v1/Configuration.h index fd7dc6fee7fe..f868dad74643 100644 --- a/config/examples/ADIMLab/Gantry v1/Configuration.h +++ b/config/examples/ADIMLab/Gantry v1/Configuration.h @@ -1958,6 +1958,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/ADIMLab/Gantry v2/Configuration.h b/config/examples/ADIMLab/Gantry v2/Configuration.h index 9a69fbbb114b..8480c534a1f9 100644 --- a/config/examples/ADIMLab/Gantry v2/Configuration.h +++ b/config/examples/ADIMLab/Gantry v2/Configuration.h @@ -1958,6 +1958,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/AlephObjects/TAZ4/Configuration.h b/config/examples/AlephObjects/TAZ4/Configuration.h index a986b7d7bd77..b8aa5f03e1f5 100644 --- a/config/examples/AlephObjects/TAZ4/Configuration.h +++ b/config/examples/AlephObjects/TAZ4/Configuration.h @@ -1977,6 +1977,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Alfawise/U20-bltouch/Configuration.h b/config/examples/Alfawise/U20-bltouch/Configuration.h index 748211698d67..f05b64f6d0e9 100644 --- a/config/examples/Alfawise/U20-bltouch/Configuration.h +++ b/config/examples/Alfawise/U20-bltouch/Configuration.h @@ -2037,6 +2037,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Alfawise/U20/Configuration.h b/config/examples/Alfawise/U20/Configuration.h index 823fb06b31a9..30fb5e0381fb 100644 --- a/config/examples/Alfawise/U20/Configuration.h +++ b/config/examples/Alfawise/U20/Configuration.h @@ -2036,6 +2036,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/AliExpress/CL-260/Configuration.h b/config/examples/AliExpress/CL-260/Configuration.h index 1ca93f33274e..2ecf4a56b9d7 100644 --- a/config/examples/AliExpress/CL-260/Configuration.h +++ b/config/examples/AliExpress/CL-260/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/AliExpress/UM2pExt/Configuration.h b/config/examples/AliExpress/UM2pExt/Configuration.h index 83781dc786e9..ef179a620f02 100644 --- a/config/examples/AliExpress/UM2pExt/Configuration.h +++ b/config/examples/AliExpress/UM2pExt/Configuration.h @@ -1968,6 +1968,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Anet/A2/Configuration.h b/config/examples/Anet/A2/Configuration.h index a1f767564645..b4f57513f8f1 100644 --- a/config/examples/Anet/A2/Configuration.h +++ b/config/examples/Anet/A2/Configuration.h @@ -1959,6 +1959,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Anet/A2plus/Configuration.h b/config/examples/Anet/A2plus/Configuration.h index ce5e767b8def..a4706fcd9386 100644 --- a/config/examples/Anet/A2plus/Configuration.h +++ b/config/examples/Anet/A2plus/Configuration.h @@ -1959,6 +1959,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Anet/A6/Configuration.h b/config/examples/Anet/A6/Configuration.h index 6a04f1711c44..649e67dd7591 100644 --- a/config/examples/Anet/A6/Configuration.h +++ b/config/examples/Anet/A6/Configuration.h @@ -2074,6 +2074,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Anet/A8/Configuration.h b/config/examples/Anet/A8/Configuration.h index 8d4644aa2c3a..1e430f95416a 100644 --- a/config/examples/Anet/A8/Configuration.h +++ b/config/examples/Anet/A8/Configuration.h @@ -1985,6 +1985,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Anet/A8plus/Configuration.h b/config/examples/Anet/A8plus/Configuration.h index 50a01a862a91..8c9f6acf29d7 100644 --- a/config/examples/Anet/A8plus/Configuration.h +++ b/config/examples/Anet/A8plus/Configuration.h @@ -1968,6 +1968,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Anet/E16/Configuration.h b/config/examples/Anet/E16/Configuration.h index 111b9c864513..74f475d06eb9 100644 --- a/config/examples/Anet/E16/Configuration.h +++ b/config/examples/Anet/E16/Configuration.h @@ -1969,6 +1969,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/AnyCubic/i3/Configuration.h b/config/examples/AnyCubic/i3/Configuration.h index 46719efdfd0a..0e0a5bc68007 100644 --- a/config/examples/AnyCubic/i3/Configuration.h +++ b/config/examples/AnyCubic/i3/Configuration.h @@ -1967,6 +1967,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/ArmEd/Configuration.h b/config/examples/ArmEd/Configuration.h index fe3283a26c08..da245ffa8c2e 100644 --- a/config/examples/ArmEd/Configuration.h +++ b/config/examples/ArmEd/Configuration.h @@ -1958,6 +1958,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Artillery/Sidewinder X1/Configuration.h b/config/examples/Artillery/Sidewinder X1/Configuration.h index fa9baa7e26fe..d506f45170e5 100644 --- a/config/examples/Artillery/Sidewinder X1/Configuration.h +++ b/config/examples/Artillery/Sidewinder X1/Configuration.h @@ -1962,6 +1962,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Azteeg/X5GT/Configuration.h b/config/examples/Azteeg/X5GT/Configuration.h index 187c408d2fa5..465fe578c0c3 100644 --- a/config/examples/Azteeg/X5GT/Configuration.h +++ b/config/examples/Azteeg/X5GT/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/BIBO/TouchX/cyclops/Configuration.h b/config/examples/BIBO/TouchX/cyclops/Configuration.h index e20bc5a51a70..2628258f655e 100644 --- a/config/examples/BIBO/TouchX/cyclops/Configuration.h +++ b/config/examples/BIBO/TouchX/cyclops/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/BIBO/TouchX/default/Configuration.h b/config/examples/BIBO/TouchX/default/Configuration.h index 484d5efe0a2b..f6b8f7e39efc 100644 --- a/config/examples/BIBO/TouchX/default/Configuration.h +++ b/config/examples/BIBO/TouchX/default/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/BQ/Hephestos/Configuration.h b/config/examples/BQ/Hephestos/Configuration.h index 5c599d4b4fc0..81e34901754a 100644 --- a/config/examples/BQ/Hephestos/Configuration.h +++ b/config/examples/BQ/Hephestos/Configuration.h @@ -1945,6 +1945,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/BQ/Hephestos_2/Configuration.h b/config/examples/BQ/Hephestos_2/Configuration.h index a8334abaafd9..5049e6f0e1e6 100644 --- a/config/examples/BQ/Hephestos_2/Configuration.h +++ b/config/examples/BQ/Hephestos_2/Configuration.h @@ -1958,6 +1958,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/BQ/WITBOX/Configuration.h b/config/examples/BQ/WITBOX/Configuration.h index cf6a074c299d..f441eccbf5bf 100644 --- a/config/examples/BQ/WITBOX/Configuration.h +++ b/config/examples/BQ/WITBOX/Configuration.h @@ -1945,6 +1945,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/BigTreeTech/SKR Mini E3 1.0/Configuration.h b/config/examples/BigTreeTech/SKR Mini E3 1.0/Configuration.h index c66bb19bb088..9f3528f5989f 100644 --- a/config/examples/BigTreeTech/SKR Mini E3 1.0/Configuration.h +++ b/config/examples/BigTreeTech/SKR Mini E3 1.0/Configuration.h @@ -1949,6 +1949,11 @@ // #define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/BigTreeTech/SKR Mini E3 1.2/Configuration.h b/config/examples/BigTreeTech/SKR Mini E3 1.2/Configuration.h index 33a1ea2755de..663d3d76a543 100644 --- a/config/examples/BigTreeTech/SKR Mini E3 1.2/Configuration.h +++ b/config/examples/BigTreeTech/SKR Mini E3 1.2/Configuration.h @@ -1950,6 +1950,11 @@ // #define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Cartesio/Configuration.h b/config/examples/Cartesio/Configuration.h index 4f3bd706f7ff..78f60f8ce945 100644 --- a/config/examples/Cartesio/Configuration.h +++ b/config/examples/Cartesio/Configuration.h @@ -1956,6 +1956,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Creality/CR-10/Configuration.h b/config/examples/Creality/CR-10/Configuration.h index d72ae0b94732..25e843dfcb0b 100644 --- a/config/examples/Creality/CR-10/Configuration.h +++ b/config/examples/Creality/CR-10/Configuration.h @@ -1967,6 +1967,11 @@ // #define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Creality/CR-10S/Configuration.h b/config/examples/Creality/CR-10S/Configuration.h index 580dfb846260..28a23666ab14 100644 --- a/config/examples/Creality/CR-10S/Configuration.h +++ b/config/examples/Creality/CR-10S/Configuration.h @@ -1958,6 +1958,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Creality/CR-10_5S/Configuration.h b/config/examples/Creality/CR-10_5S/Configuration.h index 855c96a7a6c9..e9230f16cb78 100644 --- a/config/examples/Creality/CR-10_5S/Configuration.h +++ b/config/examples/Creality/CR-10_5S/Configuration.h @@ -1960,6 +1960,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Creality/CR-10mini/Configuration.h b/config/examples/Creality/CR-10mini/Configuration.h index 60f69a431176..07f22247abc9 100644 --- a/config/examples/Creality/CR-10mini/Configuration.h +++ b/config/examples/Creality/CR-10mini/Configuration.h @@ -1976,6 +1976,11 @@ // #define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Creality/CR-20 Pro/Configuration.h b/config/examples/Creality/CR-20 Pro/Configuration.h index 4cdbdf7639c6..220ae105c9a2 100644 --- a/config/examples/Creality/CR-20 Pro/Configuration.h +++ b/config/examples/Creality/CR-20 Pro/Configuration.h @@ -1961,6 +1961,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Creality/CR-20/Configuration.h b/config/examples/Creality/CR-20/Configuration.h index b92ba8e54941..d7a9bd8fc8c4 100644 --- a/config/examples/Creality/CR-20/Configuration.h +++ b/config/examples/Creality/CR-20/Configuration.h @@ -1961,6 +1961,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Creality/CR-8/Configuration.h b/config/examples/Creality/CR-8/Configuration.h index 1630b2cdeab7..8e1375bd7aef 100644 --- a/config/examples/Creality/CR-8/Configuration.h +++ b/config/examples/Creality/CR-8/Configuration.h @@ -1967,6 +1967,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Creality/Ender-2/Configuration.h b/config/examples/Creality/Ender-2/Configuration.h index 22145d74a40b..d20e133b4cc7 100644 --- a/config/examples/Creality/Ender-2/Configuration.h +++ b/config/examples/Creality/Ender-2/Configuration.h @@ -1941,7 +1941,7 @@ // MKS MINI12864 with graphic controller and SD support // https://reprap.org/wiki/MKS_MINI_12864 // -#define MKS_MINI_12864 +//#define MKS_MINI_12864 // // FYSETC variant of the MINI12864 graphic controller with SD support @@ -1961,6 +1961,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Creality/Ender-3/Configuration.h b/config/examples/Creality/Ender-3/Configuration.h index 4734c6550966..72eeebeba4e9 100644 --- a/config/examples/Creality/Ender-3/Configuration.h +++ b/config/examples/Creality/Ender-3/Configuration.h @@ -1961,6 +1961,11 @@ // #define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Creality/Ender-4/Configuration.h b/config/examples/Creality/Ender-4/Configuration.h index 9cc53f8240d5..a3ddb0406318 100644 --- a/config/examples/Creality/Ender-4/Configuration.h +++ b/config/examples/Creality/Ender-4/Configuration.h @@ -1967,6 +1967,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Creality/Ender-5 Pro/Configuration.h b/config/examples/Creality/Ender-5 Pro/Configuration.h index b3585bf2c78c..a7391b515f65 100644 --- a/config/examples/Creality/Ender-5 Pro/Configuration.h +++ b/config/examples/Creality/Ender-5 Pro/Configuration.h @@ -1955,6 +1955,11 @@ // #define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Creality/Ender-5/Configuration.h b/config/examples/Creality/Ender-5/Configuration.h index d23b4d551f22..325cf195d3f6 100644 --- a/config/examples/Creality/Ender-5/Configuration.h +++ b/config/examples/Creality/Ender-5/Configuration.h @@ -1961,6 +1961,11 @@ // #define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Dagoma/Disco Ultimate/Configuration.h b/config/examples/Dagoma/Disco Ultimate/Configuration.h index 0c818a2a1077..0ba7cfe85785 100644 --- a/config/examples/Dagoma/Disco Ultimate/Configuration.h +++ b/config/examples/Dagoma/Disco Ultimate/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/EXP3D/Imprimante multifonction/Configuration.h b/config/examples/EXP3D/Imprimante multifonction/Configuration.h index 2e3beb74813b..42be60b1136a 100644 --- a/config/examples/EXP3D/Imprimante multifonction/Configuration.h +++ b/config/examples/EXP3D/Imprimante multifonction/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Einstart-S/Configuration.h b/config/examples/Einstart-S/Configuration.h index 4646cbe14156..8f3b1b485053 100644 --- a/config/examples/Einstart-S/Configuration.h +++ b/config/examples/Einstart-S/Configuration.h @@ -1967,6 +1967,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/FYSETC/AIO_II/Configuration.h b/config/examples/FYSETC/AIO_II/Configuration.h index d66b1c8691a1..1e57d6e9e574 100644 --- a/config/examples/FYSETC/AIO_II/Configuration.h +++ b/config/examples/FYSETC/AIO_II/Configuration.h @@ -1962,6 +1962,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/FYSETC/Cheetah 1.2/BLTouch/Configuration.h b/config/examples/FYSETC/Cheetah 1.2/BLTouch/Configuration.h index ed4cd1b40f39..e8f862179370 100644 --- a/config/examples/FYSETC/Cheetah 1.2/BLTouch/Configuration.h +++ b/config/examples/FYSETC/Cheetah 1.2/BLTouch/Configuration.h @@ -1962,6 +1962,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/FYSETC/Cheetah 1.2/base/Configuration.h b/config/examples/FYSETC/Cheetah 1.2/base/Configuration.h index 3a075d3b68d8..a504b958a615 100644 --- a/config/examples/FYSETC/Cheetah 1.2/base/Configuration.h +++ b/config/examples/FYSETC/Cheetah 1.2/base/Configuration.h @@ -1962,6 +1962,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/FYSETC/Cheetah/BLTouch/Configuration.h b/config/examples/FYSETC/Cheetah/BLTouch/Configuration.h index dec2d7044516..c2f899a86d9b 100644 --- a/config/examples/FYSETC/Cheetah/BLTouch/Configuration.h +++ b/config/examples/FYSETC/Cheetah/BLTouch/Configuration.h @@ -1962,6 +1962,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/FYSETC/Cheetah/base/Configuration.h b/config/examples/FYSETC/Cheetah/base/Configuration.h index f32e75f40ef6..c545cd373143 100644 --- a/config/examples/FYSETC/Cheetah/base/Configuration.h +++ b/config/examples/FYSETC/Cheetah/base/Configuration.h @@ -1962,6 +1962,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/FYSETC/F6_13/Configuration.h b/config/examples/FYSETC/F6_13/Configuration.h index 4cbe4ffb22d9..2151127e494a 100644 --- a/config/examples/FYSETC/F6_13/Configuration.h +++ b/config/examples/FYSETC/F6_13/Configuration.h @@ -1959,6 +1959,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/FYSETC/S6/Configuration.h b/config/examples/FYSETC/S6/Configuration.h index 81c021b68a33..f8085ca08377 100644 --- a/config/examples/FYSETC/S6/Configuration.h +++ b/config/examples/FYSETC/S6/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Felix/DUAL/Configuration.h b/config/examples/Felix/DUAL/Configuration.h index 1c1965be62f1..4fa15b09a4fa 100644 --- a/config/examples/Felix/DUAL/Configuration.h +++ b/config/examples/Felix/DUAL/Configuration.h @@ -1938,6 +1938,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Felix/Single/Configuration.h b/config/examples/Felix/Single/Configuration.h index 665886a07ea3..99d859d350a0 100644 --- a/config/examples/Felix/Single/Configuration.h +++ b/config/examples/Felix/Single/Configuration.h @@ -1938,6 +1938,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/FlashForge/CreatorPro/Configuration.h b/config/examples/FlashForge/CreatorPro/Configuration.h index 842f80e0dcf1..0a250de2545d 100644 --- a/config/examples/FlashForge/CreatorPro/Configuration.h +++ b/config/examples/FlashForge/CreatorPro/Configuration.h @@ -1950,6 +1950,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/FolgerTech/i3-2020/Configuration.h b/config/examples/FolgerTech/i3-2020/Configuration.h index 601eb00a1bab..7da8f0e24978 100644 --- a/config/examples/FolgerTech/i3-2020/Configuration.h +++ b/config/examples/FolgerTech/i3-2020/Configuration.h @@ -1976,6 +1976,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Formbot/Raptor/Configuration.h b/config/examples/Formbot/Raptor/Configuration.h index f764ec62b6a0..f73833e7e7d9 100644 --- a/config/examples/Formbot/Raptor/Configuration.h +++ b/config/examples/Formbot/Raptor/Configuration.h @@ -2076,6 +2076,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Formbot/T_Rex_2+/Configuration.h b/config/examples/Formbot/T_Rex_2+/Configuration.h index ba078cf844fe..26834f82e0c0 100644 --- a/config/examples/Formbot/T_Rex_2+/Configuration.h +++ b/config/examples/Formbot/T_Rex_2+/Configuration.h @@ -2004,6 +2004,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Formbot/T_Rex_3/Configuration.h b/config/examples/Formbot/T_Rex_3/Configuration.h index c45a5f17cd0f..a1029f9a705b 100644 --- a/config/examples/Formbot/T_Rex_3/Configuration.h +++ b/config/examples/Formbot/T_Rex_3/Configuration.h @@ -1994,6 +1994,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Geeetech/A10/Configuration.h b/config/examples/Geeetech/A10/Configuration.h index 3d39a4560af4..5c299799c2e6 100644 --- a/config/examples/Geeetech/A10/Configuration.h +++ b/config/examples/Geeetech/A10/Configuration.h @@ -1942,6 +1942,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Geeetech/A10D/Configuration.h b/config/examples/Geeetech/A10D/Configuration.h index 7aa308fc183b..cb28f7d36b12 100644 --- a/config/examples/Geeetech/A10D/Configuration.h +++ b/config/examples/Geeetech/A10D/Configuration.h @@ -1941,6 +1941,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Geeetech/A10M/Configuration.h b/config/examples/Geeetech/A10M/Configuration.h index 77d1a023f9e5..5f5dfe19880e 100644 --- a/config/examples/Geeetech/A10M/Configuration.h +++ b/config/examples/Geeetech/A10M/Configuration.h @@ -1942,6 +1942,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Geeetech/A10T/Configuration.h b/config/examples/Geeetech/A10T/Configuration.h index 784227680d33..d8eecafc6371 100644 --- a/config/examples/Geeetech/A10T/Configuration.h +++ b/config/examples/Geeetech/A10T/Configuration.h @@ -1943,6 +1943,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Geeetech/A20/Configuration.h b/config/examples/Geeetech/A20/Configuration.h index 602194fcaeee..0e27a563be64 100644 --- a/config/examples/Geeetech/A20/Configuration.h +++ b/config/examples/Geeetech/A20/Configuration.h @@ -1943,6 +1943,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Geeetech/A20M/Configuration.h b/config/examples/Geeetech/A20M/Configuration.h index 73e0ecf51722..4c8cfa905d88 100644 --- a/config/examples/Geeetech/A20M/Configuration.h +++ b/config/examples/Geeetech/A20M/Configuration.h @@ -1944,6 +1944,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Geeetech/A20T/Configuration.h b/config/examples/Geeetech/A20T/Configuration.h index 84196e64cb47..7a630df27e55 100644 --- a/config/examples/Geeetech/A20T/Configuration.h +++ b/config/examples/Geeetech/A20T/Configuration.h @@ -1945,6 +1945,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Geeetech/A30/Configuration.h b/config/examples/Geeetech/A30/Configuration.h index e9f07218b8cb..5ee53d97d8dd 100644 --- a/config/examples/Geeetech/A30/Configuration.h +++ b/config/examples/Geeetech/A30/Configuration.h @@ -1945,6 +1945,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Geeetech/E180/Configuration.h b/config/examples/Geeetech/E180/Configuration.h index fca5dbbcca29..9e4565a5e0c5 100644 --- a/config/examples/Geeetech/E180/Configuration.h +++ b/config/examples/Geeetech/E180/Configuration.h @@ -1946,6 +1946,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Geeetech/GT2560/Configuration.h b/config/examples/Geeetech/GT2560/Configuration.h index 8dcfd79c4320..ed77ba869133 100644 --- a/config/examples/Geeetech/GT2560/Configuration.h +++ b/config/examples/Geeetech/GT2560/Configuration.h @@ -1972,6 +1972,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h b/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h index 2cebcdb49dbe..78a8e122b8aa 100644 --- a/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h +++ b/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Geeetech/MeCreator2/Configuration.h b/config/examples/Geeetech/MeCreator2/Configuration.h index 38da8c250233..3f70e0b0b3e0 100644 --- a/config/examples/Geeetech/MeCreator2/Configuration.h +++ b/config/examples/Geeetech/MeCreator2/Configuration.h @@ -1964,6 +1964,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Geeetech/PI3A PRO/Configuration.h b/config/examples/Geeetech/PI3A PRO/Configuration.h index 340a9e2ae8b8..d7b95673d93a 100644 --- a/config/examples/Geeetech/PI3A PRO/Configuration.h +++ b/config/examples/Geeetech/PI3A PRO/Configuration.h @@ -1978,6 +1978,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h b/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h index 3605b83d4e4b..b64f15c9fe75 100644 --- a/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h +++ b/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h @@ -1978,6 +1978,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h b/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h index 5dae8bb1418a..ee2b74d8d0fa 100644 --- a/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h +++ b/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h @@ -1977,6 +1977,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h b/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h index 43a103be1025..cc2b1642994b 100644 --- a/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h +++ b/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h b/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h index b3a64b82bd74..e92c9691f208 100644 --- a/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h +++ b/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/HMS434/Configuration.h b/config/examples/HMS434/Configuration.h index 5b809268f124..d0a47d098454 100644 --- a/config/examples/HMS434/Configuration.h +++ b/config/examples/HMS434/Configuration.h @@ -1946,6 +1946,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Infitary/i3-M508/Configuration.h b/config/examples/Infitary/i3-M508/Configuration.h index 869c99a0ba5a..d735ecb2b43e 100644 --- a/config/examples/Infitary/i3-M508/Configuration.h +++ b/config/examples/Infitary/i3-M508/Configuration.h @@ -1961,6 +1961,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/JGAurora/A1/Configuration.h b/config/examples/JGAurora/A1/Configuration.h index 4a317891bfc5..f52b9315b1dd 100644 --- a/config/examples/JGAurora/A1/Configuration.h +++ b/config/examples/JGAurora/A1/Configuration.h @@ -1965,6 +1965,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/JGAurora/A5/Configuration.h b/config/examples/JGAurora/A5/Configuration.h index ebd16205717f..b69459a0e940 100644 --- a/config/examples/JGAurora/A5/Configuration.h +++ b/config/examples/JGAurora/A5/Configuration.h @@ -1969,6 +1969,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/JGAurora/A5S/Configuration.h b/config/examples/JGAurora/A5S/Configuration.h index cd0a0d0ee460..b943798909b1 100644 --- a/config/examples/JGAurora/A5S/Configuration.h +++ b/config/examples/JGAurora/A5S/Configuration.h @@ -1965,6 +1965,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/MakerParts/Configuration.h b/config/examples/MakerParts/Configuration.h index 1f8bd2286030..152bd6c0018d 100644 --- a/config/examples/MakerParts/Configuration.h +++ b/config/examples/MakerParts/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Malyan/M150/Configuration.h b/config/examples/Malyan/M150/Configuration.h index 24e3d99749fb..59944e785eb3 100644 --- a/config/examples/Malyan/M150/Configuration.h +++ b/config/examples/Malyan/M150/Configuration.h @@ -1998,6 +1998,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Malyan/M200/Configuration.h b/config/examples/Malyan/M200/Configuration.h index b15aa6cdd067..344afe1eca6e 100644 --- a/config/examples/Malyan/M200/Configuration.h +++ b/config/examples/Malyan/M200/Configuration.h @@ -1967,6 +1967,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Micromake/C1/basic/Configuration.h b/config/examples/Micromake/C1/basic/Configuration.h index 84dee1ac2f77..fd815cfda6e4 100644 --- a/config/examples/Micromake/C1/basic/Configuration.h +++ b/config/examples/Micromake/C1/basic/Configuration.h @@ -1961,6 +1961,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Micromake/C1/enhanced/Configuration.h b/config/examples/Micromake/C1/enhanced/Configuration.h index a77ee6809442..9d72a3bbf555 100644 --- a/config/examples/Micromake/C1/enhanced/Configuration.h +++ b/config/examples/Micromake/C1/enhanced/Configuration.h @@ -1961,6 +1961,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Mks/Robin/Configuration.h b/config/examples/Mks/Robin/Configuration.h index 576825c46575..fca9d2d62430 100644 --- a/config/examples/Mks/Robin/Configuration.h +++ b/config/examples/Mks/Robin/Configuration.h @@ -1959,6 +1959,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Mks/Robin_Lite3/Configuration.h b/config/examples/Mks/Robin_Lite3/Configuration.h index 52c3efd7f8ed..999ca42fe413 100644 --- a/config/examples/Mks/Robin_Lite3/Configuration.h +++ b/config/examples/Mks/Robin_Lite3/Configuration.h @@ -1964,6 +1964,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Mks/Robin_Pro/Configuration.h b/config/examples/Mks/Robin_Pro/Configuration.h index 987023b17225..7c96eadfe985 100644 --- a/config/examples/Mks/Robin_Pro/Configuration.h +++ b/config/examples/Mks/Robin_Pro/Configuration.h @@ -1963,6 +1963,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Mks/Sbase/Configuration.h b/config/examples/Mks/Sbase/Configuration.h index e27654746360..45d33ad475bb 100644 --- a/config/examples/Mks/Sbase/Configuration.h +++ b/config/examples/Mks/Sbase/Configuration.h @@ -1956,6 +1956,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Modix/Big60/Configuration.h b/config/examples/Modix/Big60/Configuration.h index 5b5122b790a5..265bd2a89be3 100644 --- a/config/examples/Modix/Big60/Configuration.h +++ b/config/examples/Modix/Big60/Configuration.h @@ -1956,6 +1956,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Printrbot/PrintrboardG2/Configuration.h b/config/examples/Printrbot/PrintrboardG2/Configuration.h index de8355b4756d..201ecb454edb 100644 --- a/config/examples/Printrbot/PrintrboardG2/Configuration.h +++ b/config/examples/Printrbot/PrintrboardG2/Configuration.h @@ -1962,6 +1962,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/RapideLite/RL200/Configuration.h b/config/examples/RapideLite/RL200/Configuration.h index e83e9d3ba438..8b2950704751 100644 --- a/config/examples/RapideLite/RL200/Configuration.h +++ b/config/examples/RapideLite/RL200/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Renkforce/RF100/Configuration.h b/config/examples/Renkforce/RF100/Configuration.h index 0f75e80ef856..761b5141e734 100644 --- a/config/examples/Renkforce/RF100/Configuration.h +++ b/config/examples/Renkforce/RF100/Configuration.h @@ -1965,6 +1965,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Renkforce/RF100XL/Configuration.h b/config/examples/Renkforce/RF100XL/Configuration.h index cc034ac75403..093bb70d01bc 100644 --- a/config/examples/Renkforce/RF100XL/Configuration.h +++ b/config/examples/Renkforce/RF100XL/Configuration.h @@ -1965,6 +1965,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Renkforce/RF100v2/Configuration.h b/config/examples/Renkforce/RF100v2/Configuration.h index 3a86b0bde892..fe43bf393908 100644 --- a/config/examples/Renkforce/RF100v2/Configuration.h +++ b/config/examples/Renkforce/RF100v2/Configuration.h @@ -1965,6 +1965,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/RepRapPro/Huxley/Configuration.h b/config/examples/RepRapPro/Huxley/Configuration.h index 97faab78f2dc..556cbdf1b736 100644 --- a/config/examples/RepRapPro/Huxley/Configuration.h +++ b/config/examples/RepRapPro/Huxley/Configuration.h @@ -2006,6 +2006,11 @@ Black rubber belt(MXL), 18 - tooth aluminium pulley : 87.489 step per mm (Huxley // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/RepRapWorld/Megatronics/Configuration.h b/config/examples/RepRapWorld/Megatronics/Configuration.h index 300098a0ba0a..b4fcfbe7efd5 100644 --- a/config/examples/RepRapWorld/Megatronics/Configuration.h +++ b/config/examples/RepRapWorld/Megatronics/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/RigidBot/Configuration.h b/config/examples/RigidBot/Configuration.h index 662d64a62878..c128c4bd1a0b 100644 --- a/config/examples/RigidBot/Configuration.h +++ b/config/examples/RigidBot/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/SCARA/MP_SCARA/Configuration.h b/config/examples/SCARA/MP_SCARA/Configuration.h index 501f423c5212..481931ceec65 100644 --- a/config/examples/SCARA/MP_SCARA/Configuration.h +++ b/config/examples/SCARA/MP_SCARA/Configuration.h @@ -1991,6 +1991,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/SCARA/Morgan/Configuration.h b/config/examples/SCARA/Morgan/Configuration.h index e3fef4535f23..17b9a837dcd6 100644 --- a/config/examples/SCARA/Morgan/Configuration.h +++ b/config/examples/SCARA/Morgan/Configuration.h @@ -1979,6 +1979,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/STM32/Black_STM32F407VET6/Configuration.h b/config/examples/STM32/Black_STM32F407VET6/Configuration.h index 36dec613d48a..d99df3ab945d 100644 --- a/config/examples/STM32/Black_STM32F407VET6/Configuration.h +++ b/config/examples/STM32/Black_STM32F407VET6/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/STM32/STM32F103RE/Configuration.h b/config/examples/STM32/STM32F103RE/Configuration.h index 5faebd9378f7..c6ff3bf84b8f 100644 --- a/config/examples/STM32/STM32F103RE/Configuration.h +++ b/config/examples/STM32/STM32F103RE/Configuration.h @@ -1959,6 +1959,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/STM32/STM32F4/Configuration.h b/config/examples/STM32/STM32F4/Configuration.h index 06f94ba678e6..f1891656b0b1 100644 --- a/config/examples/STM32/STM32F4/Configuration.h +++ b/config/examples/STM32/STM32F4/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/STM32/stm32f103ret6/Configuration.h b/config/examples/STM32/stm32f103ret6/Configuration.h index e9ddec40c2a1..050b62fcb5e5 100644 --- a/config/examples/STM32/stm32f103ret6/Configuration.h +++ b/config/examples/STM32/stm32f103ret6/Configuration.h @@ -1959,6 +1959,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Sanguinololu/Configuration.h b/config/examples/Sanguinololu/Configuration.h index 6cbe8444d44a..c9b13af47fbc 100644 --- a/config/examples/Sanguinololu/Configuration.h +++ b/config/examples/Sanguinololu/Configuration.h @@ -1988,6 +1988,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Tevo/Michelangelo/Configuration.h b/config/examples/Tevo/Michelangelo/Configuration.h index d46f12241c83..9fe657810f84 100644 --- a/config/examples/Tevo/Michelangelo/Configuration.h +++ b/config/examples/Tevo/Michelangelo/Configuration.h @@ -1962,6 +1962,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Tevo/Nereus/Configuration.h b/config/examples/Tevo/Nereus/Configuration.h index 60453c4fc36a..d6967756274e 100755 --- a/config/examples/Tevo/Nereus/Configuration.h +++ b/config/examples/Tevo/Nereus/Configuration.h @@ -1941,6 +1941,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Tevo/Tarantula Pro/Configuration.h b/config/examples/Tevo/Tarantula Pro/Configuration.h index 445bd31658f5..f0e7424b1ec2 100644 --- a/config/examples/Tevo/Tarantula Pro/Configuration.h +++ b/config/examples/Tevo/Tarantula Pro/Configuration.h @@ -1962,6 +1962,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Tevo/Tornado/V1 (MKS Base)/Configuration.h b/config/examples/Tevo/Tornado/V1 (MKS Base)/Configuration.h index fc0e16ea35df..ca23e8f0b775 100644 --- a/config/examples/Tevo/Tornado/V1 (MKS Base)/Configuration.h +++ b/config/examples/Tevo/Tornado/V1 (MKS Base)/Configuration.h @@ -1962,6 +1962,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Tevo/Tornado/V2 (MKS GEN-L)/Configuration.h b/config/examples/Tevo/Tornado/V2 (MKS GEN-L)/Configuration.h index b3b6674c9763..ce6621f30a67 100644 --- a/config/examples/Tevo/Tornado/V2 (MKS GEN-L)/Configuration.h +++ b/config/examples/Tevo/Tornado/V2 (MKS GEN-L)/Configuration.h @@ -1962,6 +1962,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/TheBorg/Configuration.h b/config/examples/TheBorg/Configuration.h index 1343f7c980c1..4a26fa30c529 100644 --- a/config/examples/TheBorg/Configuration.h +++ b/config/examples/TheBorg/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/TinyBoy2/Configuration.h b/config/examples/TinyBoy2/Configuration.h index 5b22f8246542..d1bbd3489b8b 100644 --- a/config/examples/TinyBoy2/Configuration.h +++ b/config/examples/TinyBoy2/Configuration.h @@ -2013,6 +2013,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Tronxy/X1/Configuration.h b/config/examples/Tronxy/X1/Configuration.h index 8f441eabd9a3..275486ad9722 100644 --- a/config/examples/Tronxy/X1/Configuration.h +++ b/config/examples/Tronxy/X1/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Tronxy/X3A/Configuration.h b/config/examples/Tronxy/X3A/Configuration.h index 7dcafa509c1e..8e5167df17b9 100644 --- a/config/examples/Tronxy/X3A/Configuration.h +++ b/config/examples/Tronxy/X3A/Configuration.h @@ -1961,6 +1961,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Tronxy/X5S-2E/Configuration.h b/config/examples/Tronxy/X5S-2E/Configuration.h index ec15e440be45..f7a28972c517 100644 --- a/config/examples/Tronxy/X5S-2E/Configuration.h +++ b/config/examples/Tronxy/X5S-2E/Configuration.h @@ -1978,6 +1978,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Tronxy/X5S/Configuration.h b/config/examples/Tronxy/X5S/Configuration.h index bee413732564..127b0223e804 100644 --- a/config/examples/Tronxy/X5S/Configuration.h +++ b/config/examples/Tronxy/X5S/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Tronxy/XY100/Configuration.h b/config/examples/Tronxy/XY100/Configuration.h index 29c90326b75a..2d8a4727267e 100644 --- a/config/examples/Tronxy/XY100/Configuration.h +++ b/config/examples/Tronxy/XY100/Configuration.h @@ -1968,6 +1968,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/UltiMachine/Archim1/Configuration.h b/config/examples/UltiMachine/Archim1/Configuration.h index 8183ac02490f..7948ee3e6734 100644 --- a/config/examples/UltiMachine/Archim1/Configuration.h +++ b/config/examples/UltiMachine/Archim1/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/UltiMachine/Archim2/Configuration.h b/config/examples/UltiMachine/Archim2/Configuration.h index 2500e534a768..497aeefd80b5 100644 --- a/config/examples/UltiMachine/Archim2/Configuration.h +++ b/config/examples/UltiMachine/Archim2/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/VORONDesign/Configuration.h b/config/examples/VORONDesign/Configuration.h index 1b505bb90b2b..21b2c73fbd58 100644 --- a/config/examples/VORONDesign/Configuration.h +++ b/config/examples/VORONDesign/Configuration.h @@ -1966,6 +1966,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Velleman/K8200/Configuration.h b/config/examples/Velleman/K8200/Configuration.h index c71828697b72..87d709b994a7 100644 --- a/config/examples/Velleman/K8200/Configuration.h +++ b/config/examples/Velleman/K8200/Configuration.h @@ -1990,6 +1990,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Velleman/K8400/Dual-head/Configuration.h b/config/examples/Velleman/K8400/Dual-head/Configuration.h index 94f5dde2dc6a..52eaa0ba2b08 100644 --- a/config/examples/Velleman/K8400/Dual-head/Configuration.h +++ b/config/examples/Velleman/K8400/Dual-head/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Velleman/K8400/Single-head/Configuration.h b/config/examples/Velleman/K8400/Single-head/Configuration.h index 5615f51f2b8e..e9f245548a7e 100644 --- a/config/examples/Velleman/K8400/Single-head/Configuration.h +++ b/config/examples/Velleman/K8400/Single-head/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/WASP/PowerWASP/Configuration.h b/config/examples/WASP/PowerWASP/Configuration.h index c063560aff0c..d1c7efb8be8d 100644 --- a/config/examples/WASP/PowerWASP/Configuration.h +++ b/config/examples/WASP/PowerWASP/Configuration.h @@ -1976,6 +1976,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Wanhao/Duplicator 6/Configuration.h b/config/examples/Wanhao/Duplicator 6/Configuration.h index ec7bef9f5a86..3e65688f703d 100644 --- a/config/examples/Wanhao/Duplicator 6/Configuration.h +++ b/config/examples/Wanhao/Duplicator 6/Configuration.h @@ -1967,6 +1967,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Wanhao/Duplicator i3 2.1/Configuration.h b/config/examples/Wanhao/Duplicator i3 2.1/Configuration.h index 4bbecf904328..924534778c51 100644 --- a/config/examples/Wanhao/Duplicator i3 2.1/Configuration.h +++ b/config/examples/Wanhao/Duplicator i3 2.1/Configuration.h @@ -1968,6 +1968,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Wanhao/Duplicator i3 Mini/Configuration.h b/config/examples/Wanhao/Duplicator i3 Mini/Configuration.h index 776a004da848..b13e2f917d19 100755 --- a/config/examples/Wanhao/Duplicator i3 Mini/Configuration.h +++ b/config/examples/Wanhao/Duplicator i3 Mini/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/adafruit/ST7565/Configuration.h b/config/examples/adafruit/ST7565/Configuration.h index 81e22a0a563e..8090265ca08f 100644 --- a/config/examples/adafruit/ST7565/Configuration.h +++ b/config/examples/adafruit/ST7565/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/delta/Anycubic/Kossel/Configuration.h b/config/examples/delta/Anycubic/Kossel/Configuration.h index 8d86f8b27bdf..17655b7c4fdc 100644 --- a/config/examples/delta/Anycubic/Kossel/Configuration.h +++ b/config/examples/delta/Anycubic/Kossel/Configuration.h @@ -2125,6 +2125,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/delta/Dreammaker/Overlord/Configuration.h b/config/examples/delta/Dreammaker/Overlord/Configuration.h index 56bed9f6e8a9..bc468675f416 100644 --- a/config/examples/delta/Dreammaker/Overlord/Configuration.h +++ b/config/examples/delta/Dreammaker/Overlord/Configuration.h @@ -2064,6 +2064,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/delta/Dreammaker/Overlord_Pro/Configuration.h b/config/examples/delta/Dreammaker/Overlord_Pro/Configuration.h index 07cb576491fb..9baa17557985 100644 --- a/config/examples/delta/Dreammaker/Overlord_Pro/Configuration.h +++ b/config/examples/delta/Dreammaker/Overlord_Pro/Configuration.h @@ -2075,6 +2075,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/delta/FLSUN/QQ-S/Configuration.h b/config/examples/delta/FLSUN/QQ-S/Configuration.h index dfb20aef5888..661d22f3e6a3 100644 --- a/config/examples/delta/FLSUN/QQ-S/Configuration.h +++ b/config/examples/delta/FLSUN/QQ-S/Configuration.h @@ -2067,6 +2067,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/delta/FLSUN/auto_calibrate/Configuration.h b/config/examples/delta/FLSUN/auto_calibrate/Configuration.h index d7ce839a94c9..5981959accf8 100644 --- a/config/examples/delta/FLSUN/auto_calibrate/Configuration.h +++ b/config/examples/delta/FLSUN/auto_calibrate/Configuration.h @@ -2069,6 +2069,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/delta/FLSUN/kossel/Configuration.h b/config/examples/delta/FLSUN/kossel/Configuration.h index d222ab463a8a..9c83d854bff6 100644 --- a/config/examples/delta/FLSUN/kossel/Configuration.h +++ b/config/examples/delta/FLSUN/kossel/Configuration.h @@ -2068,6 +2068,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/delta/FLSUN/kossel_mini/Configuration.h b/config/examples/delta/FLSUN/kossel_mini/Configuration.h index 4dfbb1aab6f0..9a9fa193b0c9 100644 --- a/config/examples/delta/FLSUN/kossel_mini/Configuration.h +++ b/config/examples/delta/FLSUN/kossel_mini/Configuration.h @@ -2068,6 +2068,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/delta/Geeetech/Rostock 301/Configuration.h b/config/examples/delta/Geeetech/Rostock 301/Configuration.h index dbdfdc7eb1f6..70f4a843883e 100644 --- a/config/examples/delta/Geeetech/Rostock 301/Configuration.h +++ b/config/examples/delta/Geeetech/Rostock 301/Configuration.h @@ -2057,6 +2057,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/delta/Hatchbox_Alpha/Configuration.h b/config/examples/delta/Hatchbox_Alpha/Configuration.h index 6780f2928b91..f73db4676685 100644 --- a/config/examples/delta/Hatchbox_Alpha/Configuration.h +++ b/config/examples/delta/Hatchbox_Alpha/Configuration.h @@ -2084,6 +2084,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/delta/MKS/SBASE/Configuration.h b/config/examples/delta/MKS/SBASE/Configuration.h index b3b0d80af779..6b8d3f7c0b57 100644 --- a/config/examples/delta/MKS/SBASE/Configuration.h +++ b/config/examples/delta/MKS/SBASE/Configuration.h @@ -2055,6 +2055,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/delta/Tevo Little Monster/Configuration.h b/config/examples/delta/Tevo Little Monster/Configuration.h index ecf4cb147eec..80d9dd424602 100644 --- a/config/examples/delta/Tevo Little Monster/Configuration.h +++ b/config/examples/delta/Tevo Little Monster/Configuration.h @@ -2060,6 +2060,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/delta/generic/Configuration.h b/config/examples/delta/generic/Configuration.h index df65319cf1c5..a97db154d023 100644 --- a/config/examples/delta/generic/Configuration.h +++ b/config/examples/delta/generic/Configuration.h @@ -2056,6 +2056,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/delta/kossel_clear/Configuration.h b/config/examples/delta/kossel_clear/Configuration.h index f6fb09d207ce..2db05a955c29 100644 --- a/config/examples/delta/kossel_clear/Configuration.h +++ b/config/examples/delta/kossel_clear/Configuration.h @@ -2062,6 +2062,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/delta/kossel_mini/Configuration.h b/config/examples/delta/kossel_mini/Configuration.h index 7b6338aa8d91..2c30be0988b2 100644 --- a/config/examples/delta/kossel_mini/Configuration.h +++ b/config/examples/delta/kossel_mini/Configuration.h @@ -2058,6 +2058,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/delta/kossel_pro/Configuration.h b/config/examples/delta/kossel_pro/Configuration.h index eaf46fc3899b..9e46ce340a1d 100644 --- a/config/examples/delta/kossel_pro/Configuration.h +++ b/config/examples/delta/kossel_pro/Configuration.h @@ -2058,6 +2058,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/delta/kossel_xl/Configuration.h b/config/examples/delta/kossel_xl/Configuration.h index 9119419e4f7a..68b59f614de2 100644 --- a/config/examples/delta/kossel_xl/Configuration.h +++ b/config/examples/delta/kossel_xl/Configuration.h @@ -2059,6 +2059,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/gCreate/gMax1.5+/Configuration.h b/config/examples/gCreate/gMax1.5+/Configuration.h index 582380638006..692db8d47a5e 100644 --- a/config/examples/gCreate/gMax1.5+/Configuration.h +++ b/config/examples/gCreate/gMax1.5+/Configuration.h @@ -1984,6 +1984,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/makibox/Configuration.h b/config/examples/makibox/Configuration.h index 9bb50e352ead..3e24b4c14049 100644 --- a/config/examples/makibox/Configuration.h +++ b/config/examples/makibox/Configuration.h @@ -1960,6 +1960,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/tvrrug/Round2/Configuration.h b/config/examples/tvrrug/Round2/Configuration.h index 60fea65b8af7..ec8150352b03 100644 --- a/config/examples/tvrrug/Round2/Configuration.h +++ b/config/examples/tvrrug/Round2/Configuration.h @@ -1952,6 +1952,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/wt150/Configuration.h b/config/examples/wt150/Configuration.h index 8b3c46f6651a..a776155ffb38 100644 --- a/config/examples/wt150/Configuration.h +++ b/config/examples/wt150/Configuration.h @@ -1962,6 +1962,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // From 524d54256034088e5112802f72fe3f2bb8ee7179 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 2 Jan 2020 22:07:59 -0600 Subject: [PATCH 4/5] Patch pins a bit... --- Marlin/src/pins/linux/pins_RAMPS_LINUX.h | 2 +- Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h | 2 +- Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h | 9 ++++++++- Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h | 2 +- Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h | 2 +- Marlin/src/pins/mega/pins_GT2560_REV_A.h | 2 +- Marlin/src/pins/ramps/pins_FYSETC_F6_13.h | 2 +- Marlin/src/pins/ramps/pins_RAMPS.h | 2 +- Marlin/src/pins/ramps/pins_TT_OSCAR.h | 2 +- Marlin/src/pins/sam/pins_RURAMPS4D_13.h | 2 +- Marlin/src/pins/stm32/pins_ARMED.h | 2 +- Marlin/src/pins/stm32/pins_FYSETC_S6.h | 2 +- Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE.h | 2 +- Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE3.h | 2 +- Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h | 2 +- 15 files changed, 22 insertions(+), 15 deletions(-) diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h index f07f8158e59a..2cb6fb597b54 100644 --- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h +++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h @@ -529,7 +529,7 @@ #define SD_DETECT_PIN 49 #define KILL_PIN 41 - #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) + #elif ENABLED(MKS_MINI_12864) #define DOGLCD_A0 27 #define DOGLCD_CS 25 diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h index 0cb24292497d..abf5e821caa3 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h @@ -77,7 +77,7 @@ #define LCD_PINS_ENABLE P0_18 #define LCD_PINS_D4 P0_15 - #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) + #if ENABLED(MKS_MINI_12864) #define DOGLCD_CS P2_06 #define DOGLCD_A0 P0_16 #endif diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h index 926f64447d17..9b0ff5293af3 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h @@ -270,7 +270,14 @@ #else // !FYSETC_MINI_12864 - #if ENABLED(ENDER2_STOCKDISPLAY) + #if ENABLED(MKS_MINI_12864) + + #define DOGLCD_CS P1_21 + #define DOGLCD_A0 P1_22 + #define DOGLCD_SCK P0_15 + #define DOGLCD_MOSI P0_18 + + #elif ENABLED(ENDER2_STOCKDISPLAY) /** * Creality Ender-2 display pinout diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h index e0aefabf2bbc..8e2a0cec231a 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h @@ -246,7 +246,7 @@ #else // !FYSETC_MINI_12864 - #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) + #if ENABLED(MKS_MINI_12864) #define DOGLCD_CS P1_21 #define DOGLCD_A0 P1_22 #define DOGLCD_SCK P0_15 diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h index c62620c4a58d..a47e9e038326 100644 --- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h +++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h @@ -266,7 +266,7 @@ #else // !FYSETC_MINI_12864 - #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) + #if ENABLED(MKS_MINI_12864) #define DOGLCD_CS P0_17 #define DOGLCD_A0 P1_00 #endif diff --git a/Marlin/src/pins/mega/pins_GT2560_REV_A.h b/Marlin/src/pins/mega/pins_GT2560_REV_A.h index adecc5f7037a..16bd5688df53 100644 --- a/Marlin/src/pins/mega/pins_GT2560_REV_A.h +++ b/Marlin/src/pins/mega/pins_GT2560_REV_A.h @@ -101,7 +101,7 @@ #if ENABLED(NEWPANEL) - #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) + #if ENABLED(MKS_MINI_12864) #define DOGLCD_A0 5 #define DOGLCD_CS 21 #define BTN_EN1 40 diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h index ea3ae0a31c29..4c6f59aaae8a 100644 --- a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h +++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h @@ -254,7 +254,7 @@ #define LCD_PINS_D6 27 #define LCD_PINS_D7 29 - #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) + #if ENABLED(MKS_MINI_12864) #define DOGLCD_CS 25 #define DOGLCD_A0 27 #endif diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h index 2651b34d6e76..676197b84d0c 100644 --- a/Marlin/src/pins/ramps/pins_RAMPS.h +++ b/Marlin/src/pins/ramps/pins_RAMPS.h @@ -581,7 +581,7 @@ #define KILL_PIN 41 #endif - #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) // Added in Marlin 1.1.6 + #if ENABLED(MKS_MINI_12864) // Added in Marlin 1.1.6 #define DOGLCD_A0 27 #define DOGLCD_CS 25 diff --git a/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin/src/pins/ramps/pins_TT_OSCAR.h index 8311013b4cfc..1c40729a8788 100644 --- a/Marlin/src/pins/ramps/pins_TT_OSCAR.h +++ b/Marlin/src/pins/ramps/pins_TT_OSCAR.h @@ -430,7 +430,7 @@ #define SD_DETECT_PIN 49 //#define KILL_PIN 41 - #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) + #elif ENABLED(MKS_MINI_12864) #define DOGLCD_A0 27 #define DOGLCD_CS 25 diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h index 7a69e05a8ec8..c8ff71673bf3 100644 --- a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h +++ b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h @@ -238,7 +238,7 @@ #define NEOPIXEL_PIN 50 // D5 #endif - #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) + #elif ENABLED(MKS_MINI_12864) #define ORIG_BEEPER_PIN 62 diff --git a/Marlin/src/pins/stm32/pins_ARMED.h b/Marlin/src/pins/stm32/pins_ARMED.h index 916477ef8779..495654a82cbf 100644 --- a/Marlin/src/pins/stm32/pins_ARMED.h +++ b/Marlin/src/pins/stm32/pins_ARMED.h @@ -173,7 +173,7 @@ #define LCD_PINS_D6 PB14 #define LCD_PINS_D7 PB15 - #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) + #if ENABLED(MKS_MINI_12864) #define DOGLCD_CS PB13 #define DOGLCD_A0 PB14 #endif diff --git a/Marlin/src/pins/stm32/pins_FYSETC_S6.h b/Marlin/src/pins/stm32/pins_FYSETC_S6.h index 99bb058fe938..227fe4cd559e 100644 --- a/Marlin/src/pins/stm32/pins_FYSETC_S6.h +++ b/Marlin/src/pins/stm32/pins_FYSETC_S6.h @@ -198,7 +198,7 @@ #define LCD_PINS_D6 PD0 #define LCD_PINS_D7 PD1 - #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) + #if ENABLED(MKS_MINI_12864) #define DOGLCD_CS PC12 #define DOGLCD_A0 PD0 #endif diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE.h index e6b41d9e5f0f..c86b62cddd0c 100644 --- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE.h +++ b/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE.h @@ -91,7 +91,7 @@ #define LCD_PINS_ENABLE PC2 - #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) + #if ENABLED(MKS_MINI_12864) #define LCD_BACKLIGHT_PIN -1 #define LCD_RESET_PIN -1 diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE3.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE3.h index ee128d0317c5..6d6787903b70 100644 --- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE3.h +++ b/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE3.h @@ -106,7 +106,7 @@ #define BTN_EN2 PB0 // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor) - #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) + #if ENABLED(MKS_MINI_12864) #define LCD_BACKLIGHT_PIN -1 #define LCD_RESET_PIN -1 diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h index 75ebc0033fd1..d080e907444b 100644 --- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h +++ b/Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h @@ -242,7 +242,7 @@ #define BTN_EN2 PG4 // MKS MINI12864 and MKS LCD12864B. If using MKS LCD12864A (Need to remove RPK2 resistor) - #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) + #if ENABLED(MKS_MINI_12864) #define LCD_BACKLIGHT_PIN -1 #define LCD_RESET_PIN -1 From ca6c24cc22dc37af8b283be384bc267c42c8cd4d Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jan 2020 20:43:30 -0600 Subject: [PATCH 5/5] More configs --- config/examples/Anet/E10/Configuration.h | 5 +++++ config/examples/Artillery/Genius/Configuration.h | 5 +++++ config/examples/Geeetech/D200/Configuration.h | 5 +++++ config/examples/Geeetech/M201/Configuration.h | 5 +++++ config/examples/JGAurora/Magic/Configuration.h | 5 +++++ config/examples/MakerFarm/Pegasus_12/Configuration.h | 5 +++++ 6 files changed, 30 insertions(+) diff --git a/config/examples/Anet/E10/Configuration.h b/config/examples/Anet/E10/Configuration.h index 6a5363f73a39..d1d58b565d14 100644 --- a/config/examples/Anet/E10/Configuration.h +++ b/config/examples/Anet/E10/Configuration.h @@ -1960,6 +1960,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Artillery/Genius/Configuration.h b/config/examples/Artillery/Genius/Configuration.h index 57c9169f04f2..1609cefb7eed 100644 --- a/config/examples/Artillery/Genius/Configuration.h +++ b/config/examples/Artillery/Genius/Configuration.h @@ -1940,6 +1940,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Geeetech/D200/Configuration.h b/config/examples/Geeetech/D200/Configuration.h index 7f106251bd4b..520096e18217 100644 --- a/config/examples/Geeetech/D200/Configuration.h +++ b/config/examples/Geeetech/D200/Configuration.h @@ -1945,6 +1945,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/Geeetech/M201/Configuration.h b/config/examples/Geeetech/M201/Configuration.h index 4116bb1408ec..9cb24191eef5 100644 --- a/config/examples/Geeetech/M201/Configuration.h +++ b/config/examples/Geeetech/M201/Configuration.h @@ -1945,6 +1945,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/JGAurora/Magic/Configuration.h b/config/examples/JGAurora/Magic/Configuration.h index 757a2fea68eb..81e5fbafbded 100644 --- a/config/examples/JGAurora/Magic/Configuration.h +++ b/config/examples/JGAurora/Magic/Configuration.h @@ -1957,6 +1957,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller // diff --git a/config/examples/MakerFarm/Pegasus_12/Configuration.h b/config/examples/MakerFarm/Pegasus_12/Configuration.h index 906546f9fb95..c97b699c0d28 100644 --- a/config/examples/MakerFarm/Pegasus_12/Configuration.h +++ b/config/examples/MakerFarm/Pegasus_12/Configuration.h @@ -1962,6 +1962,11 @@ // //#define CR10_STOCKDISPLAY +// +// Ender-2 OEM display, a variant of the MKS_MINI_12864 +// +//#define ENDER2_STOCKDISPLAY + // // ANET and Tronxy Graphical Controller //