🐛 Fix Ender-2 Stock Display with Melzi (MarlinFirmware#25258)

Andy-Big · Jul 9, 2023 · 67f0564 · 67f0564
1 parent 4793a85
commit 67f0564
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -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

diff --git a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
@@ -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