thomas
/
marlin
Obserwuj 1
Gwiazdka 0
Forkuj 0
Kod Problemy 0 Pull Requests 0 Wydania 0 Wiki Aktywność
Przeglądaj źródła

FTDI/EVE, pins cleanup for SKR E3/DIP (#17990)

Gustavo Alvarez 4 lat temu
rodzic
104d020222
commit
6d92f56582
No account linked to committer's email address
5 zmienionych plików z 53 dodań i 86 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 0
    2
      Marlin/Configuration_adv.h
  2. 0
    9
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h
  3. 2
    5
      Marlin/src/pins/ramps/pins_RAMPS.h
  4. 26
    34
      Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
  5. 25
    36
      Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h

+ 0
- 2
Marlin/Configuration_adv.h Wyświetl plik 

@@ -1381,8 +1381,6 @@
1381 1381 
   //#define AO_EXP2_PINMAP      // AlephObjects CLCD UI EXP2 mapping
1382 1382 
   //#define CR10_TFT_PINMAP     // Rudolph Riedel's CR10 pin mapping
1383 1383 
   //#define S6_TFT_PINMAP       // FYSETC S6 pin mapping
1384 
-  //#define E3_EXP1_PINMAP      // E3 type boards (SKR E3/DIP, and Stock boards) EXP1 pin mapping
1385 
-  //#define GENERIC_EXP2_PINMAP // GENERIC EXP2 pin mapping
1386 1384
1387 1385 
   //#define OTHER_PIN_LAYOUT  // Define pins manually below
1388 1386 
   #if ENABLED(OTHER_PIN_LAYOUT)

+ 0
- 9
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h Wyświetl plik 

@@ -154,12 +154,3 @@
154 154 
     #define CLCD_SPI_EXTRA_CS            SDSS
155 155 
   #endif
156 156 
 #endif
157 
-
158 
-#if EITHER(E3_EXP1_PINMAP, GENERIC_EXP2_PINMAP)
159 
-  #ifndef __MARLIN_FIRMWARE__
160 
-    #error "This pin mapping requires Marlin."
161 
-  #endif
162 
-
163 
-  #define CLCD_MOD_RESET                 BTN_EN1
164 
-  #define CLCD_SPI_CS                    LCD_PINS_RS
165 
-#endif

+ 2
- 5
Marlin/src/pins/ramps/pins_RAMPS.h Wyświetl plik 

@@ -759,11 +759,8 @@
759 759
760 760 
   #define BEEPER_PIN                          37
761 761
762 
-  #define BTN_EN1                             31
763 
-  #define LCD_PINS_RS                         33
764 
-
765 762 
   #define SD_DETECT_PIN                       49
766 763
767 
-  #define KILL_PIN                            -1
768 
-
764 
+  #define CLCD_MOD_RESET                      31
765 
+  #define CLCD_SPI_CS                         33
769 766 
 #endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050

+ 26
- 34
Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h Wyświetl plik 

@@ -172,39 +172,31 @@
172 172 
  *                 EXP1
173 173 
  */
174 174
175 
-#define EXPA1_03_PIN                        PB7
176 
-#define EXPA1_04_PIN                        PB8
177 
-#define EXPA1_05_PIN                        PB9
178 
-#define EXPA1_06_PIN                        PA10
179 
-#define EXPA1_07_PIN                        -1
180 
-#define EXPA1_08_PIN                        PA9
181 
-#define EXPA1_09_PIN                        PB6
182 
-#define EXPA1_10_PIN                        PA15
183 175
184 176 
 #if HAS_SPI_LCD
185 177
186 178 
   #if ENABLED(CR10_STOCKDISPLAY)
187 179
188 
-    #define BEEPER_PIN              EXPA1_10_PIN
180 
+    #define BEEPER_PIN                      PA15
189 181
190 
-    #define BTN_ENC                 EXPA1_09_PIN
191 
-    #define BTN_EN1                 EXPA1_08_PIN
192 
-    #define BTN_EN2                 EXPA1_06_PIN
182 
+    #define BTN_ENC                         PB6
183 
+    #define BTN_EN1                         PA9
184 
+    #define BTN_EN2                         PA10
193 185
194 
-    #define LCD_PINS_RS             EXPA1_04_PIN
195 
-    #define LCD_PINS_ENABLE         EXPA1_03_PIN
196 
-    #define LCD_PINS_D4             EXPA1_05_PIN
186 
+    #define LCD_PINS_RS                     PB8
187 
+    #define LCD_PINS_ENABLE                 PB7
188 
+    #define LCD_PINS_D4                     PB9
197 189
198 190 
   #elif ENABLED(ZONESTAR_LCD)                     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
199 191
200 192 
     #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3.h' for details. Comment out this line to continue."
201 193
202 
-    #define LCD_PINS_RS             EXPA1_05_PIN
203 
-    #define LCD_PINS_ENABLE         EXPA1_09_PIN
204 
-    #define LCD_PINS_D4             EXPA1_04_PIN
205 
-    #define LCD_PINS_D5             EXPA1_06_PIN
206 
-    #define LCD_PINS_D6             EXPA1_08_PIN
207 
-    #define LCD_PINS_D7             EXPA1_10_PIN
194 
+    #define LCD_PINS_RS                     PB9
195 
+    #define LCD_PINS_ENABLE                 PB6
196 
+    #define LCD_PINS_D4                     PB8
197 
+    #define LCD_PINS_D5                     PA10
198 
+    #define LCD_PINS_D6                     PA9
199 
+    #define LCD_PINS_D7                     PA15
208 200 
     #define ADC_KEYPAD_PIN                  PA1   // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
209 201
210 202 
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
 
@@ -220,14 +212,14 @@
220 212 
      *                    EXP1
221 213 
      */
222 214
223 
-    #define BTN_ENC                 EXPA1_09_PIN
224 
-    #define BTN_EN1                 EXPA1_08_PIN
225 
-    #define BTN_EN2                 EXPA1_06_PIN
215 
+    #define BTN_ENC                         PB6
216 
+    #define BTN_EN1                         PA9
217 
+    #define BTN_EN2                         PA10
226 218
227 
-    #define DOGLCD_CS               EXPA1_04_PIN
228 
-    #define DOGLCD_A0               EXPA1_05_PIN
229 
-    #define DOGLCD_SCK              EXPA1_10_PIN
230 
-    #define DOGLCD_MOSI             EXPA1_03_PIN
219 
+    #define DOGLCD_CS                       PB8
220 
+    #define DOGLCD_A0                       PB9
221 
+    #define DOGLCD_SCK                      PA15
222 
+    #define DOGLCD_MOSI                     PB7
231 223 
     #define FORCE_SOFT_SPI
232 224 
     #define LCD_BACKLIGHT_PIN               -1
233 225 
 
@@ -272,10 +264,10 @@
272 264
273 265 
   #define CLCD_SPI_BUS 1                          // SPI1 connector
274 266
275 
-  #define BEEPER_PIN                EXPA1_09_PIN
267 
+  #define BEEPER_PIN                        PB6
276 268
277 
-  #define BTN_EN1                   EXPA1_08_PIN
278 
-  #define LCD_PINS_RS               EXPA1_04_PIN
269 
+  #define CLCD_MOD_RESET                    PA9
270 
+  #define CLCD_SPI_CS                       PA8
279 271
280 272 
 #endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050
281 273 
 
@@ -284,7 +276,7 @@
284 276 
 //
285 277
286 278 
 #ifndef SDCARD_CONNECTION
287 
-  #define SDCARD_CONNECTION              ONBOARD
279 
+  #define SDCARD_CONNECTION                 ONBOARD
288 280 
 #endif
289 281
290 282 
 #if SD_CONNECTION_IS(ONBOARD)
 
@@ -292,8 +284,8 @@
292 284 
 #endif
293 285
294 286 
 #if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050) && SD_CONNECTION_IS(LCD)
295 
-  #define SD_DETECT_PIN             EXPA1_10_PIN
296 
-  #define SS_PIN                    EXPA1_06_PIN
287 
+  #define SD_DETECT_PIN                     PA15
288 
+  #define SS_PIN                            PA10
297 289 
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
298 290 
   #error "SD CUSTOM_CABLE is not compatible with SKR E3 DIP."
299 291 
 #endif

+ 25
- 36
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h Wyświetl plik 

@@ -112,39 +112,30 @@
112 112 
  *                 EXP1
113 113 
  */
114 114
115 
-#define EXPA1_03_PIN                        PB7
116 
-#define EXPA1_04_PIN                        PB8
117 
-#define EXPA1_05_PIN                        PB9
118 
-#define EXPA1_06_PIN                        PA10
119 
-#define EXPA1_07_PIN                        -1
120 
-#define EXPA1_08_PIN                        PA9
121 
-#define EXPA1_09_PIN                        PB6
122 
-#define EXPA1_10_PIN                        PB5
123 
-
124 115 
 #if HAS_SPI_LCD
125 116
126 117 
   #if ENABLED(CR10_STOCKDISPLAY)
127 118
128 
-    #define BEEPER_PIN              EXPA1_10_PIN
119 
+    #define BEEPER_PIN                      PB5
129 120
130 
-    #define BTN_ENC                 EXPA1_09_PIN
131 
-    #define BTN_EN1                 EXPA1_08_PIN
132 
-    #define BTN_EN2                 EXPA1_06_PIN
121 
+    #define BTN_ENC                         PB6
122 
+    #define BTN_EN1                         PA9
123 
+    #define BTN_EN2                         PA10
133 124
134 
-    #define LCD_PINS_RS             EXPA1_04_PIN
135 
-    #define LCD_PINS_ENABLE         EXPA1_03_PIN
136 
-    #define LCD_PINS_D4             EXPA1_05_PIN
125 
+    #define LCD_PINS_RS                     PB8
126 
+    #define LCD_PINS_ENABLE                 PB7
127 
+    #define LCD_PINS_D4                     PB9
137 128
138 129 
   #elif ENABLED(ZONESTAR_LCD)                     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
139 130
140 131 
     #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3.h' for details. Comment out this line to continue."
141 132
142 
-    #define LCD_PINS_RS             EXPA1_05_PIN
143 
-    #define LCD_PINS_ENABLE         EXPA1_09_PIN
144 
-    #define LCD_PINS_D4             EXPA1_04_PIN
145 
-    #define LCD_PINS_D5             EXPA1_06_PIN
146 
-    #define LCD_PINS_D6             EXPA1_08_PIN
147 
-    #define LCD_PINS_D7             EXPA1_10_PIN
133 
+    #define LCD_PINS_RS                     PB9
134 
+    #define LCD_PINS_ENABLE                 PB6
135 
+    #define LCD_PINS_D4                     PB8
136 
+    #define LCD_PINS_D5                     PA10
137 
+    #define LCD_PINS_D6                     PA9
138 
+    #define LCD_PINS_D7                     PB5
148 139 
     #define ADC_KEYPAD_PIN                  PA1   // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
149 140
150 141 
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
 
@@ -160,14 +151,14 @@
160 151 
      *                    EXP1
161 152 
      */
162 153
163 
-    #define BTN_ENC                 EXPA1_09_PIN
164 
-    #define BTN_EN1                 EXPA1_08_PIN
165 
-    #define BTN_EN2                 EXPA1_06_PIN
154 
+    #define BTN_ENC                         PB6
155 
+    #define BTN_EN1                         PA9
156 
+    #define BTN_EN2                         PA10
166 157
167 
-    #define DOGLCD_CS               EXPA1_04_PIN
168 
-    #define DOGLCD_A0               EXPA1_05_PIN
169 
-    #define DOGLCD_SCK              EXPA1_10_PIN
170 
-    #define DOGLCD_MOSI             EXPA1_03_PIN
158 
+    #define DOGLCD_CS                       PB8
159 
+    #define DOGLCD_A0                       PB9
160 
+    #define DOGLCD_SCK                      PB5
161 
+    #define DOGLCD_MOSI                     PB7
171 162 
     #define FORCE_SOFT_SPI
172 163 
     #define LCD_BACKLIGHT_PIN               -1
173 164 
 
@@ -212,12 +203,10 @@
212 203
213 204 
   #define CLCD_SPI_BUS 1                          // SPI1 connector
214 205
215 
-  #define BEEPER_PIN                EXPA1_09_PIN
206 
+  #define BEEPER_PIN                        PB6
216 207
217 
-  #define BTN_EN1                   EXPA1_08_PIN
218 
-  #define LCD_PINS_RS               EXPA1_04_PIN
219 
-  #define LCD_PINS_ENABLE           EXPA1_03_PIN
220 
-  #define LCD_PINS_D4               EXPA1_05_PIN
208 
+  #define CLCD_MOD_RESET                    PA9
209 
+  #define CLCD_SPI_CS                       PB8
221 210
222 211 
 #endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050
223 212 
 
@@ -234,8 +223,8 @@
234 223 
 #endif
235 224
236 225 
 #if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050) && SD_CONNECTION_IS(LCD)
237 
-  #define SD_DETECT_PIN             EXPA1_10_PIN
238 
-  #define SS_PIN                    EXPA1_06_PIN
226 
+  #define SD_DETECT_PIN                     PB5
227 
+  #define SS_PIN                            PA10
239 228 
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
240 229 
   #error "SD CUSTOM_CABLE is not compatible with SKR Mini E3."
241 230 
 #endif

Napisz Podgląd
Ładowanie…
Anuluj
Zapisz