Browse Source

Support for VIKI2 in RAMPS and derivatives

Scott Lahteine 8 years ago
parent
commit
0b0b7aac6e
4 changed files with 37 additions and 36 deletions
  1. 6
    14
      Marlin/pins_AZTEEG_X3.h
  2. 5
    22
      Marlin/pins_AZTEEG_X3_PRO.h
  3. 5
    0
      Marlin/pins_MKS_13.h
  4. 21
    0
      Marlin/pins_RAMPS_14.h

+ 6
- 14
Marlin/pins_AZTEEG_X3.h View File

@@ -26,26 +26,18 @@
26 26
 
27 27
 #include "pins_RAMPS_14_EFB.h"
28 28
 
29
-//LCD Pins//
30
-
31 29
 #if ENABLED(VIKI2) || ENABLED(miniVIKI)
32 30
 
33
-  #define BEEPER_PIN        33
34
-
35
- // Pins for DOGM SPI LCD Support
31
+  #undef DOGLCD_A0
32
+  #undef DOGLCD_CS
33
+  #undef BTN_ENC
36 34
   #define DOGLCD_A0         31
37 35
   #define DOGLCD_CS         32
38
-  #define LCD_SCREEN_ROT_180
39
-
40
- //The encoder and click button
41
-  #define BTN_EN1           22
42
-  #define BTN_EN2            7
43
-  #define BTN_ENC           12  //the click switch
44
-
45
-  #define SDSS              53
46
-  #define SD_DETECT         -1  // Pin 49 if using display sd interface
36
+  #define BTN_ENC           12
47 37
 
48 38
   #if ENABLED(TEMP_STAT_LEDS)
39
+    #undef STAT_LED_RED
40
+    #undef STAT_LED_BLUE
49 41
     #define STAT_LED_RED    64
50 42
     #define STAT_LED_BLUE   63
51 43
   #endif

+ 5
- 22
Marlin/pins_AZTEEG_X3_PRO.h View File

@@ -105,27 +105,10 @@
105 105
 #undef SERVO0_PIN
106 106
 #define SERVO0_PIN         47
107 107
 
108
-//LCD Pins//
109
-
110 108
 #if ENABLED(VIKI2) || ENABLED(miniVIKI)
111
-  #define BEEPER_PIN       33
112
-  // Pins for DOGM SPI LCD Support
113
-  #define DOGLCD_A0        44
114
-  #define DOGLCD_CS        45
115
-  #define LCD_SCREEN_ROT_180
116
-
117
-  //The encoder and click button
118
-  #define BTN_EN1          22
119
-  #define BTN_EN2           7
120
-  #define BTN_ENC          39  //the click switch
121
-
122
-  #define SDSS             53
123
-  #define SD_DETECT_PIN 49
124
-
125
-  #define KILL_PIN         31
126
-#endif
127
-
128
-#if ENABLED(TEMP_STAT_LEDS)
129
-  #define STAT_LED_RED     32
130
-  #define STAT_LED_BLUE    35
109
+  #undef SD_DETECT_PIN
110
+  #define SD_DETECT_PIN 49  // For easy adapter board
111
+#elif ENABLED(TEMP_STAT_LEDS)
112
+  #define STAT_LED_RED   32
113
+  #define STAT_LED_BLUE  35
131 114
 #endif

+ 5
- 0
Marlin/pins_MKS_13.h View File

@@ -33,3 +33,8 @@
33 33
 
34 34
 #undef HEATER_1_PIN
35 35
 #define HEATER_1_PIN        7 // EXTRUDER 2 (-1 on RAMPS 1.4)
36
+
37
+#if ENABLED(VIKI2) || ENABLED(miniVIKI)
38
+  //#undef SD_DETECT_PIN
39
+  //#define SD_DETECT_PIN 49  // For easy adapter board
40
+#endif

+ 21
- 0
Marlin/pins_RAMPS_14.h View File

@@ -183,6 +183,27 @@
183 183
       #define BTN_ENC -1
184 184
       #define LCD_SDSS 53
185 185
       #define SD_DETECT_PIN 49
186
+    #elif ENABLED(VIKI2) || ENABLED(miniVIKI)
187
+      #define BEEPER_PIN       33
188
+
189
+      // Pins for DOGM SPI LCD Support
190
+      #define DOGLCD_A0        44
191
+      #define DOGLCD_CS        45
192
+      #define LCD_SCREEN_ROT_180
193
+
194
+      #define BTN_EN1          22
195
+      #define BTN_EN2           7
196
+      #define BTN_ENC          39
197
+
198
+      #define SDSS             53
199
+      #define SD_DETECT_PIN    -1  // Pin 49 for display sd interface, 72 for easy adapter board
200
+
201
+      #define KILL_PIN         31
202
+
203
+      #if ENABLED(TEMP_STAT_LEDS)
204
+        #define STAT_LED_RED   32
205
+        #define STAT_LED_BLUE  35
206
+      #endif
186 207
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
187 208
       #define BTN_EN1 35  // reverse if the encoder turns the wrong way.
188 209
       #define BTN_EN2 37

Loading…
Cancel
Save