From 66338ed51553503e6db6ea6d9a738e65e1f18f8b Mon Sep 17 00:00:00 2001
From: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com>
Date: Mon, 9 Sep 2019 21:56:02 -0700
Subject: [PATCH] CR-10 Stock Display for SKR Mini 1.1 (#15215)

---
 .../pins/stm32/pins_BIGTREE_SKR_MINI_V1_1.h   | 74 +++++++++++--------
 1 file changed, 44 insertions(+), 30 deletions(-)

diff --git a/Marlin/src/pins/stm32/pins_BIGTREE_SKR_MINI_V1_1.h b/Marlin/src/pins/stm32/pins_BIGTREE_SKR_MINI_V1_1.h
index ffbb8b0432..181773c6b1 100644
--- a/Marlin/src/pins/stm32/pins_BIGTREE_SKR_MINI_V1_1.h
+++ b/Marlin/src/pins/stm32/pins_BIGTREE_SKR_MINI_V1_1.h
@@ -106,43 +106,55 @@
 #if HAS_SPI_LCD
   #define BEEPER_PIN       PC10
   #define BTN_ENC          PC11
-  #define LCD_PINS_RS      PC12
 
-  #define BTN_EN1          PD2
-  #define BTN_EN2          PB8
+  #if ENABLED(CR10_STOCKDISPLAY)
+    #define LCD_PINS_RS    PC15
 
-  #define LCD_PINS_ENABLE  PB6
+    #define BTN_EN1        PB6
+    #define BTN_EN2        PC13
 
-  #if ENABLED(FYSETC_MINI_12864)
+    #define LCD_PINS_ENABLE PC14
+    #define LCD_PINS_D4    PB7
 
-    #define LCD_BACKLIGHT_PIN -1
-    #define LCD_RESET_PIN  PC13
-    #define DOGLCD_A0      PC12
-    #define DOGLCD_CS      PB6
-    #define DOGLCD_SCK     PB3
-    #define DOGLCD_MOSI    PB5
+  #else
 
-    #define FORCE_SOFT_SPI   // SPI MODE3
+    #define LCD_PINS_RS      PC12
 
-    #define LED_PIN        PB7   // red pwm
-    //#define LED_PIN        PC15   // green
-    //#define LED_PIN        PC14   // blue
+    #define BTN_EN1          PD2
+    #define BTN_EN2          PB8
 
-    //#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
-    //  #ifndef RGB_LED_R_PIN
-    //    #define RGB_LED_R_PIN PB7
-    //  #endif
-    //  #ifndef RGB_LED_G_PIN
-    //    #define RGB_LED_G_PIN PC15
-    //  #endif
-    //  #ifndef RGB_LED_B_PIN
-    //    #define RGB_LED_B_PIN PC14
-    //  #endif
-    //#elif ENABLED(FYSETC_MINI_12864_2_1)
-    //  #define NEOPIXEL_PIN    PB7
-    //#endif
+    #define LCD_PINS_ENABLE  PB6
 
-  #else // !FYSETC_MINI_12864
+    #if ENABLED(FYSETC_MINI_12864)
+
+      #define LCD_BACKLIGHT_PIN -1
+      #define LCD_RESET_PIN  PC13
+      #define DOGLCD_A0      PC12
+      #define DOGLCD_CS      PB6
+      #define DOGLCD_SCK     PB3
+      #define DOGLCD_MOSI    PB5
+
+      #define FORCE_SOFT_SPI   // SPI MODE3
+
+      #define LED_PIN        PB7   // red pwm
+      //#define LED_PIN        PC15   // green
+      //#define LED_PIN        PC14   // blue
+
+      //#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
+      //  #ifndef RGB_LED_R_PIN
+      //    #define RGB_LED_R_PIN PB7
+      //  #endif
+      //  #ifndef RGB_LED_G_PIN
+      //    #define RGB_LED_G_PIN PC15
+      //  #endif
+      //  #ifndef RGB_LED_B_PIN
+      //    #define RGB_LED_B_PIN PC14
+      //  #endif
+      //#elif ENABLED(FYSETC_MINI_12864_2_1)
+      //  #define NEOPIXEL_PIN    PB7
+      //#endif
+
+    #else // !FYSETC_MINI_12864
 
     #define LCD_PINS_D4    PC13
     #if ENABLED(ULTIPANEL)
@@ -151,7 +163,9 @@
       #define LCD_PINS_D7  PC14
     #endif
 
-  #endif // !FYSETC_MINI_12864
+    #endif // !FYSETC_MINI_12864
+
+  #endif
 
 #endif // HAS_SPI_LCD