Browse Source

TFT pins for BTT GTR V1

Proposed in #21772
Scott Lahteine 4 years ago
parent
commit
98e7e63240

+ 70
- 38
Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h View File

342
 #endif
342
 #endif
343
 
343
 
344
 #ifndef SDCARD_CONNECTION
344
 #ifndef SDCARD_CONNECTION
345
-  #define SDCARD_CONNECTION ONBOARD
345
+  #define SDCARD_CONNECTION              ONBOARD
346
 #endif
346
 #endif
347
 
347
 
348
 //
348
 //
352
 //
352
 //
353
 #if SD_CONNECTION_IS(LCD)
353
 #if SD_CONNECTION_IS(LCD)
354
 
354
 
355
-  #define SD_DETECT_PIN                     PB10
356
-  #define SDSS                              PB12
355
+  #define SD_DETECT_PIN              EXP2_04_PIN
356
+  #define SDSS                       EXP2_07_PIN
357
 
357
 
358
 #elif SD_CONNECTION_IS(ONBOARD)
358
 #elif SD_CONNECTION_IS(ONBOARD)
359
 
359
 
371
 #endif
371
 #endif
372
 
372
 
373
 /**
373
 /**
374
- *               -----                                             -----
375
- *           NC | · · | GND                                    5V | · · | GND
376
- *        RESET | · · | PB10(SD_DETECT)             (LCD_D7)  PG5 | · · | PG6  (LCD_D6)
377
- *   (MOSI)PB15 | · · | PH10(BTN_EN2)               (LCD_D5)  PG7 | · · | PG8  (LCD_D4)
378
- *  (SD_SS)PB12 | · · | PD10(BTN_EN1)               (LCD_RS)  PA8 | · · | PC10 (LCD_EN)
379
- *    (SCK)PB13 | · · | PB14(MISO)                 (BTN_ENC) PA15 | · · | PC11  (BEEPER)
380
- *               -----                                             -----
381
- *               EXP2                                              EXP1
374
+ *               ------                                          ------
375
+ *           NC | 1  2 | GND                                 5V | 1  2 | GND
376
+ *        RESET | 3  4 | PB10 (SD_DETECT)         (LCD_D7)  PG5 | 3  4 | PG6  (LCD_D6)
377
+ *  (MOSI) PB15 | 5  6 | PH10 (BTN_EN2)           (LCD_D5)  PG7 | 5  6 | PG8  (LCD_D4)
378
+ * (SD_SS) PB12 | 7  8 | PD10 (BTN_EN1)           (LCD_RS)  PA8 | 7  8 | PC10 (LCD_EN)
379
+ *   (SCK) PB13 | 9 10 | PB14 (MISO)             (BTN_ENC) PA15 | 9 10 | PC11 (BEEPER)
380
+ *               ------                                          ------
381
+ *                EXP2                                            EXP1
382
  */
382
  */
383
+#define EXP1_03_PIN                         PG5
384
+#define EXP1_04_PIN                         PG6
385
+#define EXP1_05_PIN                         PG7
386
+#define EXP1_06_PIN                         PG8
387
+#define EXP1_07_PIN                         PA8
388
+#define EXP1_08_PIN                         PC10
389
+#define EXP1_09_PIN                         PA15
390
+#define EXP1_10_PIN                         PC11
391
+
392
+#define EXP2_04_PIN                         PB10
393
+#define EXP2_05_PIN                         PB15
394
+#define EXP2_06_PIN                         PH10
395
+#define EXP2_07_PIN                         PB12
396
+#define EXP2_08_PIN                         PD10
397
+#define EXP2_09_PIN                         PB13
398
+#define EXP2_10_PIN                         PB14
383
 
399
 
384
 //
400
 //
385
 // LCDs and Controllers
401
 // LCDs and Controllers
386
 //
402
 //
