bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

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

@ -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)

3
Marlin/src/inc/SanityCheck.h
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(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) \

2
Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp
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 = {
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

2
Marlin/src/lcd/dogm/ultralcd_DOGM.h
View File

@ -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

2
Marlin/src/pins/linux/pins_RAMPS_LINUX.h
View File

@ -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 ENABLED(MKS_MINI_12864)
#define DOGLCD_A0 27
#define DOGLCD_CS 25

2
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
View File

@ -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

24
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
View File

@ -271,11 +271,35 @@
#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
#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 LCD_BACKLIGHT_PIN -1
#endif
#if ENABLED(ULTIPANEL)

6
Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
View File

@ -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

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

@ -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
* _____

4
Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h
View File

@ -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

4
Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h
View File

@ -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