Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ENDER2_STOCKDISPLAY back as valid display for Melzi_CREALITY #25258

Merged
merged 10 commits into from
Jan 23, 2023
Merged

Add ENDER2_STOCKDISPLAY back as valid display for Melzi_CREALITY #25258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6c4046f
🎨 Rename *_temp_error to *temp_error
thinkyhead Jan 4, 2023
48f533e
[cron] Bump distribution date (2023-01-04)
thinkyhead Jan 4, 2023
f8283a4
🧑‍💻 Add Temperature::is_above_target
thinkyhead Jan 4, 2023
5eb2a87
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
Bob-the-Kuhn Jan 8, 2023
e9d6b56
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
Bob-the-Kuhn Jan 9, 2023
d16b1ba
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
Bob-the-Kuhn Jan 11, 2023
8b00f58
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
Bob-the-Kuhn Jan 20, 2023
31c6dfb
Update pins_MELZI_CREALITY.h
Bob-the-Kuhn Jan 20, 2023
3a7aa82
Merge branch 'bugfix-2.1.x' into pr/25258
thinkyhead Jan 22, 2023
d232720
ENDER2_STOCKDISPLAY is like MKS_MINI_12864
thinkyhead Jan 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,11 +358,11 @@
#define BEEPER_PIN EXP1_01_PIN

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

#define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 EXP1_05_PIN
#define BTN_ENC EXP1_02_PIN

#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_D4 EXP1_06_PIN
Expand Down
19 changes: 13 additions & 6 deletions Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,27 @@
#endif

//
// For the stock CR-10 enable CR10_STOCKDISPLAY in Configuration.h
// LCD / Controller
//
#if ENABLED(CR10_STOCKDISPLAY)
#define LCD_SDSS 31 // Smart Controller SD card reader (rather than the Melzi)
#define LCD_PINS_RS 28 // ST9720 CS
#define LCD_PINS_ENABLE 17 // ST9720 DAT
#define LCD_PINS_D4 30 // ST9720 CLK
#if ANY(MKS_MINI_12864, CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY)
#if ENABLED(CR10_STOCKDISPLAY)
#define LCD_PINS_RS 28 // ST9720 CS
#define LCD_PINS_ENABLE 17 // ST9720 DAT
#define LCD_PINS_D4 30 // ST9720 CLK
#elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
#define DOGLCD_CS 28
#define DOGLCD_A0 30
#endif

#define LCD_SDSS 31 // Controller's SD card

#define BTN_ENC 16
#define BTN_EN1 11
#define BTN_EN2 10
#define BEEPER_PIN 27

#define LCD_PINS_DEFINED

#endif

#include "pins_MELZI.h" // ... SANGUINOLOLU_12 ... SANGUINOLOLU_11
Expand Down