Browse Source

Fysetc pins updates for RAMPS and SKR 1.3 (#13963)

Bob Kuhn 5 years ago
parent
commit
75eca5c4f8
2 changed files with 42 additions and 41 deletions
  1. 4
    1
      Marlin/src/pins/pins_BIGTREE_SKR_V1.3.h
  2. 38
    40
      Marlin/src/pins/pins_RAMPS.h

+ 4
- 1
Marlin/src/pins/pins_BIGTREE_SKR_V1.3.h View File

@@ -207,10 +207,13 @@
207 207
     #if ENABLED(FYSETC_MINI_12864)
208 208
       #define DOGLCD_CS    P1_18
209 209
       #define DOGLCD_A0    P1_19
210
+      #define DOGLCD_SCK   P0_15
211
+      #define DOGLCD_MOSI  P0_18
212
+      #define FORCE_SOFT_SPI
210 213
 
211 214
       #define LCD_BACKLIGHT_PIN -1
212 215
 
213
-      //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
216
+      #define FORCE_SOFT_SPI      // Use this if default of hardware SPI causes display problems
214 217
                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
215 218
 
216 219
       #define LCD_RESET_PIN P1_20   // Must be high or open for LCD to operate normally.

+ 38
- 40
Marlin/src/pins/pins_RAMPS.h View File

@@ -502,62 +502,60 @@
502 502
       #define SD_DETECT_PIN     49
503 503
       #define KILL_PIN          41
504 504
 
505
-    #elif ENABLED(MKS_MINI_12864)   // Added in Marlin 1.1.6
506
-
507
-      #define DOGLCD_A0         27
508
-      #define DOGLCD_CS         25
509
-
510
-      // GLCD features
511
-      // Uncomment screen orientation
512
-      //#define LCD_SCREEN_ROT_90
513
-      //#define LCD_SCREEN_ROT_180
514
-      //#define LCD_SCREEN_ROT_270
505
+    #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
515 506
 
516 507
       #define BEEPER_PIN        37
517
-      // not connected to a pin
518
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
519
-
520
-      #define BTN_EN1           31
521
-      #define BTN_EN2           33
522 508
       #define BTN_ENC           35
523
-
524 509
       #define SD_DETECT_PIN     49
525 510
       #define KILL_PIN          41
526 511
 
527
-    #elif ENABLED(FYSETC_MINI_12864)   // Added in Marlin 1.1.9+
512
+      #if ENABLED(MKS_MINI_12864)   // Added in Marlin 1.1.6
528 513
 
529
-      // From https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
530
-      #define BEEPER_PIN        37
514
+        #define DOGLCD_A0       27
515
+        #define DOGLCD_CS       25
531 516
 
532
-      #define DOGLCD_A0         16
533
-      #define DOGLCD_CS         17
517
+        // GLCD features
518
+        // Uncomment screen orientation
519
+        //#define LCD_SCREEN_ROT_90
520
+        //#define LCD_SCREEN_ROT_180
521
+        //#define LCD_SCREEN_ROT_270
534 522
 
535
-      #define BTN_EN1           31
536
-      #define BTN_EN2           33
537
-      #define BTN_ENC           35
523
+        // not connected to a pin
524
+        #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
538 525
 
539
-      #define SD_DETECT_PIN     49
526
+        #define BTN_EN1         31
527
+        #define BTN_EN2         33
540 528
 
529
+      #elif ENABLED(FYSETC_MINI_12864)
541 530
 
531
+        // From https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
542 532
 
543
-      //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
544
-                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
533
+        #define DOGLCD_A0       16
534
+        #define DOGLCD_CS       17
545 535
 
546
-      #define LCD_RESET_PIN     23   // Must be high or open for LCD to operate normally.
536
+        #define BTN_EN1         33
537
+        #define BTN_EN2         31
547 538
 
548
-      #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
549
-        #ifndef RGB_LED_R_PIN
550
-          #define RGB_LED_R_PIN 25
551
-        #endif
552
-        #ifndef RGB_LED_G_PIN
553
-          #define RGB_LED_G_PIN 27
554
-        #endif
555
-        #ifndef RGB_LED_B_PIN
556
-          #define RGB_LED_B_PIN 29
539
+        //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
540
+                                    //   results in LCD soft SPI mode 3, SD soft SPI mode 0
541
+
542
+        #define LCD_RESET_PIN   23   // Must be high or open for LCD to operate normally.
543
+
544
+        #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
545
+          #ifndef RGB_LED_R_PIN
546
+            #define RGB_LED_R_PIN 25
547
+          #endif
548
+          #ifndef RGB_LED_G_PIN
549
+            #define RGB_LED_G_PIN 27
550
+          #endif
551
+          #ifndef RGB_LED_B_PIN
552
+            #define RGB_LED_B_PIN 29
553
+          #endif
554
+        #elif ENABLED(FYSETC_MINI_12864_2_1)
555
+          #define NEOPIXEL_PIN    25
557 556
         #endif
558
-      #elif ENABLED(FYSETC_MINI_12864_2_1)
559
-        #define NEOPIXEL_PIN    25
560
-      #endif
557
+
558
+    #endif
561 559
 
562 560
     #elif ENABLED(MINIPANEL)
563 561
 

Loading…
Cancel
Save