Browse Source

Merge pull request #8048 from madmo/mks-mini-gt2560

[1.1.x] Add MKS MINI 12864 support to GT2560
Scott Lahteine 7 years ago
parent
commit
a12d1b21b5

+ 1
- 1
Marlin/example_configurations/Geeetech/GT2560/Configuration.h View File

@@ -1736,7 +1736,7 @@
1736 1736
 /**
1737 1737
  * Customize common displays for GT2560
1738 1738
  */
1739
-#if ENABLED(ULTIMAKERCONTROLLER) || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) || ENABLED(G3D_PANEL)
1739
+#if ENABLED(ULTIMAKERCONTROLLER) || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) || ENABLED(G3D_PANEL) || ENABLED(MKS_MINI_12864)
1740 1740
   #define SDSUPPORT   // Force SD Card support on for these displays
1741 1741
 #elif ENABLED(ULTRA_LCD) && ENABLED(DOGLCD) // No panel, just graphical LCD?
1742 1742
   #define LCD_WIDTH 20 // Default is 22. For this Geeetech use 20

+ 15
- 10
Marlin/pins_GT2560_REV_A.h View File

@@ -98,18 +98,23 @@
98 98
 
99 99
   #if ENABLED(NEWPANEL)
100 100
 
101
-    #define LCD_PINS_RS    20
102
-    #define LCD_PINS_ENABLE 17
103
-    #define LCD_PINS_D4    16
104
-    #define LCD_PINS_D5    21
105
-    #define LCD_PINS_D6     5
106
-    #define LCD_PINS_D7     6
101
+    #if ENABLED(MKS_MINI_12864)
102
+      #define DOGLCD_A0     5
103
+      #define DOGLCD_CS    21
104
+      #define BTN_EN1      40
105
+      #define BTN_EN2      42
106
+    #else
107
+      #define LCD_PINS_RS  20
108
+      #define LCD_PINS_ENABLE 17
109
+      #define LCD_PINS_D4  16
110
+      #define LCD_PINS_D5  21
111
+      #define LCD_PINS_D6   5
112
+      #define LCD_PINS_D7   6
113
+      #define BTN_EN1      42
114
+      #define BTN_EN2      40
115
+    #endif
107 116
 
108
-    // Buttons are directly attached
109
-    #define BTN_EN1        42
110
-    #define BTN_EN2        40
111 117
     #define BTN_ENC        19
112
-
113 118
     #define SD_DETECT_PIN  38
114 119
 
115 120
   #else // !NEWPANEL

Loading…
Cancel
Save