387
-#if HAS_WIRED_LCD
388
-  #define BEEPER_PIN                        PC11
389
-  #define BTN_ENC                           PA15
403
+#if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI)
404
+
405
+  #define TFT_CS_PIN                 EXP2_07_PIN
406
+  #define TFT_A0_PIN                 EXP2_04_PIN
407
+  #define TFT_SCK_PIN                EXP2_09_PIN
408
+  #define TFT_MISO_PIN               EXP2_10_PIN
409
+  #define TFT_MOSI_PIN               EXP2_05_PIN
410
+
411
+  #define TOUCH_INT_PIN              EXP1_04_PIN
412
+  #define TOUCH_MISO_PIN             EXP1_05_PIN
413
+  #define TOUCH_MOSI_PIN             EXP1_08_PIN
414
+  #define TOUCH_SCK_PIN              EXP1_06_PIN
415
+  #define TOUCH_CS_PIN               EXP1_07_PIN
416
+  #define BTN_EN1                    EXP2_08_PIN
417
+  #define BTN_EN2                    EXP2_06_PIN
418
+
419
+#elif HAS_WIRED_LCD
420
+  #define BEEPER_PIN                 EXP1_10_PIN
421
+  #define BTN_ENC                    EXP1_09_PIN
390
 
422
 
391
   #if ENABLED(CR10_STOCKDISPLAY)
423
   #if ENABLED(CR10_STOCKDISPLAY)
392
-    #define LCD_PINS_RS                     PG6
424
+    #define LCD_PINS_RS              EXP1_04_PIN
393
 
425
 
394
-    #define BTN_EN1                         PC10
395
-    #define BTN_EN2                         PG8
426
+    #define BTN_EN1                  EXP1_08_PIN
427
+    #define BTN_EN2                  EXP1_06_PIN
396
 
428
 
397
-    #define LCD_PINS_ENABLE                 PG5
398
-    #define LCD_PINS_D4                     PG7
429
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
430
+    #define LCD_PINS_D4              EXP1_05_PIN
399
 
431
 
400
     // CR10_STOCKDISPLAY default timing is too fast
432
     // CR10_STOCKDISPLAY default timing is too fast
401
     #undef BOARD_ST7920_DELAY_1
433
     #undef BOARD_ST7920_DELAY_1
403
     #undef BOARD_ST7920_DELAY_3
435
     #undef BOARD_ST7920_DELAY_3
404
 
436
 
405
   #elif ENABLED(MKS_MINI_12864)
437
   #elif ENABLED(MKS_MINI_12864)
406
-    #define DOGLCD_A0                       PG6
407
-    #define DOGLCD_CS                       PG7
408
-    #define BTN_EN1                         PD10
409
-    #define BTN_EN2                         PH10
438
+    #define DOGLCD_A0                EXP1_04_PIN
439
+    #define DOGLCD_CS                EXP1_05_PIN
440
+    #define BTN_EN1                  EXP2_08_PIN
441
+    #define BTN_EN2                  EXP2_06_PIN
410
 
442
 
411
     #if SD_CONNECTION_IS(ONBOARD)
443
     #if SD_CONNECTION_IS(ONBOARD)
412
       #define SOFTWARE_SPI
444
       #define SOFTWARE_SPI
413
     #endif
445
     #endif
414
   #else
446
   #else
415
 
447
 
416
-    #define LCD_PINS_RS                     PA8
448
+    #define LCD_PINS_RS              EXP1_07_PIN
417
 
449
 
418
-    #define BTN_EN1                         PD10
419
-    #define BTN_EN2                         PH10
450
+    #define BTN_EN1                  EXP2_08_PIN
451
+    #define BTN_EN2                  EXP2_06_PIN
420
 
452
 
421
-    #define LCD_PINS_ENABLE                 PC10
422
-    #define LCD_PINS_D4                     PG8
453
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
454
+    #define LCD_PINS_D4              EXP1_06_PIN
423
 
455
 
424
     #if ENABLED(FYSETC_MINI_12864)
