瀏覽代碼

🧑‍💻 Fix up some AUX / EXP pins (#23577)

Scott Lahteine 2 年之前
父節點
當前提交
8169253a7d
No account linked to committer's email address

+ 3
- 3
Marlin/src/pins/esp32/pins_MKS_TINYBEE.h 查看文件

120
 #define SD_MISO_PIN                           19
120
 #define SD_MISO_PIN                           19
121
 #define SD_SCK_PIN                            18
121
 #define SD_SCK_PIN                            18
122
 #define SDSS                                   5
122
 #define SDSS                                   5
123
-#define SD_DETECT_PIN                         34  // IO34 default is SD_DET signal(Jump to SDDET)
123
+#define SD_DETECT_PIN                         34  // IO34 default is SD_DET signal (Jump to SDDET)
124
 #define USES_SHARED_SPI                           // SPI is shared by SD card with TMC SPI drivers
124
 #define USES_SHARED_SPI                           // SPI is shared by SD card with TMC SPI drivers
125
 
125
 
126
 /**
126
 /**
177
 
177
 
178
   #elif ENABLED(MKS_MINI_12864_V3)
178
   #elif ENABLED(MKS_MINI_12864_V3)
179
 
179
 
180
+    #define LCD_PINS_DC              EXP1_07_PIN
180
     #define DOGLCD_CS                EXP1_08_PIN
181
     #define DOGLCD_CS                EXP1_08_PIN
181
-    #define DOGLCD_A0                EXP1_07_PIN
182
-    #define LCD_PINS_DC                DOGLCD_A0
182
+    #define DOGLCD_A0                LCD_PINS_DC
183
     #define LCD_BACKLIGHT_PIN                 -1
183
     #define LCD_BACKLIGHT_PIN                 -1
184
     #define LCD_RESET_PIN            EXP1_06_PIN
184
     #define LCD_RESET_PIN            EXP1_06_PIN
185
     #define NEOPIXEL_PIN             EXP1_05_PIN
185
     #define NEOPIXEL_PIN             EXP1_05_PIN

+ 43
- 13
Marlin/src/pins/esp32/pins_PANDA_common.h 查看文件

62
 #define TEMP_0_PIN                            39  // Analog Input
62
 #define TEMP_0_PIN                            39  // Analog Input
63
 #define TEMP_BED_PIN                          36  // Analog Input
63
 #define TEMP_BED_PIN                          36  // Analog Input
64
 
64
 
65
+#if ENABLED(MAX31856_PANDAPI)
66
+  #define MAX31856_CLK_PIN                    29
67
+  #define MAX31856_MISO_PIN                   24
68
+  #define MAX31856_MOSI_PIN                   28
69
+  #define MAX31856_CS_PIN                     27
70
+#endif
71
+
65
 //
72
 //
66
 // Heaters / Fans
73
 // Heaters / Fans
67
 //
74
 //
74
   #define E0_AUTO_FAN_PIN                    120  // FAN2
81
   #define E0_AUTO_FAN_PIN                    120  // FAN2
75
 #endif
82
 #endif
76
 
83
 
84
+/**            ------                              ------
85
+ * (MISO 19?) |10  9 | (18 SCK?)     (BEEPER) 129 |10  9 | 12 (^ENC)
86
+ *   (EN1) 33 | 8  7 | (5 SDSS?)     (EN)      26 | 8  7 | 27 (RS)
87
+ *   (EN2) 32   6  5 | (23 MOSI?)    (D4)      14 | 6  5   --
88
+ * (SDDET 2?) | 4  3 | (RESET)                 -- | 4  3 | --
89
+ *         -- | 2  1 | --                   (GND) | 2  1 | (5V)
90
+ *             ------                              ------
91
+ *              EXP2                                EXP1
92
+ */
93
+#define EXP1_06_PIN                           14
94
+#define EXP1_07_PIN                           27
95
+#define EXP1_08_PIN                           26
96
+#define EXP1_09_PIN                           12
97
+#define EXP1_10_PIN                          129
98
+
99
+#define EXP2_04_PIN                            2  // ?
100
+#define EXP2_05_PIN                           23  // ?
101
+#define EXP2_06_PIN                           32
102
+#define EXP2_07_PIN                            5  // ?
103
+#define EXP2_08_PIN                           33
104
+#define EXP2_09_PIN                           18  // ?
105
+#define EXP2_10_PIN                           19  // ?
106
+
77
 //
107
 //
78
-// SD card
108
+// SD Card
79
 //
109
 //
80
 #if ENABLED(SDSUPPORT)
110
 #if ENABLED(SDSUPPORT)
81
-  #define SD_MOSI_PIN                         23
82
-  #define SD_MISO_PIN                         19
83
-  #define SD_SCK_PIN                          18
84
-  #define SDSS                                 5
85
-  #define SD_DETECT_PIN                        2
111
+  #define SD_MOSI_PIN                EXP2_05_PIN
112
+  #define SD_MISO_PIN                EXP2_10_PIN
113
+  #define SD_SCK_PIN                 EXP2_09_PIN
114
+  #define SDSS                       EXP2_07_PIN
115
+  #define SD_DETECT_PIN              EXP2_04_PIN
86
 #endif
116
 #endif
87
 
117
 
88
 #if HAS_WIRED_LCD
118
 #if HAS_WIRED_LCD
89
-  #define BEEPER_PIN                         129
90
-  #define BTN_ENC                             12
119
+  #define BEEPER_PIN                 EXP1_10_PIN
91
 
120
 
92
-  #define BTN_EN1                             33
93
-  #define BTN_EN2                             32
121
+  #define BTN_ENC                    EXP1_09_PIN
122
+  #define BTN_EN1                    EXP2_08_PIN
123
+  #define BTN_EN2                    EXP2_06_PIN
94
 
124
 
95
-  #define LCD_PINS_RS                         27
96
-  #define LCD_PINS_ENABLE                     26
97
-  #define LCD_PINS_D4                         14
125
+  #define LCD_PINS_RS                EXP1_07_PIN
126
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
127
+  #define LCD_PINS_D4                EXP1_06_PIN
98
 #endif
128
 #endif

+ 1
- 1
Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h 查看文件

84
 #define E1_ENABLE_PIN                         33
84
 #define E1_ENABLE_PIN                         33
85
 
85
 
86
 //
86
 //
87
-// Filament runout
87
+// Filament Runout Sensor
88
 //
88
 //
89
 #define FIL_RUNOUT_PIN                        42  // ROT2 Connector
89
 #define FIL_RUNOUT_PIN                        42  // ROT2 Connector
90
 #define FIL_RUNOUT2_PIN                       44  // ROT1 Connector
90
 #define FIL_RUNOUT2_PIN                       44  // ROT1 Connector

+ 1
- 1
Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h 查看文件

69
 #endif
69
 #endif
70
 
70
 
71
 //
71
 //
72
-// Filament Runout Pins
72
+// Filament Runout Sensor
73
 //
73
 //
74
 #ifndef FIL_RUNOUT_PIN
74
 #ifndef FIL_RUNOUT_PIN
75
   #define FIL_RUNOUT_PIN                      49
75
   #define FIL_RUNOUT_PIN                      49

+ 95
- 55
Marlin/src/pins/ramps/pins_RAMPS.h 查看文件

120
 #define X_DIR_PIN                             55
120
 #define X_DIR_PIN                             55
121
 #define X_ENABLE_PIN                          38
121
 #define X_ENABLE_PIN                          38
122
 #ifndef X_CS_PIN
122
 #ifndef X_CS_PIN
123
-  #define X_CS_PIN                   AUX3_03_PIN
123
+  #define X_CS_PIN                            53
124
 #endif
124
 #endif
125
 
125
 
126
 #define Y_STEP_PIN                            60
126
 #define Y_STEP_PIN                            60
127
 #define Y_DIR_PIN                             61
127
 #define Y_DIR_PIN                             61
128
 #define Y_ENABLE_PIN                          56
128
 #define Y_ENABLE_PIN                          56
129
 #ifndef Y_CS_PIN
129
 #ifndef Y_CS_PIN
130
-  #define Y_CS_PIN                   AUX3_07_PIN
130
+  #define Y_CS_PIN                            49
131
 #endif
131
 #endif
132
 
132
 
133
 #ifndef Z_STEP_PIN
133
 #ifndef Z_STEP_PIN
241
 // Misc. Functions
241
 // Misc. Functions
242
 //
242
 //
243
 #ifndef SDSS
243
 #ifndef SDSS
244
-  #define SDSS                       AUX3_03_PIN
244
+  #define SDSS                       AUX3_06_PIN
245
 #endif
245
 #endif
246
 #define LED_PIN                               13
246
 #define LED_PIN                               13
247
 
247
 
423
 #endif
423
 #endif
424
 
424
 
425
 //
425
 //
426
-// AUX1 : 5V GND D2 D1
427
-//        5V GND A3 A4
428
-
426
+// AUX1    5V  GND D2  D1
427
+//          2   4   6   8
428
+//          1   3   5   7
429
+//         5V  GND A3  A4
430
+//
429
 #define AUX1_05_PIN                           57  // (A3)
431
 #define AUX1_05_PIN                           57  // (A3)
430
 #define AUX1_06_PIN                            2
432
 #define AUX1_06_PIN                            2
431
 #define AUX1_07_PIN                           58  // (A4)
433
 #define AUX1_07_PIN                           58  // (A4)
432
 #define AUX1_08_PIN                            1
434
 #define AUX1_08_PIN                            1
433
 
435
 
434
 //
436
 //
435
-// AUX2 : GND A9 D40 D42 A11
436
-//        VCC A5 A10 D44 A12
437
-
437
+// AUX2    GND A9 D40 D42 A11
438
+//          2   4   6   8  10
439
+//          1   3   5   7   9
440
+//         VCC A5 A10 D44 A12
441
+//
438
 #define AUX2_03_PIN                           59  // (A5)
442
 #define AUX2_03_PIN                           59  // (A5)
439
 #define AUX2_04_PIN                           63  // (A9)
443
 #define AUX2_04_PIN                           63  // (A9)
440
 #define AUX2_05_PIN                           64  // (A10)
444
 #define AUX2_05_PIN                           64  // (A10)
445
 #define AUX2_10_PIN                           65  // (A11)
449
 #define AUX2_10_PIN                           65  // (A11)
446
 
450
 
447
 //
451
 //
448
-// AUX3 : GND D52 D50 5V
449
-//        NC  D53 D51 D49
450
-
451
-#define AUX3_03_PIN                           53
452
-#define AUX3_04_PIN                           52
453
-#define AUX3_05_PIN                           51
454
-#define AUX3_06_PIN                           50
455
-#define AUX3_07_PIN                           49
452
+// AUX3    GND D52 D50 5V
453
+//          7   5   3   1
454
+//          8   6   4   2
455
+//         NC  D53 D51 D49
456
+//
457
+#define AUX3_02_PIN                           49
458
+#define AUX3_03_PIN                           50
459
+#define AUX3_04_PIN                           51
460
+#define AUX3_05_PIN                           52
461
+#define AUX3_06_PIN                           53
456
 
462
 
457
 //
463
 //
458
-// AUX4 : D16 D17 D23 D25 D27 D29 D31 D33 D35 D37 D39 D41 D43 D45 D47 D32 GND 5V
464
+// AUX4    5V GND D32 D47 D45 D43 D41 D39 D37 D35 D33 D31 D29 D27 D25 D23 D17 D16
459
 //
465
 //
460
-
461
 #define AUX4_03_PIN                           32
466
 #define AUX4_03_PIN                           32
462
 #define AUX4_04_PIN                           47
467
 #define AUX4_04_PIN                           47
463
 #define AUX4_05_PIN                           45
468
 #define AUX4_05_PIN                           45
476
 #define AUX4_18_PIN                           16
481
 #define AUX4_18_PIN                           16
477
 
482
 
478
 /**
483
 /**
479
- * LCD adapter. NOTE: These come in two variants. The socket keys can be
484
+ * LCD adapters come in different variants. The socket keys can be
480
  * on either side, and may be backwards on some boards / displays.
485
  * on either side, and may be backwards on some boards / displays.
481
- *         ------                     ------
482
- *    D37 |10  9 | D35    (MISO) D50 |10  9 | D52 (SCK)
483
- *    D17 | 8  7 | D16           D31 | 8  7 | D53
484
- *    D23   6  5   D25           D33   6  5   D51 (MOSI)
485
- *    D27 | 4  3 | D29           D49 | 4  3 | D41
486
- *    GND | 2  1 | 5V            GND | 2  1 | --
487
- *         ------                     ------
488
- *          EXP1                       EXP2
489
  */
486
  */
490
 #ifndef EXP1_03_PIN
487
 #ifndef EXP1_03_PIN
488
+
491
   #define EXP1_03_PIN                AUX4_13_PIN
489
   #define EXP1_03_PIN                AUX4_13_PIN
492
   #define EXP1_04_PIN                AUX4_14_PIN
490
   #define EXP1_04_PIN                AUX4_14_PIN
493
   #define EXP1_05_PIN                AUX4_15_PIN
491
   #define EXP1_05_PIN                AUX4_15_PIN
494
   #define EXP1_06_PIN                AUX4_16_PIN
492
   #define EXP1_06_PIN                AUX4_16_PIN
495
   #define EXP1_07_PIN                AUX4_18_PIN
493
   #define EXP1_07_PIN                AUX4_18_PIN
496
   #define EXP1_08_PIN                AUX4_17_PIN
494
   #define EXP1_08_PIN                AUX4_17_PIN
497
-  #define EXP1_09_PIN                AUX4_10_PIN
498
-  #define EXP1_10_PIN                AUX4_09_PIN
499
 
495
 
500
-  #define EXP2_03_PIN                AUX4_07_PIN
501
-  #define EXP2_04_PIN                AUX3_07_PIN
502
-  #define EXP2_05_PIN                AUX3_05_PIN
503
-  #define EXP2_06_PIN                AUX4_11_PIN
504
-  #define EXP2_07_PIN                AUX3_03_PIN
505
-  #define EXP2_08_PIN                AUX4_12_PIN
506
-  #define EXP2_09_PIN                AUX3_04_PIN
507
-  #define EXP2_10_PIN                AUX3_06_PIN
496
+  #define EXP2_04_PIN                AUX3_02_PIN
497
+  #define EXP2_05_PIN                AUX3_04_PIN
498
+  #define EXP2_07_PIN                AUX3_06_PIN
499
+  #define EXP2_09_PIN                AUX3_05_PIN
500
+  #define EXP2_10_PIN                AUX3_03_PIN
501
+
502
+  #if ENABLED(G3D_PANEL)
503
+    /**                  Gadgets3D Smart Adapter
504
+     *              ------                        ------
505
+     *        4-11 |10  9 | 4-12     (MISO) 3-03 |10  9 | 3-05 (SCK)
506
+     *        4-17 | 8  7 | 4-18            4-10 | 8  7 | 3-06
507
+     *        4-16   6  5 | 4-15            4-09   6  5 | 3-04 (MOSI)
508
+     *        4-14 | 4  3 | 4-13            3-02 | 4  3 | 4-07
509
+     *  (GND) 4-02 | 2  1 | 4-01 (5V)         -- | 2  1 | --
510
+     *              ------                        ------
511
+     *               EXP1                          EXP2
512
+     */
513
+    #define EXP1_09_PIN              AUX4_12_PIN
514
+    #define EXP1_10_PIN              AUX4_11_PIN
515
+
516
+    #define EXP2_03_PIN              AUX4_07_PIN
517
+    #define EXP2_06_PIN              AUX4_09_PIN
518
+    #define EXP2_08_PIN              AUX4_10_PIN
519
+
520
+  #else
521
+
522
+    /**                     Smart Adapter (c) RRD
523
+     *             ------                           ------
524
+     *       4-09 |10  9 | 4-10        (MISO) 3-03 |10  9 | 3-05 (SCK)
525
+     *       4-17 | 8  7 | 4-18               4-12 | 8  7 | 3-06
526
+     *       4-16   6  5 | 4-15               4-11   6  5 | 3-04 (MOSI)
527
+     *       4-14 | 4  3 | 4-13               3-02 | 4  3 | 4-07
528
+     * (GND) 3-07 | 2  1 | 3-01 (5V)    (GND) 3-07 | 2  1 | --
529
+     *             ------                           ------
530
+     *              EXP1                             EXP2
531
+     */
532
+    #define EXP1_09_PIN              AUX4_10_PIN
533
+    #define EXP1_10_PIN              AUX4_09_PIN
534
+
535
+    #if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
536
+      #define EXP2_03_PIN                     -1  // RESET
537
+      #define EXP2_06_PIN            AUX4_12_PIN
538
+      #define EXP2_08_PIN            AUX4_11_PIN
539
+    #else
540
+      #define EXP2_03_PIN            AUX4_07_PIN
541
+      #define EXP2_06_PIN            AUX4_11_PIN
542
+      #define EXP2_08_PIN            AUX4_12_PIN
543
+    #endif
544
+
545
+  #endif
546
+
508
 #endif
547
 #endif
509
 
548
 
510
 //////////////////////////
549
 //////////////////////////
752
       #define BTN_EN2                AUX2_04_PIN
791
       #define BTN_EN2                AUX2_04_PIN
753
       #define BTN_ENC                AUX2_03_PIN
792
       #define BTN_ENC                AUX2_03_PIN
754
 
793
 
755
-      #define SD_DETECT_PIN          AUX3_07_PIN
794
+      #define SD_DETECT_PIN          AUX3_02_PIN
756
       #define KILL_PIN               AUX2_05_PIN
795
       #define KILL_PIN               AUX2_05_PIN
757
 
796
 
758
     #elif ENABLED(ZONESTAR_LCD)
797
     #elif ENABLED(ZONESTAR_LCD)
765
 
804
 
766
     #elif ENABLED(G3D_PANEL)
805
     #elif ENABLED(G3D_PANEL)
767
 
806
 
768
-      #define BEEPER_PIN             EXP2_06_PIN
807
+      #define BEEPER_PIN             EXP1_10_PIN
769
 
808
 
770
       #define SD_DETECT_PIN          EXP2_04_PIN
809
       #define SD_DETECT_PIN          EXP2_04_PIN
771
       #define KILL_PIN               EXP2_03_PIN
810
       #define KILL_PIN               EXP2_03_PIN
772
 
811
 
773
-      #define BTN_EN1                EXP1_10_PIN
774
-      #define BTN_EN2                EXP1_09_PIN
775
-      #define BTN_ENC                EXP2_08_PIN
812
+      #define BTN_EN1                EXP2_06_PIN
813
+      #define BTN_EN2                EXP2_08_PIN
814
+      #define BTN_ENC                EXP1_09_PIN
776
 
815
 
777
     #elif IS_TFTGLCD_PANEL
816
     #elif IS_TFTGLCD_PANEL
778
 
817
 
785
       #if ENABLED(PANEL_ONE)                       // Buttons connect directly to AUX-2
824
       #if ENABLED(PANEL_ONE)                       // Buttons connect directly to AUX-2
786
         #define BTN_EN1              AUX2_03_PIN
825
         #define BTN_EN1              AUX2_03_PIN
787
         #define BTN_EN2              AUX2_04_PIN
826
         #define BTN_EN2              AUX2_04_PIN
788
-        #define BTN_ENC              AUX3_07_PIN
827
+        #define BTN_ENC              AUX3_02_PIN
789
       #else
828
       #else
790
         #define BTN_EN1              EXP1_10_PIN
829
         #define BTN_EN1              EXP1_10_PIN
791
         #define BTN_EN2              EXP1_09_PIN
830
         #define BTN_EN2              EXP1_09_PIN
819
   /**
858
   /**
820
    * FYSETC TFT-81050 display pinout
859
    * FYSETC TFT-81050 display pinout
821
    *
860
    *
822
-   *               Board                                     Display
823
-   *               ------                                    ------
824
-   *          GND |10  9 | --                            5V |10  9 | GND
825
-   *  (SD_DET) 49 | 8  7 | RESET                      RESET | 8  7 | (SD_DET)
826
-   * (BTN_EN1) 31   6  5 | 51 (MOSI)                 (MOSI)   6  5 | (LCD_CS)
827
-   * (BTN_EN2) 33 | 4  3 | 53 (SD_CS)               (SD_CS) | 4  3 | (MOD_RESET)
828
-   *    (MISO) 50 | 2  1 | 52 (SCK)                   (SCK) | 2  1 | (MISO)
829
-   *               ------                                    ------
830
-   *                EXP2                                      EXP1
861
+   *               Board                            Display
862
+   *               ------                           ------
863
+   *    (MISO) 50 |10  9 | 52 (SCK)             5V |10  9 | GND
864
+   * (BTN_EN2) 33 | 8  7 | 53 (SD_CS)        RESET | 8  7 | (SD_DET)
865
+   * (BTN_EN1) 31   6  5 | 51 (MOSI)        (MOSI)   6  5 | (LCD_CS)
866
+   *  (SD_DET) 49 | 4  3 | RESET           (SD_CS) | 4  3 | (MOD_RESET)
867
+   *          GND | 2  1 | --                (SCK) | 2  1 | (MISO)
868
+   *               ------                           ------
869
+   *                EXP2
831
    *
870
    *
832
    * Needs custom cable:
871
    * Needs custom cable:
833
    *
872
    *
852
 
891
 
853
   #define SD_DETECT_PIN              EXP2_04_PIN
892
   #define SD_DETECT_PIN              EXP2_04_PIN
854
 
893
 
855
-  #define CLCD_MOD_RESET             EXP2_08_PIN
856
-  #define CLCD_SPI_CS                EXP2_06_PIN
894
+  #define CLCD_MOD_RESET             EXP2_06_PIN
895
+  #define CLCD_SPI_CS                EXP2_08_PIN
896
+
857
 #endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050
897
 #endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050

+ 39
- 39
Marlin/src/pins/sanguino/pins_ZMIB_V2.h 查看文件

146
 #define FAN1_PIN                              -1
146
 #define FAN1_PIN                              -1
147
 
147
 
148
 //
148
 //
149
-//filament run out sensor
149
+// Filament Runout Sensor
150
 //
150
 //
151
 #if EITHER(Z6S_ZFAULT, Z6BS_ZFAULT)
151
 #if EITHER(Z6S_ZFAULT, Z6BS_ZFAULT)
152
   #define FIL_RUNOUT_PIN                      13
152
   #define FIL_RUNOUT_PIN                      13
162
 #endif
162
 #endif
163
 #define SD_DETECT_PIN                         -1
163
 #define SD_DETECT_PIN                         -1
164
 
164
 
165
-/*===================================================
166
- * ZMIB Version 1 - EXP1 Connector
167
- *   MOSI(D5)  TX1(D11)  ENA(D12)  ENC(D29/A2) 5V
168
- *   SCK(D7)   RX1(D10)  SCS(D4)   ENB(D2)     GND
169
- *===================================================
170
- * ZMIB Version 2 - EXP1 Connector
171
- *   MOSI(D5)  TX1(D11)  ENA(D12)  ENC(D29/A2) 5V
172
- *   SCK(D7)   RX1(D10)  SCS(D3)   ENB(D2)     GND
173
- *===================================================
174
- * LCD 128x64
175
- *==================================================*/
165
+/**             EXP1
166
+ *             ------
167
+ * (MOSI) D5  |10  9 | D7       (SCK)
168
+ * (CS)   D11 | 8  7 | D10      (DC/D4)
169
+ * (EN2)  D12   6  5 | D4 or D3 (EN/RS)
170
+ * (ENC)  D29 | 4  3 | D2       (EN1)
171
+ *      (GND) | 2  1 | (5V)
172
+ *             ------
173
+ */
174
+#define EXP1_03_PIN                            2
175
+#define EXP1_04_PIN                           29
176
+#ifndef IS_ZMIB_V2
177
+  #define EXP1_05_PIN                          4  // ZMIB V1
178
+#else
179
+  #define EXP1_05_PIN                          3  // ZMIB V2
180
+#endif
181
+#define EXP1_06_PIN                           12
182
+#define EXP1_07_PIN                           10
183
+#define EXP1_08_PIN                           11
184
+#define EXP1_09_PIN                            7
185
+#define EXP1_10_PIN                            5
176
 
186
 
177
 #if ENABLED(ZONESTAR_12864LCD)
187
 #if ENABLED(ZONESTAR_12864LCD)
178
   //
188
   //
179
   // LCD 128x64
189
   // LCD 128x64
180
   //
190
   //
181
-  #define LCDSCREEN_NAME  "ZONESTAR_12864LCD"
191
+  #define LCDSCREEN_NAME "ZONESTAR_12864LCD"
182
   #define FORCE_SOFT_SPI
192
   #define FORCE_SOFT_SPI
183
-  //#define LCD_SDSS                          11
184
-  #define LCD_PINS_RS                         11  // ST7920_CS_PIN    LCD_PIN_RS    (PIN4 of LCD module)
185
-  #ifdef IS_ZMIB_V2
186
-    #define LCD_PINS_ENABLE                    3  // ST7920_DAT_PIN LCD_PIN_R/W   (PIN5 of LCD module)
187
-  #else
188
-    #define LCD_PINS_ENABLE                    4  // ST7920_DAT_PIN LCD_PIN_R/W   (PIN5 of LCD module)
189
-  #endif
190
-  #define LCD_PINS_D4                         10  // ST7920_CLK_PIN LCD_PIN_ENABLE (PIN6 of LCD module)
193
+  //#define LCD_SDSS                 EXP1_08_PIN
194
+  #define LCD_PINS_RS                EXP1_08_PIN  // ST7920_CS_PIN  (LCD module pin 4)
195
+  #define LCD_PINS_ENABLE            EXP1_05_PIN  // ST7920_DAT_PIN (LCD module pin 5)
196
+  #define LCD_PINS_D4                EXP1_07_PIN  // ST7920_CLK_PIN (LCD module pin 6)
191
 
197
 
192
   #define BOARD_ST7920_DELAY_1       DELAY_2_NOP
198
   #define BOARD_ST7920_DELAY_1       DELAY_2_NOP
193
   #define BOARD_ST7920_DELAY_2       DELAY_2_NOP
199
   #define BOARD_ST7920_DELAY_2       DELAY_2_NOP
199
   //
205
   //
200
   #define LCDSCREEN_NAME "ZONESTAR 12864OLED"
206
   #define LCDSCREEN_NAME "ZONESTAR 12864OLED"
201
   #define FORCE_SOFT_SPI
207
   #define FORCE_SOFT_SPI
202
-  #ifdef IS_ZMIB_V2
203
-    #define LCD_PINS_RS                        3  // RESET
204
-  #else
205
-    #define LCD_PINS_RS                        4  // RESET
206
-  #endif
207
-  #define LCD_PINS_DC                         10  // DC
208
-  #define DOGLCD_CS                           11  // CS
208
+  #define LCD_PINS_RS                EXP1_05_PIN
209
+  #define LCD_PINS_DC                EXP1_07_PIN
210
+  #define DOGLCD_CS                  EXP1_08_PIN
211
+
209
   #if ENABLED(OLED_HW_IIC)
212
   #if ENABLED(OLED_HW_IIC)
210
     #error "Oops! can't choose HW IIC for ZMIB board!!"
213
     #error "Oops! can't choose HW IIC for ZMIB board!!"
211
-  #elif ENABLED(OLED_HW_SPI)
212
-    // HW SPI
213
-    #define DOGLCD_A0                LCD_PINS_DC  // A0 = DC
214
   #else
214
   #else
215
-    // SW SPI
216
-    #define DOGLCD_A0                LCD_PINS_DC  // A0 = DC
217
-    #define DOGLCD_MOSI             AVR_MOSI_PIN  // SDA
218
-    #define DOGLCD_SCK               AVR_SCK_PIN  // SCK
215
+    #define DOGLCD_A0                LCD_PINS_DC
216
+    #if DISABLED(OLED_HW_SPI)
217
+      #define DOGLCD_MOSI           AVR_MOSI_PIN  // Software SPI
218
+      #define DOGLCD_SCK             AVR_SCK_PIN
219
+    #endif
219
   #endif
220
   #endif
220
-
221
 #endif
221
 #endif
222
 
222
 
223
 //
223
 //
224
 // All the above are also RRDSC with rotary encoder
224
 // All the above are also RRDSC with rotary encoder
225
 //
225
 //
226
 #if IS_RRD_SC
226
 #if IS_RRD_SC
227
-  #define BTN_EN1                              2
228
-  #define BTN_EN2                             12
229
-  #define BTN_ENC                             29
227
+  #define BTN_EN1                    EXP1_03_PIN
228
+  #define BTN_EN2                    EXP1_06_PIN
229
+  #define BTN_ENC                    EXP1_04_PIN
230
   #define BEEPER_PIN                          -1
230
   #define BEEPER_PIN                          -1
231
   #define KILL_PIN                            -1
231
   #define KILL_PIN                            -1
232
 #endif
232
 #endif

+ 1
- 1
Marlin/src/pins/stm32f1/pins_GTM32_MINI.h 查看文件

186
 #ifdef GTM32_PRO_VB_USE_LCD_BEEPER
186
 #ifdef GTM32_PRO_VB_USE_LCD_BEEPER
187
   // This is pin 32 on J2 FFC40 and pin, goes to the beeper
187
   // This is pin 32 on J2 FFC40 and pin, goes to the beeper
188
   // on Geeetech's version of RepRapDiscount Smart Controller
188
   // on Geeetech's version of RepRapDiscount Smart Controller
189
-  // (e.g. on Rostock 301)
189
+  // (e.g., on Rostock 301)
190
   #define BEEPER_PIN                        PE12
190
   #define BEEPER_PIN                        PE12
191
 #else
191
 #else
192
   // This is the beeper on the board itself
192
   // This is the beeper on the board itself

+ 1
- 1
Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h 查看文件

125
 //#define TEMP_0_CS_PIN                     PE6   // TC2 - CS2
125
 //#define TEMP_0_CS_PIN                     PE6   // TC2 - CS2
126
 
126
 
127
 //
127
 //
128
-// Filament runout sensor
128
+// Filament Runout Sensor
129
 //
129
 //
130
 #define FIL_RUNOUT_PIN                      PF11  // MT_DET
130
 #define FIL_RUNOUT_PIN                      PF11  // MT_DET
131
 
131
 

+ 2
- 2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h 查看文件

315
     #endif
315
     #endif
316
 
316
 
317
   #elif ENABLED(FYSETC_MINI_12864_2_1)
317
   #elif ENABLED(FYSETC_MINI_12864_2_1)
318
+    #define LCD_PINS_DC                     PC6
318
     #define DOGLCD_CS                       PD13
319
     #define DOGLCD_CS                       PD13
319
-    #define DOGLCD_A0                       PC6
320
-    #define LCD_PINS_DC                DOGLCD_A0
320
+    #define DOGLCD_A0                  DOGLCD_A0
321
     #define LCD_BACKLIGHT_PIN               -1
321
     #define LCD_BACKLIGHT_PIN               -1
322
     #define LCD_RESET_PIN                   PE14
322
     #define LCD_RESET_PIN                   PE14
323
     #define NEOPIXEL_PIN                    PE15
323
     #define NEOPIXEL_PIN                    PE15

+ 3
- 2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h 查看文件

197
     #define DOGLCD_MOSI              EXP2_05_PIN
197
     #define DOGLCD_MOSI              EXP2_05_PIN
198
 
198
 
199
   #elif ENABLED(FYSETC_MINI_12864_2_1)
199
   #elif ENABLED(FYSETC_MINI_12864_2_1)
200
+
201
+    #define LCD_PINS_DC              EXP1_07_PIN
200
     #define DOGLCD_CS                EXP1_08_PIN
202
     #define DOGLCD_CS                EXP1_08_PIN
201
-    #define DOGLCD_A0                EXP1_07_PIN
202
-    #define LCD_PINS_DC                DOGLCD_A0
203
+    #define DOGLCD_A0                LCD_PINS_DC
203
     #define LCD_BACKLIGHT_PIN               -1
204
     #define LCD_BACKLIGHT_PIN               -1
204
     #define LCD_RESET_PIN            EXP1_06_PIN
205
     #define LCD_RESET_PIN            EXP1_06_PIN
205
     #define NEOPIXEL_PIN             EXP1_05_PIN
206
     #define NEOPIXEL_PIN             EXP1_05_PIN

+ 2
- 2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h 查看文件

341
     #endif
341
     #endif
342
 
342
 
343
   #elif ENABLED(FYSETC_MINI_12864_2_1)
343
   #elif ENABLED(FYSETC_MINI_12864_2_1)
344
+    #define LCD_PINS_DC                     PC6
344
     #define DOGLCD_CS                       PD13
345
     #define DOGLCD_CS                       PD13
345
-    #define DOGLCD_A0                       PC6
346
-    #define LCD_PINS_DC                DOGLCD_A0
346
+    #define DOGLCD_A0                  DOGLCD_A0
347
     #define LCD_BACKLIGHT_PIN               -1
347
     #define LCD_BACKLIGHT_PIN               -1
348
     #define LCD_RESET_PIN                   PE14
348
     #define LCD_RESET_PIN                   PE14
349
     #define NEOPIXEL_PIN                    PE15
349
     #define NEOPIXEL_PIN                    PE15

+ 1
- 1
Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h 查看文件

224
   #define LCD_PINS_RS                EXP1_05_PIN  // = LCD_RESET_PIN
224
   #define LCD_PINS_RS                EXP1_05_PIN  // = LCD_RESET_PIN
225
   #define LCD_PINS_DC                EXP1_07_PIN  // DC
225
   #define LCD_PINS_DC                EXP1_07_PIN  // DC
226
   #define DOGLCD_CS                  EXP1_08_PIN  // CS
226
   #define DOGLCD_CS                  EXP1_08_PIN  // CS
227
-  #define DOGLCD_A0                  LCD_PINS_DC  // A0 = DC
227
+  #define DOGLCD_A0                  LCD_PINS_DC
228
   #define DOGLCD_MOSI                EXP1_10_PIN  // SDA
228
   #define DOGLCD_MOSI                EXP1_10_PIN  // SDA
229
   #define DOGLCD_SCK                 EXP1_09_PIN  // SCK
229
   #define DOGLCD_SCK                 EXP1_09_PIN  // SCK
230
   // Encoder
230
   // Encoder

+ 2
- 2
Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h 查看文件

352
 
352
 
353
   #elif ENABLED(FYSETC_MINI_12864_2_1)
353
   #elif ENABLED(FYSETC_MINI_12864_2_1)
354
 
354
 
355
+    #define LCD_PINS_DC              EXP1_07_PIN
355
     #define DOGLCD_CS                EXP1_08_PIN
356
     #define DOGLCD_CS                EXP1_08_PIN
356
-    #define DOGLCD_A0                EXP1_07_PIN
357
-    #define LCD_PINS_DC                DOGLCD_A0
357
+    #define DOGLCD_A0                LCD_PINS_DC
358
     #define LCD_BACKLIGHT_PIN               -1
358
     #define LCD_BACKLIGHT_PIN               -1
359
     #define LCD_RESET_PIN            EXP1_06_PIN
359
     #define LCD_RESET_PIN            EXP1_06_PIN
360
     #define NEOPIXEL_PIN             EXP1_05_PIN
360
     #define NEOPIXEL_PIN             EXP1_05_PIN

+ 2
- 2
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h 查看文件

338
     //#undef SHOW_BOOTSCREEN
338
     //#undef SHOW_BOOTSCREEN
339
 
339
 
340
   #elif ENABLED(FYSETC_MINI_12864_2_1)
340
   #elif ENABLED(FYSETC_MINI_12864_2_1)
341
+    #define LCD_PINS_DC              EXP1_07_PIN
341
     #define DOGLCD_CS                EXP1_08_PIN
342
     #define DOGLCD_CS                EXP1_08_PIN
342
-    #define DOGLCD_A0                EXP1_07_PIN
343
-    #define LCD_PINS_DC                DOGLCD_A0
343
+    #define DOGLCD_A0                LCD_PINS_DC
344
     #define LCD_BACKLIGHT_PIN               -1
344
     #define LCD_BACKLIGHT_PIN               -1
345
     #define LCD_RESET_PIN            EXP1_06_PIN
345
     #define LCD_RESET_PIN            EXP1_06_PIN
346
     #define NEOPIXEL_PIN             EXP1_05_PIN
346
     #define NEOPIXEL_PIN             EXP1_05_PIN

Loading…
取消
儲存