Browse Source

EXP headers for RAMPS 1.x (#21054)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
ellensp 4 years ago
parent
commit
79ee2fa20a
No account linked to committer's email address

+ 63
- 63
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h View File

197
  *               EXP2                                               EXP1
197
  *               EXP2                                               EXP1
198
  */
198
  */
199
 
199
 
200
-#define EXPA1_03_PIN                       P1_23
201
-#define EXPA1_04_PIN                       P1_22
202
-#define EXPA1_05_PIN                       P1_21
203
-#define EXPA1_06_PIN                       P1_20
204
-#define EXPA1_07_PIN                       P1_19
205
-#define EXPA1_08_PIN                       P1_18
206
-#define EXPA1_09_PIN                       P0_28
207
-#define EXPA1_10_PIN                       P1_30
208
-
209
-#define EXPA2_03_PIN                       -1
210
-#define EXPA2_04_PIN                       P1_31
211
-#define EXPA2_05_PIN                       P0_18
212
-#define EXPA2_06_PIN                       P3_25
213
-#define EXPA2_07_PIN                       P0_16
214
-#define EXPA2_08_PIN                       P3_26
215
-#define EXPA2_09_PIN                       P0_15
216
-#define EXPA2_10_PIN                       P0_17
200
+#define EXP1_03_PIN                        P1_23
201
+#define EXP1_04_PIN                        P1_22
202
+#define EXP1_05_PIN                        P1_21
203
+#define EXP1_06_PIN                        P1_20
204
+#define EXP1_07_PIN                        P1_19
205
+#define EXP1_08_PIN                        P1_18
206
+#define EXP1_09_PIN                        P0_28
207
+#define EXP1_10_PIN                        P1_30
208
+
209
+#define EXP2_03_PIN                        -1
210
+#define EXP2_04_PIN                        P1_31
211
+#define EXP2_05_PIN                        P0_18
212
+#define EXP2_06_PIN                        P3_25
213
+#define EXP2_07_PIN                        P0_16
214
+#define EXP2_08_PIN                        P3_26
215
+#define EXP2_09_PIN                        P0_15
216
+#define EXP2_10_PIN                        P0_17
217
 
217
 
218
 #if HAS_WIRED_LCD
218
 #if HAS_WIRED_LCD
219
   #if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
219
   #if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
243
     *                   LCD                             LCD
243
     *                   LCD                             LCD
244
     */
244
     */
245
 
245
 
246
-    #define LCD_PINS_RS             EXPA1_03_PIN
246
+    #define LCD_PINS_RS              EXP1_03_PIN
247
 
247
 
248
-    #define BTN_EN1                 EXPA1_06_PIN
249
-    #define BTN_EN2                 EXPA1_04_PIN
250
-    #define BTN_ENC                 EXPA1_08_PIN
248
+    #define BTN_EN1                  EXP1_06_PIN
249
+    #define BTN_EN2                  EXP1_04_PIN
250
+    #define BTN_ENC                  EXP1_08_PIN
251
 
251
 
252
-    #define LCD_PINS_ENABLE         EXPA1_05_PIN
253
-    #define LCD_PINS_D4             EXPA1_07_PIN
252
+    #define LCD_PINS_ENABLE          EXP1_05_PIN
253
+    #define LCD_PINS_D4              EXP1_07_PIN
254
 
254
 
255
   #elif ENABLED(CR10_STOCKDISPLAY)
255
   #elif ENABLED(CR10_STOCKDISPLAY)
256
 
256
 
257
-    #define LCD_PINS_RS             EXPA1_04_PIN
257
+    #define LCD_PINS_RS              EXP1_04_PIN
258
 
258
 
259
-    #define BTN_EN1                 EXPA1_08_PIN
260
-    #define BTN_EN2                 EXPA1_06_PIN
261
-    #define BTN_ENC                 EXPA1_09_PIN  // (58) open-drain
259
+    #define BTN_EN1                  EXP1_08_PIN
260
+    #define BTN_EN2                  EXP1_06_PIN
261
+    #define BTN_ENC                  EXP1_09_PIN  // (58) open-drain
262
 
262
 
263
-    #define LCD_PINS_ENABLE         EXPA1_03_PIN
264
-    #define LCD_PINS_D4             EXPA1_05_PIN
263
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
264
+    #define LCD_PINS_D4              EXP1_05_PIN
265
 
265
 
266
   #elif HAS_ADC_BUTTONS
266
   #elif HAS_ADC_BUTTONS
267
 
267
 
270
   #elif IS_TFTGLCD_PANEL
270
   #elif IS_TFTGLCD_PANEL
271
 
271
 
272
     #if ENABLED(TFTGLCD_PANEL_SPI)
272
     #if ENABLED(TFTGLCD_PANEL_SPI)
273
-      #define TFTGLCD_CS            EXPA2_08_PIN
273
+      #define TFTGLCD_CS             EXP2_08_PIN
274
     #endif
274
     #endif
275
 
275
 
276
-    #define SD_DETECT_PIN           EXPA2_04_PIN
276
+    #define SD_DETECT_PIN            EXP2_04_PIN
277
 
277
 
278
   #else                                           // !CR10_STOCKDISPLAY
278
   #else                                           // !CR10_STOCKDISPLAY
279
 
279
 
280
-    #define LCD_PINS_RS             EXPA1_07_PIN
280
+    #define LCD_PINS_RS              EXP1_07_PIN
281
 
281
 
282
-    #define BTN_EN1                 EXPA2_08_PIN  // (31) J3-2 & AUX-4
283
-    #define BTN_EN2                 EXPA2_06_PIN  // (33) J3-4 & AUX-4
284
-    #define BTN_ENC                 EXPA1_09_PIN  // (58) open-drain
282
+    #define BTN_EN1                  EXP2_08_PIN  // (31) J3-2 & AUX-4
283
+    #define BTN_EN2                  EXP2_06_PIN  // (33) J3-4 & AUX-4
284
+    #define BTN_ENC                  EXP1_09_PIN  // (58) open-drain
285
 
285
 
286
-    #define LCD_PINS_ENABLE         EXPA1_08_PIN
287
-    #define LCD_PINS_D4             EXPA1_06_PIN
286
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
287
+    #define LCD_PINS_D4              EXP1_06_PIN
288
 
288
 
289
-    #define LCD_SDSS                EXPA2_07_PIN  // (16) J3-7 & AUX-4
290
-    #define SD_DETECT_PIN           EXPA2_04_PIN  // (49) (NOT 5V tolerant)
289
+    #define LCD_SDSS                 EXP2_07_PIN  // (16) J3-7 & AUX-4
290
+    #define SD_DETECT_PIN            EXP2_04_PIN  // (49) (NOT 5V tolerant)
291
 
291
 
292
     #if ENABLED(FYSETC_MINI_12864)
292
     #if ENABLED(FYSETC_MINI_12864)
293
-      #define DOGLCD_CS             EXPA1_08_PIN
294
-      #define DOGLCD_A0             EXPA1_07_PIN
295
-      #define DOGLCD_SCK            EXPA2_09_PIN
296
-      #define DOGLCD_MOSI           EXPA2_05_PIN
293
+      #define DOGLCD_CS              EXP1_08_PIN
294
+      #define DOGLCD_A0              EXP1_07_PIN
295
+      #define DOGLCD_SCK             EXP2_09_PIN
296
+      #define DOGLCD_MOSI            EXP2_05_PIN
297
 
297
 
298
       #define LCD_BACKLIGHT_PIN            -1
298
       #define LCD_BACKLIGHT_PIN            -1
299
 
299
 
300
       #define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
300
       #define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
301
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
301
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
302
 
302
 
303
-      #define LCD_RESET_PIN         EXPA1_06_PIN  // Must be high or open for LCD to operate normally.
303
+      #define LCD_RESET_PIN          EXP1_06_PIN  // Must be high or open for LCD to operate normally.
304
 
304
 
305
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
305
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
306
         #ifndef RGB_LED_R_PIN
306
         #ifndef RGB_LED_R_PIN
307
-          #define RGB_LED_R_PIN     EXPA1_05_PIN
307
+          #define RGB_LED_R_PIN      EXP1_05_PIN
308
         #endif
308
         #endif
309
         #ifndef RGB_LED_G_PIN
309
         #ifndef RGB_LED_G_PIN
310
-          #define RGB_LED_G_PIN     EXPA1_04_PIN
310
+          #define RGB_LED_G_PIN      EXP1_04_PIN
311
         #endif
311
         #endif
312
         #ifndef RGB_LED_B_PIN
312
         #ifndef RGB_LED_B_PIN
313
-          #define RGB_LED_B_PIN     EXPA1_03_PIN
313
+          #define RGB_LED_B_PIN      EXP1_03_PIN
314
         #endif
314
         #endif
315
       #elif ENABLED(FYSETC_MINI_12864_2_1)
315
       #elif ENABLED(FYSETC_MINI_12864_2_1)
316
-        #define NEOPIXEL_PIN        EXPA1_05_PIN
316
+        #define NEOPIXEL_PIN         EXP1_05_PIN
317
       #endif
317
       #endif
318
 
318
 
319
     #else                                         // !FYSETC_MINI_12864
319
     #else                                         // !FYSETC_MINI_12864
320
 
320
 
321
       #if ENABLED(MKS_MINI_12864)
321
       #if ENABLED(MKS_MINI_12864)
322
 
322
 
323
-        #define DOGLCD_CS           EXPA1_05_PIN
324
-        #define DOGLCD_A0           EXPA1_04_PIN
325
-        #define DOGLCD_SCK          EXPA2_09_PIN
326
-        #define DOGLCD_MOSI         EXPA2_05_PIN
323
+        #define DOGLCD_CS            EXP1_05_PIN
324
+        #define DOGLCD_A0            EXP1_04_PIN
325
+        #define DOGLCD_SCK           EXP2_09_PIN
326
+        #define DOGLCD_MOSI          EXP2_05_PIN
327
 
327
 
328
       #elif ENABLED(ENDER2_STOCKDISPLAY)
328
       #elif ENABLED(ENDER2_STOCKDISPLAY)
329
 
329
 
339
          *                    EXP1
339
          *                    EXP1
340
          */
340
          */
341
 
341
 
342
-        #define BTN_EN1             EXPA1_08_PIN
343
-        #define BTN_EN2             EXPA1_06_PIN
344
-        #define BTN_ENC             EXPA1_09_PIN
345
-        #define DOGLCD_CS           EXPA1_04_PIN
346
-        #define DOGLCD_A0           EXPA1_05_PIN
347
-        #define DOGLCD_SCK          EXPA1_10_PIN
348
-        #define DOGLCD_MOSI         EXPA1_03_PIN
342
+        #define BTN_EN1              EXP1_08_PIN
343
+        #define BTN_EN2              EXP1_06_PIN
344
+        #define BTN_ENC              EXP1_09_PIN
345
+        #define DOGLCD_CS            EXP1_04_PIN
346
+        #define DOGLCD_A0            EXP1_05_PIN
347
+        #define DOGLCD_SCK           EXP1_10_PIN
348
+        #define DOGLCD_MOSI          EXP1_03_PIN
349
         #define FORCE_SOFT_SPI
349
         #define FORCE_SOFT_SPI
350
         #define LCD_BACKLIGHT_PIN          -1
350
         #define LCD_BACKLIGHT_PIN          -1
351
       #endif
351
       #endif
352
 
352
 
353
       #if IS_ULTIPANEL
353
       #if IS_ULTIPANEL
354
-        #define LCD_PINS_D5         EXPA1_05_PIN
355
-        #define LCD_PINS_D6         EXPA1_04_PIN
356
-        #define LCD_PINS_D7         EXPA1_03_PIN
354
+        #define LCD_PINS_D5          EXP1_05_PIN
355
+        #define LCD_PINS_D6          EXP1_04_PIN
356
+        #define LCD_PINS_D7          EXP1_03_PIN
357
 
357
 
358
         #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
358
         #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
359
           #define BTN_ENC_EN         LCD_PINS_D7  // Detect the presence of the encoder
359
           #define BTN_ENC_EN         LCD_PINS_D7  // Detect the presence of the encoder
376
 #endif
376
 #endif
377
 
377
 
378
 #if SD_CONNECTION_IS(LCD)
378
 #if SD_CONNECTION_IS(LCD)
379
-  #define SD_SS_PIN                 EXPA2_07_PIN
379
+  #define SD_SS_PIN                  EXP2_07_PIN
380
 #endif
380
 #endif
381
 
381
 
382
 /**
382
 /**

+ 87
- 87
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h View File

243
  *               EXP2                         EXP1
243
  *               EXP2                         EXP1
244
  */
244
  */
245
 
245
 
246
-#define EXPA1_03_PIN                       P1_23
247
-#define EXPA1_04_PIN                       P1_22
248
-#define EXPA1_05_PIN                       P1_21
249
-#define EXPA1_06_PIN                       P1_20
250
-#define EXPA1_07_PIN                       P1_19
251
-#define EXPA1_08_PIN                       P1_18
252
-#define EXPA1_09_PIN                       P0_28
253
-#define EXPA1_10_PIN                       P1_30
254
-
255
-#define EXPA2_03_PIN                       -1
256
-#define EXPA2_04_PIN                       P1_31
257
-#define EXPA2_05_PIN                       P0_18
258
-#define EXPA2_06_PIN                       P3_25
259
-#define EXPA2_07_PIN                       P0_16
260
-#define EXPA2_08_PIN                       P3_26
261
-#define EXPA2_09_PIN                       P0_15
262
-#define EXPA2_10_PIN                       P0_17
246
+#define EXP1_03_PIN                        P1_23
247
+#define EXP1_04_PIN                        P1_22
248
+#define EXP1_05_PIN                        P1_21
249
+#define EXP1_06_PIN                        P1_20
250
+#define EXP1_07_PIN                        P1_19
251
+#define EXP1_08_PIN                        P1_18
252
+#define EXP1_09_PIN                        P0_28
253
+#define EXP1_10_PIN                        P1_30
254
+
255
+#define EXP2_03_PIN                        -1
256
+#define EXP2_04_PIN                        P1_31
257
+#define EXP2_05_PIN                        P0_18
258
+#define EXP2_06_PIN                        P3_25
259
+#define EXP2_07_PIN                        P0_16
260
+#define EXP2_08_PIN                        P3_26
261
+#define EXP2_09_PIN                        P0_15
262
+#define EXP2_10_PIN                        P0_17
263
 
263
 
264
 //
264
 //
265
 // SD Connection
265
 // SD Connection
266
 //
266
 //
267
 #if SD_CONNECTION_IS(LCD)
267
 #if SD_CONNECTION_IS(LCD)
268
-  #define SD_SS_PIN                 EXPA2_07_PIN
268
+  #define SD_SS_PIN                  EXP2_07_PIN
269
 #endif
269
 #endif
270
 
270
 
271
 /**
271
 /**
282
 #if ENABLED(DWIN_CREALITY_LCD)
282
 #if ENABLED(DWIN_CREALITY_LCD)
283
 
283
 
284
   // RET6 DWIN ENCODER LCD
284
   // RET6 DWIN ENCODER LCD
285
-  #define BTN_ENC                           P1_20
286
-  #define BTN_EN1                           P1_23
287
-  #define BTN_EN2                           P1_22
285
+  #define BTN_ENC                          P1_20
286
+  #define BTN_EN1                          P1_23
287
+  #define BTN_EN2                          P1_22
288
 
288
 
289
   #ifndef BEEPER_PIN
289
   #ifndef BEEPER_PIN
290
-    #define BEEPER_PIN                      P1_21
290
+    #define BEEPER_PIN                     P1_21
291
     #undef SPEAKER
291
     #undef SPEAKER
292
   #endif
292
   #endif
293
 
293
 
315
      *                 LCD                        LCD
315
      *                 LCD                        LCD
316
      */
316
      */
317
 
317
 
318
-    #define LCD_PINS_RS             EXPA1_07_PIN
318
+    #define LCD_PINS_RS              EXP1_07_PIN
319
 
319
 
320
-    #define BTN_EN1                 EXPA1_05_PIN
321
-    #define BTN_EN2                 EXPA1_04_PIN
322
-    #define BTN_ENC                 EXPA1_10_PIN
320
+    #define BTN_EN1                  EXP1_05_PIN
321
+    #define BTN_EN2                  EXP1_04_PIN
322
+    #define BTN_ENC                  EXP1_10_PIN
323
 
323
 
324
-    #define LCD_PINS_ENABLE         EXPA1_08_PIN
325
-    #define LCD_PINS_D4             EXPA1_06_PIN
326
-    #define BEEPER_PIN              EXPA1_03_PIN
324
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
325
+    #define LCD_PINS_D4              EXP1_06_PIN
326
+    #define BEEPER_PIN               EXP1_03_PIN
327
 
327
 
328
   #elif ENABLED(ANET_FULL_GRAPHICS_LCD)
328
   #elif ENABLED(ANET_FULL_GRAPHICS_LCD)
329
     #error "CAUTION! ANET_FULL_GRAPHICS_LCD requires wiring modifications. See 'pins_BTT_SKR_V1_4.h' for details. Comment out this line to continue."
329
     #error "CAUTION! ANET_FULL_GRAPHICS_LCD requires wiring modifications. See 'pins_BTT_SKR_V1_4.h' for details. Comment out this line to continue."
349
     *                 LCD                        LCD
349
     *                 LCD                        LCD
350
     */
350
     */
351
 
351
 
352
-    #define LCD_PINS_RS             EXPA1_03_PIN
352
+    #define LCD_PINS_RS              EXP1_03_PIN
353
 
353
 
354
-    #define BTN_EN1                 EXPA1_06_PIN
355
-    #define BTN_EN2                 EXPA1_04_PIN
356
-    #define BTN_ENC                 EXPA1_08_PIN
354
+    #define BTN_EN1                  EXP1_06_PIN
355
+    #define BTN_EN2                  EXP1_04_PIN
356
+    #define BTN_ENC                  EXP1_08_PIN
357
 
357
 
358
-    #define LCD_PINS_ENABLE         EXPA1_05_PIN
359
-    #define LCD_PINS_D4             EXPA1_07_PIN
358
+    #define LCD_PINS_ENABLE          EXP1_05_PIN
359
+    #define LCD_PINS_D4              EXP1_07_PIN
360
 
360
 
361
-    #define BEEPER_PIN              EXPA1_10_PIN
361
+    #define BEEPER_PIN               EXP1_10_PIN
362
 
362
 
363
   #elif ENABLED(CR10_STOCKDISPLAY)
363
   #elif ENABLED(CR10_STOCKDISPLAY)
364
-    #define BTN_ENC                 EXPA1_09_PIN  // (58) open-drain
365
-    #define LCD_PINS_RS             EXPA1_04_PIN
364
+    #define BTN_ENC                  EXP1_09_PIN  // (58) open-drain
365
+    #define LCD_PINS_RS              EXP1_04_PIN
366
 
366
 
367
-    #define BTN_EN1                 EXPA1_08_PIN
368
-    #define BTN_EN2                 EXPA1_06_PIN
367
+    #define BTN_EN1                  EXP1_08_PIN
368
+    #define BTN_EN2                  EXP1_06_PIN
369
 
369
 
370
-    #define LCD_PINS_ENABLE         EXPA1_03_PIN
371
-    #define LCD_PINS_D4             EXPA1_05_PIN
370
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
371
+    #define LCD_PINS_D4              EXP1_05_PIN
372
 
372
 
373
   #elif ENABLED(ENDER2_STOCKDISPLAY)
373
   #elif ENABLED(ENDER2_STOCKDISPLAY)
374
 
374
 
383
      *                    EXP1
383
      *                    EXP1
384
      */
384
      */
385
 
385
 
386
-    #define BTN_EN1                 EXPA1_08_PIN
387
-    #define BTN_EN2                 EXPA1_06_PIN
388
-    #define BTN_ENC                 EXPA1_09_PIN
386
+    #define BTN_EN1                  EXP1_08_PIN
387
+    #define BTN_EN2                  EXP1_06_PIN
388
+    #define BTN_ENC                  EXP1_09_PIN
389
 
389
 
390
-    #define DOGLCD_CS               EXPA1_04_PIN
391
-    #define DOGLCD_A0               EXPA1_05_PIN
392
-    #define DOGLCD_SCK              EXPA1_10_PIN
393
-    #define DOGLCD_MOSI             EXPA1_03_PIN
390
+    #define DOGLCD_CS                EXP1_04_PIN
391
+    #define DOGLCD_A0                EXP1_05_PIN
392
+    #define DOGLCD_SCK               EXP1_10_PIN
393
+    #define DOGLCD_MOSI              EXP1_03_PIN
394
     #define FORCE_SOFT_SPI
394
     #define FORCE_SOFT_SPI
395
     #define LCD_BACKLIGHT_PIN              -1
395
     #define LCD_BACKLIGHT_PIN              -1
396
 
396
 
397
   #elif HAS_SPI_TFT                               // Config for Classic UI (emulated DOGM) and Color UI
397
   #elif HAS_SPI_TFT                               // Config for Classic UI (emulated DOGM) and Color UI
398
-    #define TFT_CS_PIN              EXPA1_04_PIN
399
-    #define TFT_A0_PIN              EXPA1_03_PIN
400
-    #define TFT_DC_PIN              EXPA1_03_PIN
401
-    #define TFT_MISO_PIN            EXPA2_10_PIN
402
-    #define TFT_BACKLIGHT_PIN       EXPA1_08_PIN
403
-    #define TFT_RESET_PIN           EXPA1_07_PIN
398
+    #define TFT_CS_PIN               EXP1_04_PIN
399
+    #define TFT_A0_PIN               EXP1_03_PIN
400
+    #define TFT_DC_PIN               EXP1_03_PIN
401
+    #define TFT_MISO_PIN             EXP2_10_PIN
402
+    #define TFT_BACKLIGHT_PIN        EXP1_08_PIN
403
+    #define TFT_RESET_PIN            EXP1_07_PIN
404
 
404
 
405
     #define LCD_USE_DMA_SPI
405
     #define LCD_USE_DMA_SPI
406
 
406
 
407
-    #define TOUCH_INT_PIN           EXPA1_05_PIN
408
-    #define TOUCH_CS_PIN            EXPA1_06_PIN
407
+    #define TOUCH_INT_PIN            EXP1_05_PIN
408
+    #define TOUCH_CS_PIN             EXP1_06_PIN
409
     #define TOUCH_BUTTONS_HW_SPI
409
     #define TOUCH_BUTTONS_HW_SPI
410
     #define TOUCH_BUTTONS_HW_SPI_DEVICE        1
410
     #define TOUCH_BUTTONS_HW_SPI_DEVICE        1
411
 
411
 
412
     // SPI 1
412
     // SPI 1
413
-    #define SD_SCK_PIN              EXPA2_09_PIN
414
-    #define SD_MISO_PIN             EXPA2_10_PIN
415
-    #define SD_MOSI_PIN             EXPA2_05_PIN
413
+    #define SD_SCK_PIN               EXP2_09_PIN
414
+    #define SD_MISO_PIN              EXP2_10_PIN
415
+    #define SD_MOSI_PIN              EXP2_05_PIN
416
 
416
 
417
     // Disable any LCD related PINs config
417
     // Disable any LCD related PINs config
418
     #define LCD_PINS_ENABLE                -1
418
     #define LCD_PINS_ENABLE                -1
423
   #elif IS_TFTGLCD_PANEL
423
   #elif IS_TFTGLCD_PANEL
424
 
424
 
425
     #if ENABLED(TFTGLCD_PANEL_SPI)
425
     #if ENABLED(TFTGLCD_PANEL_SPI)
426
-      #define TFTGLCD_CS            EXPA2_08_PIN
426
+      #define TFTGLCD_CS             EXP2_08_PIN
427
     #endif
427
     #endif
428
 
428
 
429
-    #define SD_DETECT_PIN           EXPA2_04_PIN
429
+    #define SD_DETECT_PIN            EXP2_04_PIN
430
 
430
 
431
   #else
431
   #else
432
 
432
 
433
-    #define BTN_ENC                 EXPA1_09_PIN  // (58) open-drain
434
-    #define LCD_PINS_RS             EXPA1_07_PIN
433
+    #define BTN_ENC                  EXP1_09_PIN  // (58) open-drain
434
+    #define LCD_PINS_RS              EXP1_07_PIN
435
 
435
 
436
-    #define BTN_EN1                 EXPA2_08_PIN  // (31) J3-2 & AUX-4
437
-    #define BTN_EN2                 EXPA2_06_PIN  // (33) J3-4 & AUX-4
436
+    #define BTN_EN1                  EXP2_08_PIN  // (31) J3-2 & AUX-4
437
+    #define BTN_EN2                  EXP2_06_PIN  // (33) J3-4 & AUX-4
438
 
438
 
439
-    #define LCD_PINS_ENABLE         EXPA1_08_PIN
440
-    #define LCD_PINS_D4             EXPA1_06_PIN
439
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
440
+    #define LCD_PINS_D4              EXP1_06_PIN
441
 
441
 
442
-    #define LCD_SDSS                EXPA2_07_PIN  // (16) J3-7 & AUX-4
442
+    #define LCD_SDSS                 EXP2_07_PIN  // (16) J3-7 & AUX-4
443
 
443
 
444
     #if SD_CONNECTION_IS(LCD)
444
     #if SD_CONNECTION_IS(LCD)
445
-      #define SD_DETECT_PIN         EXPA2_04_PIN  // (49) (NOT 5V tolerant)
445
+      #define SD_DETECT_PIN          EXP2_04_PIN  // (49) (NOT 5V tolerant)
446
     #endif
446
     #endif
447
 
447
 
448
     #if ENABLED(FYSETC_MINI_12864)
448
     #if ENABLED(FYSETC_MINI_12864)
449
-      #define DOGLCD_CS             EXPA1_08_PIN
450
-      #define DOGLCD_A0             EXPA1_07_PIN
451
-      #define DOGLCD_SCK            EXPA2_09_PIN
452
-      #define DOGLCD_MOSI           EXPA2_05_PIN
449
+      #define DOGLCD_CS              EXP1_08_PIN
450
+      #define DOGLCD_A0              EXP1_07_PIN
451
+      #define DOGLCD_SCK             EXP2_09_PIN
452
+      #define DOGLCD_MOSI            EXP2_05_PIN
453
 
453
 
454
       #define LCD_BACKLIGHT_PIN            -1
454
       #define LCD_BACKLIGHT_PIN            -1
455
 
455
 
456
       #define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
456
       #define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
457
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
457
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
458
 
458
 
459
-      #define LCD_RESET_PIN         EXPA1_06_PIN  // Must be high or open for LCD to operate normally.
459
+      #define LCD_RESET_PIN          EXP1_06_PIN  // Must be high or open for LCD to operate normally.
460
 
460
 
461
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
461
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
462
         #ifndef RGB_LED_R_PIN
462
         #ifndef RGB_LED_R_PIN
463
-          #define RGB_LED_R_PIN     EXPA1_05_PIN
463
+          #define RGB_LED_R_PIN      EXP1_05_PIN
464
         #endif
464
         #endif
465
         #ifndef RGB_LED_G_PIN
465
         #ifndef RGB_LED_G_PIN
466
-          #define RGB_LED_G_PIN     EXPA1_04_PIN
466
+          #define RGB_LED_G_PIN      EXP1_04_PIN
467
         #endif
467
         #endif
468
         #ifndef RGB_LED_B_PIN
468
         #ifndef RGB_LED_B_PIN
469
-          #define RGB_LED_B_PIN     EXPA1_03_PIN
469
+          #define RGB_LED_B_PIN      EXP1_03_PIN
470
         #endif
470
         #endif
471
       #elif ENABLED(FYSETC_MINI_12864_2_1)
471
       #elif ENABLED(FYSETC_MINI_12864_2_1)
472
-        #define NEOPIXEL_PIN        EXPA1_05_PIN
472
+        #define NEOPIXEL_PIN         EXP1_05_PIN
473
       #endif
473
       #endif
474
 
474
 
475
     #else                                         // !FYSETC_MINI_12864
475
     #else                                         // !FYSETC_MINI_12864
476
 
476
 
477
       #if ENABLED(MKS_MINI_12864)
477
       #if ENABLED(MKS_MINI_12864)
478
-        #define DOGLCD_CS           EXPA1_05_PIN
479
-        #define DOGLCD_A0           EXPA1_04_PIN
480
-        #define DOGLCD_SCK          EXPA2_09_PIN
481
-        #define DOGLCD_MOSI         EXPA2_05_PIN
478
+        #define DOGLCD_CS            EXP1_05_PIN
479
+        #define DOGLCD_A0            EXP1_04_PIN
480
+        #define DOGLCD_SCK           EXP2_09_PIN
481
+        #define DOGLCD_MOSI          EXP2_05_PIN
482
         #define FORCE_SOFT_SPI
482
         #define FORCE_SOFT_SPI
483
       #endif
483
       #endif
484
 
484
 
485
       #if IS_ULTIPANEL
485
       #if IS_ULTIPANEL
486
-        #define LCD_PINS_D5         EXPA1_05_PIN
487
-        #define LCD_PINS_D6         EXPA1_04_PIN
488
-        #define LCD_PINS_D7         EXPA1_03_PIN
486
+        #define LCD_PINS_D5          EXP1_05_PIN
487
+        #define LCD_PINS_D6          EXP1_04_PIN
488
+        #define LCD_PINS_D7          EXP1_03_PIN
489
 
489
 
490
         #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
490
         #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
491
-          #define BTN_ENC_EN        EXPA1_03_PIN  // Detect the presence of the encoder
491
+          #define BTN_ENC_EN         EXP1_03_PIN  // Detect the presence of the encoder
492
         #endif
492
         #endif
493
 
493
 
494
       #endif
494
       #endif

+ 23
- 23
Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h View File

143
    */
143
    */
144
 
144
 
145
   // M1 on Driver Expansion Module
145
   // M1 on Driver Expansion Module
146
-  #define E2_STEP_PIN               EXPA2_05_PIN
147
-  #define E2_DIR_PIN                EXPA2_06_PIN
148
-  #define E2_ENABLE_PIN             EXPA2_04_PIN
146
+  #define E2_STEP_PIN                EXP2_05_PIN
147
+  #define E2_DIR_PIN                 EXP2_06_PIN
148
+  #define E2_ENABLE_PIN              EXP2_04_PIN
149
   #if !EXP_MOT_USE_EXP2_ONLY
149
   #if !EXP_MOT_USE_EXP2_ONLY
150
-    #define E2_DIAG_PIN             EXPA1_06_PIN
151
-    #define E2_CS_PIN               EXPA1_05_PIN
150
+    #define E2_DIAG_PIN              EXP1_06_PIN
151
+    #define E2_CS_PIN                EXP1_05_PIN
152
     #if HAS_TMC_UART
152
     #if HAS_TMC_UART
153
-      #define E2_SERIAL_TX_PIN      EXPA1_05_PIN
154
-      #define E2_SERIAL_RX_PIN      EXPA1_05_PIN
153
+      #define E2_SERIAL_TX_PIN       EXP1_05_PIN
154
+      #define E2_SERIAL_RX_PIN       EXP1_05_PIN
155
     #endif
155
     #endif
156
   #endif
156
   #endif
157
 
157
 
158
   // M2 on Driver Expansion Module
158
   // M2 on Driver Expansion Module
159
-  #define E3_STEP_PIN               EXPA2_08_PIN
160
-  #define E3_DIR_PIN                EXPA2_07_PIN
159
+  #define E3_STEP_PIN                EXP2_08_PIN
160
+  #define E3_DIR_PIN                 EXP2_07_PIN
161
   #if !EXP_MOT_USE_EXP2_ONLY
161
   #if !EXP_MOT_USE_EXP2_ONLY
162
-    #define E3_ENABLE_PIN           EXPA1_03_PIN
163
-    #define E3_DIAG_PIN             EXPA1_08_PIN
164
-    #define E3_CS_PIN               EXPA1_07_PIN
162
+    #define E3_ENABLE_PIN            EXP1_03_PIN
163
+    #define E3_DIAG_PIN              EXP1_08_PIN
164
+    #define E3_CS_PIN                EXP1_07_PIN
165
     #if HAS_TMC_UART
165
     #if HAS_TMC_UART
166
-      #define E3_SERIAL_TX_PIN      EXPA1_07_PIN
167
-      #define E3_SERIAL_RX_PIN      EXPA1_07_PIN
166
+      #define E3_SERIAL_TX_PIN       EXP1_07_PIN
167
+      #define E3_SERIAL_RX_PIN       EXP1_07_PIN
168
     #endif
168
     #endif
169
   #else
169
   #else
170
-    #define E3_ENABLE_PIN           EXPA2_04_PIN
170
+    #define E3_ENABLE_PIN            EXP2_04_PIN
171
   #endif
171
   #endif
172
 
172
 
173
   // M3 on Driver Expansion Module
173
   // M3 on Driver Expansion Module
174
-  #define E4_STEP_PIN               EXPA2_10_PIN
175
-  #define E4_DIR_PIN                EXPA2_09_PIN
174
+  #define E4_STEP_PIN                EXP2_10_PIN
175
+  #define E4_DIR_PIN                 EXP2_09_PIN
176
   #if !EXP_MOT_USE_EXP2_ONLY
176
   #if !EXP_MOT_USE_EXP2_ONLY
177
-    #define E4_ENABLE_PIN           EXPA1_04_PIN
178
-    #define E4_DIAG_PIN             EXPA1_10_PIN
179
-    #define E4_CS_PIN               EXPA1_09_PIN
177
+    #define E4_ENABLE_PIN            EXP1_04_PIN
178
+    #define E4_DIAG_PIN              EXP1_10_PIN
179
+    #define E4_CS_PIN                EXP1_09_PIN
180
     #if HAS_TMC_UART
180
     #if HAS_TMC_UART
181
-      #define E4_SERIAL_TX_PIN      EXPA1_09_PIN
182
-      #define E4_SERIAL_RX_PIN      EXPA1_09_PIN
181
+      #define E4_SERIAL_TX_PIN       EXP1_09_PIN
182
+      #define E4_SERIAL_RX_PIN       EXP1_09_PIN
183
     #endif
183
     #endif
184
   #else
184
   #else
185
-    #define E4_ENABLE_PIN           EXPA2_04_PIN
185
+    #define E4_ENABLE_PIN            EXP2_04_PIN
186
   #endif
186
   #endif
187
 
187
 
188
 #endif // HAS_BTT_EXP_MOT
188
 #endif // HAS_BTT_EXP_MOT

+ 28
- 28
Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h View File

190
  *                   EXP
190
  *                   EXP
191
  */
191
  */
192
 
192
 
193
-#define EXPA1_03_PIN                       P0_18
194
-#define EXPA1_04_PIN                       P0_17
195
-#define EXPA1_05_PIN                       P0_15
196
-#define EXPA1_06_PIN                       P0_20
197
-#define EXPA1_07_PIN                       -1
198
-#define EXPA1_08_PIN                       P0_19
199
-#define EXPA1_09_PIN                       P0_16
200
-#define EXPA1_10_PIN                       P2_08
193
+#define EXP1_03_PIN                        P0_18
194
+#define EXP1_04_PIN                        P0_17
195
+#define EXP1_05_PIN                        P0_15
196
+#define EXP1_06_PIN                        P0_20
197
+#define EXP1_07_PIN                        -1
198
+#define EXP1_08_PIN                        P0_19
199
+#define EXP1_09_PIN                        P0_16
200
+#define EXP1_10_PIN                        P2_08
201
 
201
 
202
 #if HAS_WIRED_LCD
202
 #if HAS_WIRED_LCD
203
 
203
 
204
   #if ENABLED(CR10_STOCKDISPLAY)
204
   #if ENABLED(CR10_STOCKDISPLAY)
205
 
205
 
206
-    #define BEEPER_PIN              EXPA1_10_PIN
206
+    #define BEEPER_PIN               EXP1_10_PIN
207
 
207
 
208
-    #define BTN_EN1                 EXPA1_08_PIN
209
-    #define BTN_EN2                 EXPA1_06_PIN
210
-    #define BTN_ENC                 EXPA1_09_PIN
208
+    #define BTN_EN1                  EXP1_08_PIN
209
+    #define BTN_EN2                  EXP1_06_PIN
210
+    #define BTN_ENC                  EXP1_09_PIN
211
 
211
 
212
-    #define LCD_PINS_RS             EXPA1_04_PIN
213
-    #define LCD_PINS_ENABLE         EXPA1_03_PIN
214
-    #define LCD_PINS_D4             EXPA1_05_PIN
212
+    #define LCD_PINS_RS              EXP1_04_PIN
213
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
214
+    #define LCD_PINS_D4              EXP1_05_PIN
215
 
215
 
216
   #elif ENABLED(ZONESTAR_LCD)                     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
216
   #elif ENABLED(ZONESTAR_LCD)                     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
217
 
217
 
218
     #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_E3_TURBO.h' for details. Comment out this line to continue."
218
     #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_E3_TURBO.h' for details. Comment out this line to continue."
219
 
219
 
220
-    #define LCD_PINS_RS             EXPA1_05_PIN
221
-    #define LCD_PINS_ENABLE         EXPA1_09_PIN
222
-    #define LCD_PINS_D4             EXPA1_04_PIN
223
-    #define LCD_PINS_D5             EXPA1_06_PIN
224
-    #define LCD_PINS_D6             EXPA1_08_PIN
225
-    #define LCD_PINS_D7             EXPA1_10_PIN
220
+    #define LCD_PINS_RS              EXP1_05_PIN
221
+    #define LCD_PINS_ENABLE          EXP1_09_PIN
222
+    #define LCD_PINS_D4              EXP1_04_PIN
223
+    #define LCD_PINS_D5              EXP1_06_PIN
224
+    #define LCD_PINS_D6              EXP1_08_PIN
225
+    #define LCD_PINS_D7              EXP1_10_PIN
226
     #define ADC_KEYPAD_PIN                 P1_23  // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
226
     #define ADC_KEYPAD_PIN                 P1_23  // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
227
 
227
 
228
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
228
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
229
 
229
 
230
-    #define BTN_EN1                 EXPA1_08_PIN
231
-    #define BTN_EN2                 EXPA1_06_PIN
232
-    #define BTN_ENC                 EXPA1_09_PIN
230
+    #define BTN_EN1                  EXP1_08_PIN
231
+    #define BTN_EN2                  EXP1_06_PIN
232
+    #define BTN_ENC                  EXP1_09_PIN
233
 
233
 
234
-    #define DOGLCD_CS               EXPA1_04_PIN
235
-    #define DOGLCD_A0               EXPA1_05_PIN
236
-    #define DOGLCD_SCK              EXPA1_10_PIN
237
-    #define DOGLCD_MOSI             EXPA1_03_PIN
234
+    #define DOGLCD_CS                EXP1_04_PIN
235
+    #define DOGLCD_A0                EXP1_05_PIN
236
+    #define DOGLCD_SCK               EXP1_10_PIN
237
+    #define DOGLCD_MOSI              EXP1_03_PIN
238
     #define FORCE_SOFT_SPI
238
     #define FORCE_SOFT_SPI
239
     #define LCD_BACKLIGHT_PIN              -1
239
     #define LCD_BACKLIGHT_PIN              -1
240
 
240
 

+ 126
- 90
Marlin/src/pins/ramps/pins_RAMPS.h View File

124
 #define X_DIR_PIN                             55
124
 #define X_DIR_PIN                             55
125
 #define X_ENABLE_PIN                          38
125
 #define X_ENABLE_PIN                          38
126
 #ifndef X_CS_PIN
126
 #ifndef X_CS_PIN
127
-  #define X_CS_PIN                            53
127
+  #define X_CS_PIN                   EXP2_07_PIN
128
 #endif
128
 #endif
129
 
129
 
130
 #define Y_STEP_PIN                            60
130
 #define Y_STEP_PIN                            60
131
 #define Y_DIR_PIN                             61
131
 #define Y_DIR_PIN                             61
132
 #define Y_ENABLE_PIN                          56
132
 #define Y_ENABLE_PIN                          56
133
 #ifndef Y_CS_PIN
133
 #ifndef Y_CS_PIN
134
-  #define Y_CS_PIN                            49
134
+  #define Y_CS_PIN                   EXP2_04_PIN
135
 #endif
135
 #endif
136
 
136
 
137
 #ifndef Z_STEP_PIN
137
 #ifndef Z_STEP_PIN
245
 //
245
 //
246
 // Misc. Functions
246
 // Misc. Functions
247
 //
247
 //
248
-#define SDSS                                  53
248
+#define SDSS                         EXP2_07_PIN
249
 #define LED_PIN                               13
249
 #define LED_PIN                               13
250
 
250
 
251
 #ifndef FILWIDTH_PIN
251
 #ifndef FILWIDTH_PIN
429
   #define E_MUX2_PIN                          44  // E1_CS_PIN
429
   #define E_MUX2_PIN                          44  // E1_CS_PIN
430
 #endif
430
 #endif
431
 
431
 
432
+//
433
+// Aux 3 GND D52 D50 5V
434
+//       NC  D53 D51 D49
435
+
436
+//
437
+// Aux 4 D16 D17 D23 D25 D27 D29 D31 D33 D35 D37 D39 D41 D43 D45 D47 D32 GND 5V
438
+//
439
+
440
+/**
441
+ * LCD adapter. Please note: These comes in two variants. The socket keys can be
442
+ * on either side, and may be backwards on some boards / displays.
443
+ *         _____                           _____
444
+ *    D37 |10 9 | D35          (MISO) D50 |10 9 | D52 (SCK)
445
+ *    D17 | 8 7 | D16                 D31 | 8 7 | D53
446
+ *    D23   6 5   D25                 D33   6 5   D51 (MOSI)
447
+ *    D27 | 4 3 | D29                 D49 | 4 3 | D41
448
+ *    GND | 2 1 | 5V                  GND | 2 1 | NC
449
+ *         -----                           -----
450
+ *         EXP1                            EXP2
451
+ */
452
+
453
+#ifndef EXP1_03_PIN
454
+  #define EXP1_03_PIN                         29
455
+  #define EXP1_04_PIN                         27
456
+  #define EXP1_05_PIN                         25
457
+  #define EXP1_06_PIN                         23
458
+  #define EXP1_07_PIN                         16
459
+  #define EXP1_08_PIN                         17
460
+  #define EXP1_09_PIN                         35
461
+  #define EXP1_10_PIN                         37
462
+
463
+  #define EXP2_03_PIN                         41
464
+  #define EXP2_04_PIN                         49
465
+  #define EXP2_05_PIN                         51
466
+  #define EXP2_06_PIN                         33
467
+  #define EXP2_07_PIN                         53
468
+  #define EXP2_08_PIN                         31
469
+  #define EXP2_09_PIN                         52
470
+  #define EXP2_10_PIN                         50
471
+#endif
472
+
432
 //////////////////////////
473
 //////////////////////////
433
 // LCDs and Controllers //
474
 // LCDs and Controllers //
434
 //////////////////////////
475
 //////////////////////////
435
 
476
 
477
+// GLCD features
478
+// Uncomment screen orientation
479
+//#define LCD_SCREEN_ROT_90
480
+//#define LCD_SCREEN_ROT_180
481
+//#define LCD_SCREEN_ROT_270
482
+
436
 #if HAS_WIRED_LCD
483
 #if HAS_WIRED_LCD
437
 
484
 
438
   //
485
   //
440
   //
487
   //
441
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
488
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
442
 
489
 
443
-    #define LCD_PINS_RS                       49  // CS chip select /SS chip slave select
444
-    #define LCD_PINS_ENABLE                   51  // SID (MOSI)
445
-    #define LCD_PINS_D4                       52  // SCK (CLK) clock
490
+    #define LCD_PINS_RS              EXP2_04_PIN  // CS chip select /SS chip slave select
491
+    #define LCD_PINS_ENABLE          EXP2_05_PIN  // SID (MOSI)
492
+    #define LCD_PINS_D4              EXP2_09_PIN  // SCK (CLK) clock
446
 
493
 
447
   #elif BOTH(IS_NEWPANEL, PANEL_ONE)
494
   #elif BOTH(IS_NEWPANEL, PANEL_ONE)
448
 
495
 
455
 
502
 
456
   #elif ENABLED(TFTGLCD_PANEL_SPI)
503
   #elif ENABLED(TFTGLCD_PANEL_SPI)
457
 
504
 
458
-    #define TFTGLCD_CS                        33
505
+    #define TFTGLCD_CS               EXP2_06_PIN
459
 
506
 
460
   #else
507
   #else
461
 
508
 
462
     #if ENABLED(CR10_STOCKDISPLAY)
509
     #if ENABLED(CR10_STOCKDISPLAY)
463
 
510
 
464
-      #define LCD_PINS_RS                     27
465
-      #define LCD_PINS_ENABLE                 29
466
-      #define LCD_PINS_D4                     25
511
+      #define LCD_PINS_RS            EXP1_04_PIN
512
+      #define LCD_PINS_ENABLE        EXP1_03_PIN
513
+      #define LCD_PINS_D4            EXP1_05_PIN
467
 
514
 
468
       #if !IS_NEWPANEL
515
       #if !IS_NEWPANEL
469
-        #define BEEPER_PIN                    37
516
+        #define BEEPER_PIN           EXP1_10_PIN
470
       #endif
517
       #endif
471
 
518
 
472
     #elif ENABLED(ZONESTAR_LCD)
519
     #elif ENABLED(ZONESTAR_LCD)
482
     #else
529
     #else
483
 
530
 
484
       #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
531
       #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
485
-        #define LCD_PINS_DC                   25  // Set as output on init
486
-        #define LCD_PINS_RS                   27  // Pull low for 1s to init
532
+        #define LCD_PINS_DC          EXP1_05_PIN  // Set as output on init
533
+        #define LCD_PINS_RS          EXP1_04_PIN  // Pull low for 1s to init
487
         // DOGM SPI LCD Support
534
         // DOGM SPI LCD Support
488
         #define DOGLCD_A0            LCD_PINS_DC
535
         #define DOGLCD_A0            LCD_PINS_DC
489
-        #define DOGLCD_CS                     16
490
-        #define DOGLCD_MOSI                   17
491
-        #define DOGLCD_SCK                    23
536
+        #define DOGLCD_CS            EXP1_07_PIN
537
+        #define DOGLCD_MOSI          EXP1_08_PIN
538
+        #define DOGLCD_SCK           EXP1_06_PIN
492
       #else
539
       #else
493
-        #define LCD_PINS_RS                   16
494
-        #define LCD_PINS_ENABLE               17
495
-        #define LCD_PINS_D4                   23
496
-        #define LCD_PINS_D5                   25
497
-        #define LCD_PINS_D6                   27
540
+        #define LCD_PINS_RS          EXP1_07_PIN
541
+        #define LCD_PINS_ENABLE      EXP1_08_PIN
542
+        #define LCD_PINS_D4          EXP1_06_PIN
543
+        #define LCD_PINS_D5          EXP1_05_PIN
544
+        #define LCD_PINS_D6          EXP1_04_PIN
498
       #endif
545
       #endif
499
 
546
 
500
-      #define LCD_PINS_D7                     29
547
+      #define LCD_PINS_D7            EXP1_03_PIN
501
 
548
 
502
       #if !IS_NEWPANEL
549
       #if !IS_NEWPANEL
503
-        #define BEEPER_PIN                    33
550
+        #define BEEPER_PIN           EXP2_06_PIN
504
       #endif
551
       #endif
505
 
552
 
506
     #endif
553
     #endif
511
       //#define SHIFT_CLK_PIN                 38
558
       //#define SHIFT_CLK_PIN                 38
512
       //#define SHIFT_LD_PIN                  42
559
       //#define SHIFT_LD_PIN                  42
513
       //#define SHIFT_OUT_PIN                 40
560
       //#define SHIFT_OUT_PIN                 40
514
-      //#define SHIFT_EN_PIN                  17
561
+      //#define SHIFT_EN_PIN         EXP1_08_PIN
515
     #endif
562
     #endif
516
 
563
 
517
   #endif
564
   #endif
527
 
574
 
528
     #if IS_RRD_SC
575
     #if IS_RRD_SC
529
 
576
 
530
-      #define BEEPER_PIN                      37
577
+      #define BEEPER_PIN             EXP1_10_PIN
531
 
578
 
532
       #if ENABLED(CR10_STOCKDISPLAY)
579
       #if ENABLED(CR10_STOCKDISPLAY)
533
-        #define BTN_EN1                       17
534
-        #define BTN_EN2                       23
580
+        #define BTN_EN1              EXP1_08_PIN
581
+        #define BTN_EN2              EXP1_06_PIN
535
       #else
582
       #else
536
-        #define BTN_EN1                       31
537
-        #define BTN_EN2                       33
583
+        #define BTN_EN1              EXP2_08_PIN
584
+        #define BTN_EN2              EXP2_06_PIN
538
       #endif
585
       #endif
539
 
586
 
540
-      #define BTN_ENC                         35
587
+      #define BTN_ENC                EXP1_09_PIN
541
       #ifndef SD_DETECT_PIN
588
       #ifndef SD_DETECT_PIN
542
-        #define SD_DETECT_PIN                 49
589
+        #define SD_DETECT_PIN        EXP2_04_PIN
543
       #endif
590
       #endif
544
       #ifndef KILL_PIN
591
       #ifndef KILL_PIN
545
-        #define KILL_PIN                      41
592
+        #define KILL_PIN             EXP2_03_PIN
546
       #endif
593
       #endif
547
 
594
 
548
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
595
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
562
       #define BTN_EN2                         43
609
       #define BTN_EN2                         43
563
       #define BTN_ENC                         32
610
       #define BTN_ENC                         32
564
       #define LCD_SDSS                      SDSS
611
       #define LCD_SDSS                      SDSS
565
-      #define KILL_PIN                        41
612
+      #define KILL_PIN               EXP2_03_PIN
566
 
613
 
567
     #elif ENABLED(LCD_I2C_VIKI)
614
     #elif ENABLED(LCD_I2C_VIKI)
568
 
615
 
571
       #define BTN_ENC                         -1
618
       #define BTN_ENC                         -1
572
 
619
 
573
       #define LCD_SDSS                      SDSS
620
       #define LCD_SDSS                      SDSS
574
-      #define SD_DETECT_PIN                   49
621
+      #define SD_DETECT_PIN          EXP2_04_PIN
575
 
622
 
576
     #elif ANY(VIKI2, miniVIKI)
623
     #elif ANY(VIKI2, miniVIKI)
577
 
624
 
579
       #define DOGLCD_A0                       44
626
       #define DOGLCD_A0                       44
580
       #define LCD_SCREEN_ROT_180
627
       #define LCD_SCREEN_ROT_180
581
 
628
 
582
-      #define BEEPER_PIN                      33
629
+      #define BEEPER_PIN             EXP2_06_PIN
583
       #define STAT_LED_RED_PIN                32
630
       #define STAT_LED_RED_PIN                32
584
-      #define STAT_LED_BLUE_PIN               35
631
+      #define STAT_LED_BLUE_PIN      EXP1_09_PIN
585
 
632
 
586
       #define BTN_EN1                         22
633
       #define BTN_EN1                         22
587
       #define BTN_EN2                          7
634
       #define BTN_EN2                          7
588
       #define BTN_ENC                         39
635
       #define BTN_ENC                         39
589
 
636
 
590
       #define SD_DETECT_PIN                   -1  // Pin 49 for display SD interface, 72 for easy adapter board
637
       #define SD_DETECT_PIN                   -1  // Pin 49 for display SD interface, 72 for easy adapter board
591
-      #define KILL_PIN                        31
638
+      #define KILL_PIN               EXP2_08_PIN
592
 
639
 
593
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
640
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
594
 
641
 
595
-      #define DOGLCD_CS                       29
596
-      #define DOGLCD_A0                       27
642
+      #define DOGLCD_CS              EXP1_03_PIN
643
+      #define DOGLCD_A0              EXP1_04_PIN
597
 
644
 
598
-      #define BEEPER_PIN                      23
599
-      #define LCD_BACKLIGHT_PIN               33
645
+      #define BEEPER_PIN             EXP1_06_PIN
646
+      #define LCD_BACKLIGHT_PIN      EXP2_06_PIN
600
 
647
 
601
-      #define BTN_EN1                         35
602
-      #define BTN_EN2                         37
603
-      #define BTN_ENC                         31
648
+      #define BTN_EN1                EXP1_09_PIN
649
+      #define BTN_EN2                EXP1_10_PIN
650
+      #define BTN_ENC                EXP2_08_PIN
604
 
651
 
605
       #define LCD_SDSS                      SDSS
652
       #define LCD_SDSS                      SDSS
606
-      #define SD_DETECT_PIN                   49
607
-      #define KILL_PIN                        41
653
+      #define SD_DETECT_PIN          EXP2_04_PIN
654
+      #define KILL_PIN               EXP2_03_PIN
608
 
655
 
609
     #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
656
     #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
610
 
657
 
611
-      #define BEEPER_PIN                      37
612
-      #define BTN_ENC                         35
613
-      #define SD_DETECT_PIN                   49
658
+      #define BEEPER_PIN             EXP1_10_PIN
659
+      #define BTN_ENC                EXP1_09_PIN
660
+      #define SD_DETECT_PIN          EXP2_04_PIN
614
 
661
 
615
       #ifndef KILL_PIN
662
       #ifndef KILL_PIN
616
-        #define KILL_PIN                      41
663
+        #define KILL_PIN             EXP2_03_PIN
617
       #endif
664
       #endif
618
 
665
 
619
       #if ENABLED(MKS_MINI_12864)
666
       #if ENABLED(MKS_MINI_12864)
620
 
667
 
621
-        #define DOGLCD_A0                     27
622
-        #define DOGLCD_CS                     25
623
-
624
-        // GLCD features
625
-        // Uncomment screen orientation
626
-        //#define LCD_SCREEN_ROT_90
627
-        //#define LCD_SCREEN_ROT_180
628
-        //#define LCD_SCREEN_ROT_270
668
+        #define DOGLCD_A0            EXP1_04_PIN
669
+        #define DOGLCD_CS            EXP1_05_PIN
629
 
670
 
630
         // not connected to a pin
671
         // not connected to a pin
631
         #define LCD_BACKLIGHT_PIN             -1  // 65 (MKS mini12864 can't adjust backlight by software!)
672
         #define LCD_BACKLIGHT_PIN             -1  // 65 (MKS mini12864 can't adjust backlight by software!)
632
 
673
 
633
-        #define BTN_EN1                       31
634
-        #define BTN_EN2                       33
674
+        #define BTN_EN1              EXP2_08_PIN
675
+        #define BTN_EN2              EXP2_06_PIN
635
 
676
 
636
       #elif ENABLED(FYSETC_MINI_12864)
677
       #elif ENABLED(FYSETC_MINI_12864)
637
 
678
 
638
         // From https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
679
         // From https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
639
 
680
 
640
-        #define DOGLCD_A0                     16
641
-        #define DOGLCD_CS                     17
681
+        #define DOGLCD_A0            EXP1_07_PIN
682
+        #define DOGLCD_CS            EXP1_08_PIN
642
 
683
 
643
-        #define BTN_EN1                       33
644
-        #define BTN_EN2                       31
684
+        #define BTN_EN1              EXP2_06_PIN
685
+        #define BTN_EN2              EXP2_08_PIN
645
 
686
 
646
         //#define FORCE_SOFT_SPI                  // Use this if default of hardware SPI causes display problems
687
         //#define FORCE_SOFT_SPI                  // Use this if default of hardware SPI causes display problems
647
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
688
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
648
 
689
 
649
-        #define LCD_RESET_PIN                 23  // Must be high or open for LCD to operate normally.
690
+        #define LCD_RESET_PIN        EXP1_06_PIN  // Must be high or open for LCD to operate normally.
650
 
691
 
651
         #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
692
         #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
652
           #ifndef RGB_LED_R_PIN
693
           #ifndef RGB_LED_R_PIN
653
-            #define RGB_LED_R_PIN             25
694
+            #define RGB_LED_R_PIN    EXP1_05_PIN
654
           #endif
695
           #endif
655
           #ifndef RGB_LED_G_PIN
696
           #ifndef RGB_LED_G_PIN
656
-            #define RGB_LED_G_PIN             27
697
+            #define RGB_LED_G_PIN    EXP1_04_PIN
657
           #endif
698
           #endif
658
           #ifndef RGB_LED_B_PIN
699
           #ifndef RGB_LED_B_PIN
659
-            #define RGB_LED_B_PIN             29
700
+            #define RGB_LED_B_PIN    EXP1_03_PIN
660
           #endif
701
           #endif
661
         #elif ENABLED(FYSETC_MINI_12864_2_1)
702
         #elif ENABLED(FYSETC_MINI_12864_2_1)
662
-          #define NEOPIXEL_PIN                25
703
+          #define NEOPIXEL_PIN       EXP1_05_PIN
663
         #endif
704
         #endif
664
 
705
 
665
       #endif
706
       #endif
673
       #define DOGLCD_A0                       44
714
       #define DOGLCD_A0                       44
674
       #define DOGLCD_CS                       66
715
       #define DOGLCD_CS                       66
675
 
716
 
676
-      // GLCD features
677
-      // Uncomment screen orientation
678
-      //#define LCD_SCREEN_ROT_90
679
-      //#define LCD_SCREEN_ROT_180
680
-      //#define LCD_SCREEN_ROT_270
681
-
682
       #define BTN_EN1                         40
717
       #define BTN_EN1                         40
683
       #define BTN_EN2                         63
718
       #define BTN_EN2                         63
684
       #define BTN_ENC                         59
719
       #define BTN_ENC                         59
685
 
720
 
686
-      #define SD_DETECT_PIN                   49
721
+      #define SD_DETECT_PIN          EXP2_04_PIN
687
       #define KILL_PIN                        64
722
       #define KILL_PIN                        64
688
 
723
 
689
     #elif ENABLED(ZONESTAR_LCD)
724
     #elif ENABLED(ZONESTAR_LCD)
699
 
734
 
700
     #elif IS_TFTGLCD_PANEL
735
     #elif IS_TFTGLCD_PANEL
701
 
736
 
702
-      #define SD_DETECT_PIN                   49
737
+      #define SD_DETECT_PIN          EXP2_04_PIN
703
 
738
 
704
     #else
739
     #else
705
 
740
 
706
       // Beeper on AUX-4
741
       // Beeper on AUX-4
707
-      #define BEEPER_PIN                      33
742
+      #define BEEPER_PIN             EXP2_06_PIN
708
 
743
 
709
       // Buttons are directly attached to AUX-2
744
       // Buttons are directly attached to AUX-2
710
       #if ENABLED(PANEL_ONE)
745
       #if ENABLED(PANEL_ONE)
711
         #define BTN_EN1                       59  // AUX2 PIN 3
746
         #define BTN_EN1                       59  // AUX2 PIN 3
712
         #define BTN_EN2                       63  // AUX2 PIN 4
747
         #define BTN_EN2                       63  // AUX2 PIN 4
713
-        #define BTN_ENC                       49  // AUX3 PIN 7
748
+        #define BTN_ENC              EXP2_04_PIN
714
       #else
749
       #else
715
-        #define BTN_EN1                       37
716
-        #define BTN_EN2                       35
717
-        #define BTN_ENC                       31
750
+        #define BTN_EN1              EXP1_10_PIN
751
+        #define BTN_EN2              EXP1_09_PIN
752
+        #define BTN_ENC              EXP2_08_PIN
718
       #endif
753
       #endif
719
 
754
 
720
       #if ENABLED(G3D_PANEL)
755
       #if ENABLED(G3D_PANEL)
721
-        #define SD_DETECT_PIN                 49
722
-        #define KILL_PIN                      41
756
+        #define SD_DETECT_PIN        EXP2_04_PIN
757
+        #define KILL_PIN             EXP2_03_PIN
723
       #endif
758
       #endif
724
 
759
 
725
     #endif
760
     #endif
746
 
781
 
747
   #error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_RAMPS.h' for details. Comment out this line to continue."
782
   #error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_RAMPS.h' for details. Comment out this line to continue."
748
 
783
 
749
-  /** FYSETC TFT TFT81050 display pinout
784
+  /**
785
+   * FYSETC TFT-81050 display pinout
750
    *
786
    *
751
    *               Board                                     Display
787
    *               Board                                     Display
752
    *               _____                                     _____
788
    *               _____                                     _____
771
    *   EXP2-7 ----------- EXP1-4
807
    *   EXP2-7 ----------- EXP1-4
772
    *   EXP2-8 ----------- EXP1-3
808
    *   EXP2-8 ----------- EXP1-3
773
    *   EXP2-1 ----------- EXP1-2
809
    *   EXP2-1 ----------- EXP1-2
774
-   *  EXP1-10 ----------- EXP1-1
810
+   *   EXP1-10 ---------- EXP1-1
775
    *
811
    *
776
    *  NOTE: The MISO pin should not get a 5V signal.
812
    *  NOTE: The MISO pin should not get a 5V signal.
777
    *        To fix, insert a 1N4148 diode in the MISO line.
813
    *        To fix, insert a 1N4148 diode in the MISO line.
778
    */
814
    */
779
 
815
 
780
-  #define BEEPER_PIN                          37
816
+  #define BEEPER_PIN                 EXP1_10_PIN
781
 
817
 
782
-  #define SD_DETECT_PIN                       49
818
+  #define SD_DETECT_PIN              EXP2_04_PIN
783
 
819
 
784
-  #define CLCD_MOD_RESET                      31
785
-  #define CLCD_SPI_CS                         33
820
+  #define CLCD_MOD_RESET             EXP2_08_PIN
821
+  #define CLCD_SPI_CS                EXP2_06_PIN
786
 #endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050
822
 #endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050

+ 67
- 67
Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h View File

268
  *               EXP2                                              EXP1
268
  *               EXP2                                              EXP1
269
  */
269
  */
270
 
270
 
271
-#define EXPA1_03_PIN                        PG7
272
-#define EXPA1_04_PIN                        PG6
273
-#define EXPA1_05_PIN                        PG3
274
-#define EXPA1_06_PIN                        PG2
275
-#define EXPA1_07_PIN                        PD10
276
-#define EXPA1_08_PIN                        PD11
277
-#define EXPA1_09_PIN                        PA8
278
-#define EXPA1_10_PIN                        PG4
279
-
280
-#define EXPA2_03_PIN                        -1
281
-#define EXPA2_04_PIN                        PF12
282
-#define EXPA2_05_PIN                        PB15
283
-#define EXPA2_06_PIN                        PF11
284
-#define EXPA2_07_PIN                        PB12
285
-#define EXPA2_08_PIN                        PG10
286
-#define EXPA2_09_PIN                        PB13
287
-#define EXPA2_10_PIN                        PB14
271
+#define EXP1_03_PIN                         PG7
272
+#define EXP1_04_PIN                         PG6
273
+#define EXP1_05_PIN                         PG3
274
+#define EXP1_06_PIN                         PG2
275
+#define EXP1_07_PIN                         PD10
276
+#define EXP1_08_PIN                         PD11
277
+#define EXP1_09_PIN                         PA8
278
+#define EXP1_10_PIN                         PG4
279
+
280
+#define EXP2_03_PIN                         -1
281
+#define EXP2_04_PIN                         PF12
282
+#define EXP2_05_PIN                         PB15
283
+#define EXP2_06_PIN                         PF11
284
+#define EXP2_07_PIN                         PB12
285
+#define EXP2_08_PIN                         PG10
286
+#define EXP2_09_PIN                         PB13
287
+#define EXP2_10_PIN                         PB14
288
 
288
 
289
 //
289
 //
290
 // Onboard SD card
290
 // Onboard SD card
292
 //
292
 //
293
 #if SD_CONNECTION_IS(LCD)
293
 #if SD_CONNECTION_IS(LCD)
294
 
294
 
295
-  #define SD_DETECT_PIN             EXPA2_04_PIN
296
-  #define SDSS                      EXPA2_07_PIN
295
+  #define SD_DETECT_PIN              EXP2_04_PIN
296
+  #define SDSS                       EXP2_07_PIN
297
 
297
 
298
 #elif SD_CONNECTION_IS(ONBOARD)
298
 #elif SD_CONNECTION_IS(ONBOARD)
299
 
299
 
325
    */
325
    */
326
 
326
 
327
   // M1 on Driver Expansion Module
327
   // M1 on Driver Expansion Module
328
-  #define E3_STEP_PIN               EXPA2_05_PIN
329
-  #define E3_DIR_PIN                EXPA2_06_PIN
330
-  #define E3_ENABLE_PIN             EXPA2_04_PIN
331
-  #define E3_DIAG_PIN               EXPA1_06_PIN
332
-  #define E3_CS_PIN                 EXPA1_05_PIN
328
+  #define E3_STEP_PIN                EXP2_05_PIN
329
+  #define E3_DIR_PIN                 EXP2_06_PIN
330
+  #define E3_ENABLE_PIN              EXP2_04_PIN
331
+  #define E3_DIAG_PIN                EXP1_06_PIN
332
+  #define E3_CS_PIN                  EXP1_05_PIN
333
   #if HAS_TMC_UART
333
   #if HAS_TMC_UART
334
-    #define E3_SERIAL_TX_PIN        EXPA1_05_PIN
335
-    #define E3_SERIAL_RX_PIN        EXPA1_05_PIN
334
+    #define E3_SERIAL_TX_PIN         EXP1_05_PIN
335
+    #define E3_SERIAL_RX_PIN         EXP1_05_PIN
336
   #endif
336
   #endif
337
 
337
 
338
   // M2 on Driver Expansion Module
338
   // M2 on Driver Expansion Module
339
-  #define E4_STEP_PIN               EXPA2_08_PIN
340
-  #define E4_DIR_PIN                EXPA2_07_PIN
341
-  #define E4_ENABLE_PIN             EXPA1_03_PIN
342
-  #define E4_DIAG_PIN               EXPA1_08_PIN
343
-  #define E4_CS_PIN                 EXPA1_07_PIN
339
+  #define E4_STEP_PIN                EXP2_08_PIN
340
+  #define E4_DIR_PIN                 EXP2_07_PIN
341
+  #define E4_ENABLE_PIN              EXP1_03_PIN
342
+  #define E4_DIAG_PIN                EXP1_08_PIN
343
+  #define E4_CS_PIN                  EXP1_07_PIN
344
   #if HAS_TMC_UART
344
   #if HAS_TMC_UART
345
-    #define E4_SERIAL_TX_PIN        EXPA1_07_PIN
346
-    #define E4_SERIAL_RX_PIN        EXPA1_07_PIN
345
+    #define E4_SERIAL_TX_PIN         EXP1_07_PIN
346
+    #define E4_SERIAL_RX_PIN         EXP1_07_PIN
347
   #endif
347
   #endif
348
 
348
 
349
   // M3 on Driver Expansion Module
349
   // M3 on Driver Expansion Module
350
-  #define E5_STEP_PIN               EXPA2_10_PIN
351
-  #define E5_DIR_PIN                EXPA2_09_PIN
352
-  #define E5_ENABLE_PIN             EXPA1_04_PIN
353
-  #define E5_DIAG_PIN               EXPA1_10_PIN
354
-  #define E5_CS_PIN                 EXPA1_09_PIN
350
+  #define E5_STEP_PIN                EXP2_10_PIN
351
+  #define E5_DIR_PIN                 EXP2_09_PIN
352
+  #define E5_ENABLE_PIN              EXP1_04_PIN
353
+  #define E5_DIAG_PIN                EXP1_10_PIN
354
+  #define E5_CS_PIN                  EXP1_09_PIN
355
   #if HAS_TMC_UART
355
   #if HAS_TMC_UART
356
-    #define E5_SERIAL_TX_PIN        EXPA1_09_PIN
357
-    #define E5_SERIAL_RX_PIN        EXPA1_09_PIN
356
+    #define E5_SERIAL_TX_PIN         EXP1_09_PIN
357
+    #define E5_SERIAL_RX_PIN         EXP1_09_PIN
358
   #endif
358
   #endif
359
 
359
 
360
 #endif // BTT_MOTOR_EXPANSION
360
 #endif // BTT_MOTOR_EXPANSION
365
 #if IS_TFTGLCD_PANEL
365
 #if IS_TFTGLCD_PANEL
366
 
366
 
367
   #if ENABLED(TFTGLCD_PANEL_SPI)
367
   #if ENABLED(TFTGLCD_PANEL_SPI)
368
-    #define TFTGLCD_CS              EXPA2_08_PIN
368
+    #define TFTGLCD_CS               EXP2_08_PIN
369
   #endif
369
   #endif
370
 
370
 
371
 #elif HAS_WIRED_LCD
371
 #elif HAS_WIRED_LCD
372
 
372
 
373
-  #define BEEPER_PIN                EXPA1_10_PIN
374
-  #define BTN_ENC                   EXPA1_09_PIN
373
+  #define BEEPER_PIN                 EXP1_10_PIN
374
+  #define BTN_ENC                    EXP1_09_PIN
375
 
375
 
376
   #if ENABLED(CR10_STOCKDISPLAY)
376
   #if ENABLED(CR10_STOCKDISPLAY)
377
 
377
 
378
-    #define LCD_PINS_RS             EXPA1_04_PIN
378
+    #define LCD_PINS_RS              EXP1_04_PIN
379
 
379
 
380
-    #define BTN_EN1                 EXPA1_08_PIN
381
-    #define BTN_EN2                 EXPA1_06_PIN
380
+    #define BTN_EN1                  EXP1_08_PIN
381
+    #define BTN_EN2                  EXP1_06_PIN
382
 
382
 
383
-    #define LCD_PINS_ENABLE         EXPA1_03_PIN
384
-    #define LCD_PINS_D4             EXPA1_05_PIN
383
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
384
+    #define LCD_PINS_D4              EXP1_05_PIN
385
 
385
 
386
     // CR10_STOCKDISPLAY default timing is too fast
386
     // CR10_STOCKDISPLAY default timing is too fast
387
     #undef BOARD_ST7920_DELAY_1
387
     #undef BOARD_ST7920_DELAY_1
390
 
390
 
391
   #elif ENABLED(MKS_MINI_12864)
391
   #elif ENABLED(MKS_MINI_12864)
392
 
392
 
393
-    #define DOGLCD_A0               EXPA1_04_PIN
394
-    #define DOGLCD_CS               EXPA1_05_PIN
395
-    #define BTN_EN1                 EXPA2_08_PIN
396
-    #define BTN_EN2                 EXPA2_06_PIN
393
+    #define DOGLCD_A0                EXP1_04_PIN
394
+    #define DOGLCD_CS                EXP1_05_PIN
395
+    #define BTN_EN1                  EXP2_08_PIN
396
+    #define BTN_EN2                  EXP2_06_PIN
397
 
397
 
398
   #else
398
   #else
399
 
399
 
400
-    #define LCD_PINS_RS             EXPA1_07_PIN
400
+    #define LCD_PINS_RS              EXP1_07_PIN
401
 
401
 
402
-    #define BTN_EN1                 EXPA2_08_PIN
403
-    #define BTN_EN2                 EXPA2_06_PIN
402
+    #define BTN_EN1                  EXP2_08_PIN
403
+    #define BTN_EN2                  EXP2_06_PIN
404
 
404
 
405
-    #define LCD_PINS_ENABLE         EXPA1_08_PIN
406
-    #define LCD_PINS_D4             EXPA1_06_PIN
405
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
406
+    #define LCD_PINS_D4              EXP1_06_PIN
407
 
407
 
408
     #if ENABLED(FYSETC_MINI_12864)
408
     #if ENABLED(FYSETC_MINI_12864)
409
-      #define DOGLCD_CS             EXPA1_08_PIN
410
-      #define DOGLCD_A0             EXPA1_07_PIN
409
+      #define DOGLCD_CS              EXP1_08_PIN
410
+      #define DOGLCD_A0              EXP1_07_PIN
411
       //#define LCD_BACKLIGHT_PIN           -1
411
       //#define LCD_BACKLIGHT_PIN           -1
412
-      #define LCD_RESET_PIN         EXPA1_06_PIN  // Must be high or open for LCD to operate normally.
412
+      #define LCD_RESET_PIN          EXP1_06_PIN  // Must be high or open for LCD to operate normally.
413
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
413
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
414
         #ifndef RGB_LED_R_PIN
414
         #ifndef RGB_LED_R_PIN
415
-          #define RGB_LED_R_PIN     EXPA1_05_PIN
415
+          #define RGB_LED_R_PIN      EXP1_05_PIN
416
         #endif
416
         #endif
417
         #ifndef RGB_LED_G_PIN
417
         #ifndef RGB_LED_G_PIN
418
-          #define RGB_LED_G_PIN     EXPA1_04_PIN
418
+          #define RGB_LED_G_PIN      EXP1_04_PIN
419
         #endif
419
         #endif
420
         #ifndef RGB_LED_B_PIN
420
         #ifndef RGB_LED_B_PIN
421
-          #define RGB_LED_B_PIN     EXPA1_03_PIN
421
+          #define RGB_LED_B_PIN      EXP1_03_PIN
422
         #endif
422
         #endif
423
       #elif ENABLED(FYSETC_MINI_12864_2_1)
423
       #elif ENABLED(FYSETC_MINI_12864_2_1)
424
-        #define NEOPIXEL_PIN        EXPA1_05_PIN
424
+        #define NEOPIXEL_PIN         EXP1_05_PIN
425
       #endif
425
       #endif
426
     #endif // !FYSETC_MINI_12864
426
     #endif // !FYSETC_MINI_12864
427
 
427
 
428
     #if IS_ULTIPANEL
428
     #if IS_ULTIPANEL
429
-      #define LCD_PINS_D5           EXPA1_05_PIN
430
-      #define LCD_PINS_D6           EXPA1_04_PIN
431
-      #define LCD_PINS_D7           EXPA1_03_PIN
429
+      #define LCD_PINS_D5            EXP1_05_PIN
430
+      #define LCD_PINS_D6            EXP1_04_PIN
431
+      #define LCD_PINS_D7            EXP1_03_PIN
432
 
432
 
433
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
433
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
434
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
434
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder

+ 46
- 46
Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h View File

161
 *                 EXP3
161
 *                 EXP3
162
 */
162
 */
163
 
163
 
164
-#define EXPA1_03_PIN                        PB7
165
-#define EXPA1_04_PIN                        PB6
166
-#define EXPA1_05_PIN                        PB14
167
-#define EXPA1_06_PIN                        PB13
168
-#define EXPA1_07_PIN                        PB12
169
-#define EXPA1_08_PIN                        PB15
170
-#define EXPA1_09_PIN                        PC12
171
-#define EXPA1_10_PIN                        PC9
172
-
173
-#define EXPA2_03_PIN                        -1
174
-#define EXPA2_04_PIN                        PC3
175
-#define EXPA2_05_PIN                        PA7
176
-#define EXPA2_06_PIN                        PC11
177
-#define EXPA2_07_PIN                        PA4
178
-#define EXPA2_08_PIN                        PC10
179
-#define EXPA2_09_PIN                        PA5
180
-#define EXPA2_10_PIN                        PA6
164
+#define EXP1_03_PIN                         PB7
165
+#define EXP1_04_PIN                         PB6
166
+#define EXP1_05_PIN                         PB14
167
+#define EXP1_06_PIN                         PB13
168
+#define EXP1_07_PIN                         PB12
169
+#define EXP1_08_PIN                         PB15
170
+#define EXP1_09_PIN                         PC12
171
+#define EXP1_10_PIN                         PC9
172
+
173
+#define EXP2_03_PIN                         -1
174
+#define EXP2_04_PIN                         PC3
175
+#define EXP2_05_PIN                         PA7
176
+#define EXP2_06_PIN                         PC11
177
+#define EXP2_07_PIN                         PA4
178
+#define EXP2_08_PIN                         PC10
179
+#define EXP2_09_PIN                         PA5
180
+#define EXP2_10_PIN                         PA6
181
 
181
 
182
 #if HAS_WIRED_LCD
182
 #if HAS_WIRED_LCD
183
 
183
 
184
-  #define BEEPER_PIN                EXPA1_10_PIN
185
-  #define BTN_ENC                   EXPA1_09_PIN
184
+  #define BEEPER_PIN                 EXP1_10_PIN
185
+  #define BTN_ENC                    EXP1_09_PIN
186
 
186
 
187
   #if ENABLED(CR10_STOCKDISPLAY)
187
   #if ENABLED(CR10_STOCKDISPLAY)
188
 
188
 
189
-    #define LCD_PINS_RS             EXPA1_07_PIN
189
+    #define LCD_PINS_RS              EXP1_07_PIN
190
 
190
 
191
-    #define BTN_EN1                 EXPA2_08_PIN
192
-    #define BTN_EN2                 EXPA2_06_PIN
191
+    #define BTN_EN1                  EXP2_08_PIN
192
+    #define BTN_EN2                  EXP2_06_PIN
193
 
193
 
194
-    #define LCD_PINS_ENABLE         EXPA1_08_PIN
195
-    #define LCD_PINS_D4             EXPA1_06_PIN
194
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
195
+    #define LCD_PINS_D4              EXP1_06_PIN
196
 
196
 
197
     // CR10_STOCKDISPLAY default timing is too fast
197
     // CR10_STOCKDISPLAY default timing is too fast
198
     #undef BOARD_ST7920_DELAY_1
198
     #undef BOARD_ST7920_DELAY_1
201
 
201
 
202
   #elif ENABLED(MKS_MINI_12864)
202
   #elif ENABLED(MKS_MINI_12864)
203
 
203
 
204
-    #define DOGLCD_A0               EXPA1_04_PIN
205
-    #define DOGLCD_CS               EXPA1_05_PIN
206
-    #define BTN_EN1                 EXPA2_08_PIN
207
-    #define BTN_EN2                 EXPA2_06_PIN
204
+    #define DOGLCD_A0                EXP1_04_PIN
205
+    #define DOGLCD_CS                EXP1_05_PIN
206
+    #define BTN_EN1                  EXP2_08_PIN
207
+    #define BTN_EN2                  EXP2_06_PIN
208
 
208
 
209
   #else
209
   #else
210
 
210
 
211
-    #define LCD_PINS_RS             EXPA1_07_PIN
211
+    #define LCD_PINS_RS              EXP1_07_PIN
212
 
212
 
213
-    #define BTN_EN1                 EXPA2_06_PIN
214
-    #define BTN_EN2                 EXPA2_08_PIN
213
+    #define BTN_EN1                  EXP2_06_PIN
214
+    #define BTN_EN2                  EXP2_08_PIN
215
 
215
 
216
-    #define LCD_PINS_ENABLE         EXPA1_08_PIN
217
-    #define LCD_PINS_D4             EXPA1_06_PIN
216
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
217
+    #define LCD_PINS_D4              EXP1_06_PIN
218
 
218
 
219
     #if ENABLED(FYSETC_MINI_12864)
219
     #if ENABLED(FYSETC_MINI_12864)
220
-      #define DOGLCD_CS             EXPA1_08_PIN
221
-      #define DOGLCD_A0             EXPA1_07_PIN
220
+      #define DOGLCD_CS              EXP1_08_PIN
221
+      #define DOGLCD_A0              EXP1_07_PIN
222
       //#define LCD_BACKLIGHT_PIN           -1
222
       //#define LCD_BACKLIGHT_PIN           -1
223
-      #define LCD_RESET_PIN         EXPA1_06_PIN  // Must be high or open for LCD to operate normally.
223
+      #define LCD_RESET_PIN          EXP1_06_PIN  // Must be high or open for LCD to operate normally.
224
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
224
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
225
         #ifndef RGB_LED_R_PIN
225
         #ifndef RGB_LED_R_PIN
226
-          #define RGB_LED_R_PIN     EXPA1_05_PIN
226
+          #define RGB_LED_R_PIN      EXP1_05_PIN
227
         #endif
227
         #endif
228
         #ifndef RGB_LED_G_PIN
228
         #ifndef RGB_LED_G_PIN
229
-          #define RGB_LED_G_PIN     EXPA1_04_PIN
229
+          #define RGB_LED_G_PIN      EXP1_04_PIN
230
         #endif
230
         #endif
231
         #ifndef RGB_LED_B_PIN
231
         #ifndef RGB_LED_B_PIN
232
-          #define RGB_LED_B_PIN     EXPA1_03_PIN
232
+          #define RGB_LED_B_PIN      EXP1_03_PIN
233
         #endif
233
         #endif
234
       #elif ENABLED(FYSETC_MINI_12864_2_1)
234
       #elif ENABLED(FYSETC_MINI_12864_2_1)
235
-        #define NEOPIXEL_PIN        EXPA1_05_PIN
235
+        #define NEOPIXEL_PIN         EXP1_05_PIN
236
       #endif
236
       #endif
237
     #endif // !FYSETC_MINI_12864
237
     #endif // !FYSETC_MINI_12864
238
 
238
 
239
     #if IS_ULTIPANEL
239
     #if IS_ULTIPANEL
240
-      #define LCD_PINS_D5           EXPA1_05_PIN
241
-      #define LCD_PINS_D6           EXPA1_04_PIN
242
-      #define LCD_PINS_D7           EXPA1_03_PIN
240
+      #define LCD_PINS_D5            EXP1_05_PIN
241
+      #define LCD_PINS_D6            EXP1_04_PIN
242
+      #define LCD_PINS_D7            EXP1_03_PIN
243
 
243
 
244
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
244
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
245
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
245
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
265
 #endif
265
 #endif
266
 
266
 
267
 #if ENABLED(TOUCH_UI_FTDI_EVE)
267
 #if ENABLED(TOUCH_UI_FTDI_EVE)
268
-  #define BEEPER_PIN                EXPA1_10_PIN
269
-  #define CLCD_MOD_RESET            EXPA2_08_PIN
270
-  #define CLCD_SPI_CS               EXPA2_06_PIN
268
+  #define BEEPER_PIN                 EXP1_10_PIN
269
+  #define CLCD_MOD_RESET             EXP2_08_PIN
270
+  #define CLCD_SPI_CS                EXP2_06_PIN
271
 #endif
271
 #endif

Loading…
Cancel
Save