456
     #if ENABLED(FYSETC_MINI_12864)
425
-      #define DOGLCD_CS                     PC10
426
-      #define DOGLCD_A0                     PA8
457
+      #define DOGLCD_CS              EXP1_08_PIN
458
+      #define DOGLCD_A0              EXP1_07_PIN
427
 
459
 
428
       #if SD_CONNECTION_IS(ONBOARD)
460
       #if SD_CONNECTION_IS(ONBOARD)
429
         #define SOFTWARE_SPI
461
         #define SOFTWARE_SPI
430
       #endif
462
       #endif
431
 
463
 
432
       //#define LCD_BACKLIGHT_PIN           -1
464
       //#define LCD_BACKLIGHT_PIN           -1
433
-      #define LCD_RESET_PIN                 PG8   // Must be high or open for LCD to operate normally.
465
+      #define LCD_RESET_PIN          EXP1_06_PIN  // Must be high or open for LCD to operate normally.
434
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
466
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
435
         #ifndef RGB_LED_R_PIN
467
         #ifndef RGB_LED_R_PIN
436
-          #define RGB_LED_R_PIN             PG7
468
+          #define RGB_LED_R_PIN      EXP1_05_PIN
437
         #endif
469
         #endif
438
         #ifndef RGB_LED_G_PIN
470
         #ifndef RGB_LED_G_PIN
439
-          #define RGB_LED_G_PIN             PG6
471
+          #define RGB_LED_G_PIN      EXP1_04_PIN
440
         #endif
472
         #endif
441
         #ifndef RGB_LED_B_PIN
473
         #ifndef RGB_LED_B_PIN
442
-          #define RGB_LED_B_PIN             PG5
474
+          #define RGB_LED_B_PIN      EXP1_03_PIN
443
         #endif
475
         #endif
444
       #elif ENABLED(FYSETC_MINI_12864_2_1)
476
       #elif ENABLED(FYSETC_MINI_12864_2_1)
445
-        #define NEOPIXEL_PIN                PG7
477
+        #define NEOPIXEL_PIN         EXP1_05_PIN
446
       #endif
478
       #endif
447
     #endif // !FYSETC_MINI_12864
479
     #endif // !FYSETC_MINI_12864
448
 
480
 
449
     #if IS_ULTIPANEL
481
     #if IS_ULTIPANEL
450
-      #define LCD_PINS_D5                   PG7
451
-      #define LCD_PINS_D6                   PG6
452
-      #define LCD_PINS_D7                   PG5
482
+      #define LCD_PINS_D5            EXP1_05_PIN
483
+      #define LCD_PINS_D6            EXP1_04_PIN
484
+      #define LCD_PINS_D7            EXP1_03_PIN
453
 
485
 
454
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
486
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
455
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
487
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder

+ 3
- 3
Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h View File

200
 
200
 
201
 #if HOTENDS == 1
201
 #if HOTENDS == 1
202
   #if TEMP_SENSOR_PROBE
202
   #if TEMP_SENSOR_PROBE
203
-    #define TEMP_PROBE_PIN           TEMP_1_PIN
203
+    #define TEMP_PROBE_PIN            TEMP_1_PIN
204
   #elif TEMP_SENSOR_CHAMBER
204
   #elif TEMP_SENSOR_CHAMBER
205
-    #define TEMP_CHAMBER_PIN         TEMP_1_PIN
205
+    #define TEMP_CHAMBER_PIN          TEMP_1_PIN
206
   #endif
206
   #endif
207
 #endif
207
 #endif
208
 
208
 
288
 // SD Connection
288
 // SD Connection
289
 //
289
 //
290
 #ifndef SDCARD_CONNECTION
290
 #ifndef SDCARD_CONNECTION
291
-  #define SDCARD_CONNECTION LCD
291
+  #define SDCARD_CONNECTION                  LCD
292
 #endif
292
 #endif
293
 
293
 
294
 /**
294
 /**

Loading…
Cancel
Save