CR10_STOCKDISPLAY

MarlinFirmware · Jul 20, 2022 · c8c8e5c · c8c8e5c
1 parent fe19280
commit c8c8e5c
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 19 deletions.
diff --git a/Marlin/src/pins/lcd/CR10_STOCKDISPLAY.h b/Marlin/src/pins/lcd/CR10_STOCKDISPLAY.h
@@ -23,4 +23,29 @@
 
 /**
  * CR10_STOCKDISPLAY
+ * Creality CR-10 Stock Display
+ * Connected by a single 10-wire cable
  */
+
+// LCD interface
+#define LCD_PINS_RS                  EXP1_07_PIN
+#define LCD_PINS_ENABLE              EXP1_08_PIN
+#define LCD_PINS_D4                  EXP1_06_PIN
+
+// Beeper
+#define BEEPER_PIN                   EXP1_01_PIN
+
+// Encoder
+#define BTN_ENC                      EXP1_02_PIN
+#define BTN_EN1                      EXP1_03_PIN
+#define BTN_EN2                      EXP1_05_PIN
+
+// SD Detect
+#ifndef SD_DETECT_PIN
+  #define SD_DETECT_PIN              EXP2_07_PIN
+#endif
+
+// Kill
+#ifndef KILL_PIN
+  #define KILL_PIN                   EXP2_08_PIN
+#endif
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -630,13 +630,7 @@
 
     #if ENABLED(CR10_STOCKDISPLAY)
 
-      #define LCD_PINS_RS            EXP1_07_PIN
-      #define LCD_PINS_ENABLE        EXP1_08_PIN
-      #define LCD_PINS_D4            EXP1_06_PIN
-
-      #if !IS_NEWPANEL
-        #define BEEPER_PIN           EXP1_01_PIN
-      #endif
+      // Moved
 
     #elif ENABLED(ZONESTAR_LCD)
 
@@ -706,8 +700,7 @@
       #define BEEPER_PIN             EXP1_01_PIN
 
       #if ENABLED(CR10_STOCKDISPLAY)
-        #define BTN_EN1              EXP1_03_PIN
-        #define BTN_EN2              EXP1_05_PIN
+        // Moved
       #else
         #define BTN_EN1              EXP2_03_PIN
         #define BTN_EN2              EXP2_05_PIN

diff --git a/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
@@ -305,13 +305,10 @@
 
     #if ENABLED(CR10_STOCKDISPLAY)
 
-      #define LCD_PINS_RS                     27
-      #define LCD_PINS_ENABLE                 29
-      #define LCD_PINS_D4                     25
-
-      #if !IS_NEWPANEL
-        #define BEEPER_PIN                    37
-      #endif
+      #define EXP1_01_PIN                     37
+      #define EXP1_06_PIN                     25
+      #define EXP1_07_PIN                     27
+      #define EXP1_08_PIN                     29
 
     #else
 
@@ -364,14 +361,15 @@
       #define BEEPER_PIN                      37
 
       #if ENABLED(CR10_STOCKDISPLAY)
-        #define BTN_EN1                       17
-        #define BTN_EN2                       23
+        #define EXP1_02_PIN                   35  // ENC
+        #define EXP2_03_PIN                   17  // EN1
+        #define EXP2_05_PIN                   23  // EN2
       #else
+        #define BTN_ENC                       35
         #define BTN_EN1                       31
         #define BTN_EN2                       33
       #endif
 
-      #define BTN_ENC                         35
       #define SD_DETECT_PIN                   49
       //#define KILL_PIN                      41