Fix Ender-2 display pins, add BTN_ENC (#16349)

This commit is contained in:
greppp 2020-01-03 21:44:16 -05:00 committed by Scott Lahteine
parent b841b9bd01
commit 7f87a044cd
165 changed files with 807 additions and 17 deletions

View File

@ -1957,6 +1957,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -110,7 +110,7 @@
#define IS_RRD_SC #define IS_RRD_SC
#define IS_U8GLIB_SSD1306 #define IS_U8GLIB_SSD1306
#elif ENABLED(MKS_MINI_12864) #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
#define MINIPANEL #define MINIPANEL

View File

@ -259,7 +259,7 @@
#elif ENABLED(MKS_LCD12864B) #elif ENABLED(MKS_LCD12864B)
#define _LCD_CONTRAST_MIN 120 #define _LCD_CONTRAST_MIN 120
#define _LCD_CONTRAST_INIT 205 #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_MIN 120
#define _LCD_CONTRAST_INIT 195 #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) #elif ANY(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1)

View File

@ -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(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(IS_RRD_FG_SC)) \
+ (ENABLED(ULTRA_LCD) && DISABLED(IS_ULTRA_LCD)) \ + (ENABLED(ULTRA_LCD) && DISABLED(IS_ULTRA_LCD)) \
+ (ENABLED(U8GLIB_SSD1306) && DISABLED(IS_U8GLIB_SSD1306)) \ + (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(REPRAPWORLD_KEYPAD) && DISABLED(IS_RRW_KEYPAD)) \
+ (ENABLED(EXTENSIBLE_UI) && DISABLED(IS_EXTUI)) \ + (ENABLED(EXTENSIBLE_UI) && DISABLED(IS_EXTUI)) \
+ (ENABLED(ULTIPANEL) && DISABLED(IS_ULTIPANEL)) \ + (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(LCD_FOR_MELZI) \
+ ENABLED(ULTI_CONTROLLER) \ + ENABLED(ULTI_CONTROLLER) \
+ ENABLED(MKS_MINI_12864) \ + ENABLED(MKS_MINI_12864) \
+ ENABLED(ENDER2_STOCKDISPLAY) \
+ ENABLED(FYSETC_MINI_12864_X_X) \ + ENABLED(FYSETC_MINI_12864_X_X) \
+ ENABLED(FYSETC_MINI_12864_1_2) \ + ENABLED(FYSETC_MINI_12864_1_2) \
+ ENABLED(FYSETC_MINI_12864_2_0) \ + ENABLED(FYSETC_MINI_12864_2_0) \

View File

@ -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 = { static const uint8_t u8g_dev_uc1701_mini12864_HAL_data_start[] PROGMEM = {
U8G_ESC_ADR(0), // instruction mode U8G_ESC_ADR(0), // instruction mode
U8G_ESC_CS(1), // enable chip 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_START_LINE(0), // set display start line to 0
UC1701_ADC_REVERSE(0), // ADC set to reverse UC1701_ADC_REVERSE(0), // ADC set to reverse
UC1701_OUT_MODE(1), // common output mode UC1701_OUT_MODE(1), // common output mode

View File

@ -147,7 +147,7 @@
#define U8G_CLASS U8GLIB_MINI12864_2X_HAL // 4 stripes #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. // The MKS_MINI_12864 V1/V2 aren't exact copies of the MiniPanel.
// Panel management is in u8g_dev_uc1701_mini12864_HAL.cpp with // Panel management is in u8g_dev_uc1701_mini12864_HAL.cpp with

View File

@ -529,7 +529,7 @@
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#define KILL_PIN 41 #define KILL_PIN 41
#elif ENABLED(MKS_MINI_12864) // Added in Marlin 1.1.6 #elif ENABLED(MKS_MINI_12864)
#define DOGLCD_A0 27 #define DOGLCD_A0 27
#define DOGLCD_CS 25 #define DOGLCD_CS 25

View File

@ -90,7 +90,7 @@
// requires jumpers on the SKR V1.1 board as documented here: // requires jumpers on the SKR V1.1 board as documented here:
// https://www.facebook.com/groups/505736576548648/permalink/630639874058317/ // https://www.facebook.com/groups/505736576548648/permalink/630639874058317/
#ifndef SDCARD_CONNECTION #ifndef SDCARD_CONNECTION
#if ENABLED(MKS_MINI_12864) #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
#define SDCARD_CONNECTION LCD #define SDCARD_CONNECTION LCD
#else #else
#define SDCARD_CONNECTION ONBOARD #define SDCARD_CONNECTION ONBOARD

View File

@ -271,11 +271,35 @@
#else // !FYSETC_MINI_12864 #else // !FYSETC_MINI_12864
#if ENABLED(MKS_MINI_12864) #if ENABLED(MKS_MINI_12864)
#define DOGLCD_CS P1_21 #define DOGLCD_CS P1_21
#define DOGLCD_A0 P1_22 #define DOGLCD_A0 P1_22
#define DOGLCD_SCK P0_15 #define DOGLCD_SCK P0_15
#define DOGLCD_MOSI P0_18 #define DOGLCD_MOSI P0_18
#elif 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
#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 FORCE_SOFT_SPI
#define LCD_BACKLIGHT_PIN -1
#endif #endif
#if ENABLED(ULTIPANEL) #if ENABLED(ULTIPANEL)

View File

@ -35,9 +35,9 @@
#include "pins_MELZI.h" #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 LCD_SDSS
#undef LED_PIN #undef LED_PIN
#undef LCD_PINS_RS #undef LCD_PINS_RS

View File

@ -185,7 +185,7 @@
#define LCD_PINS_ENABLE PB7 #define LCD_PINS_ENABLE PB7
#define LCD_PINS_D4 PB9 #define LCD_PINS_D4 PB9
#elif ENABLED(MKS_MINI_12864) #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
/** Creality Ender-2 display pinout /** Creality Ender-2 display pinout
* _____ * _____

View File

@ -138,7 +138,7 @@
#define LCD_PINS_D7 PB5 #define LCD_PINS_D7 PB5
#define ADC_KEYPAD_PIN PA1 // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD! #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 /** Creality Ender-2 display pinout
* _____ * _____
@ -163,7 +163,7 @@
#else #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 #endif

View File

@ -251,7 +251,7 @@
#define DOGLCD_SCK PB13 #define DOGLCD_SCK PB13
#define DOGLCD_MOSI PB15 #define DOGLCD_MOSI PB15
#else // !MKS_MINI_12864 #else // !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY
#define LCD_PINS_D4 PF14 #define LCD_PINS_D4 PF14
#if ENABLED(ULTIPANEL) #if ENABLED(ULTIPANEL)
@ -260,7 +260,7 @@
#define LCD_PINS_D7 PF13 #define LCD_PINS_D7 PF13
#endif #endif
#endif // !MKS_MINI_12864 #endif // !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY
#endif #endif
#ifndef ST7920_DELAY_1 #ifndef ST7920_DELAY_1

View File

@ -1957,6 +1957,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1989,6 +1989,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1958,6 +1958,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1958,6 +1958,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1977,6 +1977,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -2037,6 +2037,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -2036,6 +2036,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1957,6 +1957,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1968,6 +1968,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1959,6 +1959,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1959,6 +1959,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -2074,6 +2074,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1985,6 +1985,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1968,6 +1968,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1960,6 +1960,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1969,6 +1969,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1967,6 +1967,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1958,6 +1958,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1940,6 +1940,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1962,6 +1962,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1957,6 +1957,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1957,6 +1957,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1957,6 +1957,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1945,6 +1945,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1958,6 +1958,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1945,6 +1945,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1949,6 +1949,11 @@
// //
#define CR10_STOCKDISPLAY #define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1950,6 +1950,11 @@
// //
#define CR10_STOCKDISPLAY #define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1956,6 +1956,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1967,6 +1967,11 @@
// //
#define CR10_STOCKDISPLAY #define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1958,6 +1958,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1960,6 +1960,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1976,6 +1976,11 @@
// //
#define CR10_STOCKDISPLAY #define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1961,6 +1961,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1961,6 +1961,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1967,6 +1967,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -147,7 +147,7 @@
#define EXTRUDERS 1 #define EXTRUDERS 1
// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc. // 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. // For Cyclops or any "multi-extruder" that shares a single nozzle.
//#define SINGLENOZZLE //#define SINGLENOZZLE
@ -1941,7 +1941,7 @@
// MKS MINI12864 with graphic controller and SD support // MKS MINI12864 with graphic controller and SD support
// https://reprap.org/wiki/MKS_MINI_12864 // 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 // FYSETC variant of the MINI12864 graphic controller with SD support
@ -1961,6 +1961,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1961,6 +1961,11 @@
// //
#define CR10_STOCKDISPLAY #define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1967,6 +1967,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1955,6 +1955,11 @@
// //
#define CR10_STOCKDISPLAY #define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1961,6 +1961,11 @@
// //
#define CR10_STOCKDISPLAY #define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1957,6 +1957,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1957,6 +1957,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1967,6 +1967,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1962,6 +1962,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1962,6 +1962,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1962,6 +1962,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1962,6 +1962,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1962,6 +1962,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1959,6 +1959,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1957,6 +1957,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1938,6 +1938,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1938,6 +1938,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1950,6 +1950,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1976,6 +1976,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -2076,6 +2076,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -2004,6 +2004,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1994,6 +1994,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1942,6 +1942,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1941,6 +1941,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1942,6 +1942,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1943,6 +1943,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1943,6 +1943,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1944,6 +1944,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1945,6 +1945,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1945,6 +1945,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1945,6 +1945,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1946,6 +1946,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1972,6 +1972,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1957,6 +1957,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1945,6 +1945,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1964,6 +1964,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1978,6 +1978,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1978,6 +1978,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1977,6 +1977,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1957,6 +1957,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1957,6 +1957,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1946,6 +1946,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1961,6 +1961,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1965,6 +1965,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1969,6 +1969,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1965,6 +1965,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1957,6 +1957,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1962,6 +1962,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1957,6 +1957,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1998,6 +1998,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

View File

@ -1967,6 +1967,11 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
//
//#define ENDER2_STOCKDISPLAY
// //
// ANET and Tronxy Graphical Controller // ANET and Tronxy Graphical Controller
// //

Some files were not shown because too many files have changed in this diff Show More