Skip to content

Commit 3268897

Browse files
authored
🐛 Fix Ender-2 Stock Display with Melzi (MarlinFirmware#25258)
1 parent fffc966 commit 3268897

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -358,11 +358,11 @@
358358
#define BEEPER_PIN EXP1_01_PIN
359359

360360
#elif ENABLED(CR10_STOCKDISPLAY)
361-
#define BTN_ENC EXP1_02_PIN // (58) open-drain
362361
#define LCD_PINS_RS EXP1_07_PIN
363362

364363
#define BTN_EN1 EXP1_03_PIN
365364
#define BTN_EN2 EXP1_05_PIN
365+
#define BTN_ENC EXP1_02_PIN
366366

367367
#define LCD_PINS_ENABLE EXP1_08_PIN
368368
#define LCD_PINS_D4 EXP1_06_PIN

Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h

+13-6
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,27 @@
4343
#endif
4444

4545
//
46-
// For the stock CR-10 enable CR10_STOCKDISPLAY in Configuration.h
46+
// LCD / Controller
4747
//
48-
#if ENABLED(CR10_STOCKDISPLAY)
49-
#define LCD_SDSS 31 // Smart Controller SD card reader (rather than the Melzi)
50-
#define LCD_PINS_RS 28 // ST9720 CS
51-
#define LCD_PINS_ENABLE 17 // ST9720 DAT
52-
#define LCD_PINS_D4 30 // ST9720 CLK
48+
#if ANY(MKS_MINI_12864, CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY)
49+
#if ENABLED(CR10_STOCKDISPLAY)
50+
#define LCD_PINS_RS 28 // ST9720 CS
51+
#define LCD_PINS_ENABLE 17 // ST9720 DAT
52+
#define LCD_PINS_D4 30 // ST9720 CLK
53+
#elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
54+
#define DOGLCD_CS 28
55+
#define DOGLCD_A0 30
56+
#endif
57+
58+
#define LCD_SDSS 31 // Controller's SD card
5359

5460
#define BTN_ENC 16
5561
#define BTN_EN1 11
5662
#define BTN_EN2 10
5763
#define BEEPER_PIN 27
5864

5965
#define LCD_PINS_DEFINED
66+
6067
#endif
6168

6269
#include "pins_MELZI.h" // ... SANGUINOLOLU_12 ... SANGUINOLOLU_11

0 commit comments

Comments
 (0)