浏览代码

🚸 Renumber EXP pins to match schematics/RRF/Klipper

Scott Lahteine 2 年前
父节点
当前提交
504fec9823
共有 53 个文件被更改,包括 2604 次插入2606 次删除
  1. 43
    43
      Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
  2. 30
    30
      Marlin/src/pins/esp32/pins_PANDA_common.h
  3. 41
    41
      Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
  4. 106
    106
      Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
  5. 105
    105
      Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
  6. 27
    27
      Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
  7. 33
    35
      Marlin/src/pins/lpc1768/pins_EMOTRONIC.h
  8. 71
    71
      Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
  9. 42
    42
      Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
  10. 69
    69
      Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
  11. 35
    35
      Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
  12. 21
    21
      Marlin/src/pins/ramps/pins_MKS_GEN_13.h
  13. 115
    115
      Marlin/src/pins/ramps/pins_RAMPS.h
  14. 21
    21
      Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
  15. 29
    29
      Marlin/src/pins/ramps/pins_ZRIB_V53.h
  16. 49
    49
      Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
  17. 21
    21
      Marlin/src/pins/sam/pins_RAMPS_SMART.h
  18. 47
    47
      Marlin/src/pins/sam/pins_RURAMPS4D_11.h
  19. 49
    49
      Marlin/src/pins/sam/pins_RURAMPS4D_13.h
  20. 85
    85
      Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
  21. 87
    87
      Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
  22. 5
    5
      Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
  23. 24
    24
      Marlin/src/pins/sanguino/pins_ZMIB_V2.h
  24. 15
    15
      Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
  25. 30
    30
      Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
  26. 56
    56
      Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
  27. 21
    21
      Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
  28. 10
    10
      Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
  29. 33
    33
      Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
  30. 40
    40
      Marlin/src/pins/stm32f1/pins_FLY_MINI.h
  31. 30
    30
      Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
  32. 71
    71
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
  33. 55
    55
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
  34. 32
    32
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
  35. 24
    24
      Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
  36. 57
    57
      Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
  37. 43
    43
      Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
  38. 58
    58
      Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
  39. 20
    20
      Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
  40. 63
    63
      Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
  41. 83
    83
      Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
  42. 90
    90
      Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
  43. 91
    91
      Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
  44. 40
    40
      Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
  45. 56
    56
      Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
  46. 61
    61
      Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
  47. 58
    58
      Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h
  48. 58
    58
      Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
  49. 56
    56
      Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
  50. 34
    34
      Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
  51. 33
    33
      Marlin/src/pins/stm32f4/pins_VAKE403D.h
  52. 39
    39
      Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
  53. 92
    92
      Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h

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

119
 
119
 
120
 /**
120
 /**
121
  *                ------                                 ------
121
  *                ------                                 ------
122
- *  (BEEPER) 149 |10  9 | 13 (BTN_ENC)    (SPI MISO) 19 |10  9 | 18 (SPI SCK)
123
- *  (LCD_EN)  21 | 8  7 |  4 (LCD_RS)      (BTN_EN1) 14 | 8  7 |  5 (SPI CS)
124
- *  (LCD_D4)   0   6  5 | 16 (LCD_D5)      (BTN_EN2) 12   6  5 | 23 (SPI MOSI)
125
- *  (LCD_D6)  15 | 4  3 | 17 (LCD_D7)      (SPI_DET) 34 | 4  3 | RESET
126
- *           GND | 2  1 | 5V                        GND | 2  1 | 3.3V
122
+ *  (BEEPER) 149 | 1  2 | 13 (BTN_ENC)    (SPI MISO) 19 | 1  2 | 18 (SPI SCK)
123
+ *  (LCD_EN)  21 | 3  4 |  4 (LCD_RS)      (BTN_EN1) 14 | 3  4 |  5 (SPI CS)
124
+ *  (LCD_D4)   0   5  6 | 16 (LCD_D5)      (BTN_EN2) 12   5  6 | 23 (SPI MOSI)
125
+ *  (LCD_D6)  15 | 7  8 | 17 (LCD_D7)      (SPI_DET) 34 | 7  8 | RESET
126
+ *           GND | 9 10 | 5V                        GND | 9 10 | 3.3V
127
  *                ------                                 ------
127
  *                ------                                 ------
128
  *                 EXP1                                   EXP2
128
  *                 EXP1                                   EXP2
129
  */
129
  */
130
 
130
 
131
-#define EXP1_03_PIN                           17
132
-#define EXP1_04_PIN                           15
133
-#define EXP1_05_PIN                           16
134
-#define EXP1_06_PIN                            0
135
-#define EXP1_07_PIN                            4
136
-#define EXP1_08_PIN                           21
137
-#define EXP1_09_PIN                           13
138
-#define EXP1_10_PIN                          149
139
-
140
-#define EXP2_03_PIN                           -1  // RESET
141
-#define EXP2_04_PIN                           34
142
-#define EXP2_05_PIN                           23
143
-#define EXP2_06_PIN                           12
144
-#define EXP2_07_PIN                            5
145
-#define EXP2_08_PIN                           14
146
-#define EXP2_09_PIN                           18
147
-#define EXP2_10_PIN                           19
131
+#define EXP1_08_PIN                           17
132
+#define EXP1_07_PIN                           15
133
+#define EXP1_06_PIN                           16
134
+#define EXP1_05_PIN                            0
135
+#define EXP1_04_PIN                            4
136
+#define EXP1_03_PIN                           21
137
+#define EXP1_02_PIN                           13
138
+#define EXP1_01_PIN                          149
139
+
140
+#define EXP2_08_PIN                           -1  // RESET
141
+#define EXP2_07_PIN                           34
142
+#define EXP2_06_PIN                           23
143
+#define EXP2_05_PIN                           12
144
+#define EXP2_04_PIN                            5
145
+#define EXP2_03_PIN                           14
146
+#define EXP2_02_PIN                           18
147
+#define EXP2_01_PIN                           19
148
 
148
 
149
 //
149
 //
150
 // MicroSD card
150
 // MicroSD card
151
 //
151
 //
152
-//#define SD_MOSI_PIN                EXP2_05_PIN  // uses esp32 default 23
153
-//#define SD_MISO_PIN                EXP2_10_PIN  // uses esp32 default 19
154
-//#define SD_SCK_PIN                 EXP2_09_PIN  // uses esp32 default 18
155
-#define SDSS                         EXP2_07_PIN
156
-#define SD_DETECT_PIN                EXP2_04_PIN  // IO34 default is SD_DET signal (Jump to SDDET)
152
+//#define SD_MOSI_PIN                EXP2_06_PIN  // uses esp32 default 23
153
+//#define SD_MISO_PIN                EXP2_01_PIN  // uses esp32 default 19
154
+//#define SD_SCK_PIN                 EXP2_02_PIN  // uses esp32 default 18
155
+#define SDSS                         EXP2_04_PIN
156
+#define SD_DETECT_PIN                EXP2_07_PIN  // IO34 default is SD_DET signal (Jump to SDDET)
157
 #define USES_SHARED_SPI                           // SPI is shared by SD card with TMC SPI drivers
157
 #define USES_SHARED_SPI                           // SPI is shared by SD card with TMC SPI drivers
158
 
158
 
159
 #if HAS_WIRED_LCD
159
 #if HAS_WIRED_LCD
160
-  #define BEEPER_PIN                 EXP1_10_PIN
161
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
162
-  #define LCD_PINS_RS                EXP1_07_PIN
163
-  #define BTN_ENC                    EXP1_09_PIN
164
-  #define BTN_EN1                    EXP2_08_PIN
165
-  #define BTN_EN2                    EXP2_06_PIN
160
+  #define BEEPER_PIN                 EXP1_01_PIN
161
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
162
+  #define LCD_PINS_RS                EXP1_04_PIN
163
+  #define BTN_ENC                    EXP1_02_PIN
164
+  #define BTN_EN1                    EXP2_03_PIN
165
+  #define BTN_EN2                    EXP2_05_PIN
166
   #define LCD_BACKLIGHT_PIN                   -1
166
   #define LCD_BACKLIGHT_PIN                   -1
167
 
167
 
168
   #if ENABLED(MKS_MINI_12864)
168
   #if ENABLED(MKS_MINI_12864)
169
   // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
169
   // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
170
-    #define DOGLCD_CS                EXP1_05_PIN
171
-    #define DOGLCD_A0                EXP1_04_PIN
170
+    #define DOGLCD_CS                EXP1_06_PIN
171
+    #define DOGLCD_A0                EXP1_07_PIN
172
     #define LCD_RESET_PIN                     -1
172
     #define LCD_RESET_PIN                     -1
173
   #elif ENABLED(FYSETC_MINI_12864_2_1)
173
   #elif ENABLED(FYSETC_MINI_12864_2_1)
174
   // MKS_MINI_12864_V3, BTT_MINI_12864_V1, FYSETC_MINI_12864_2_1
174
   // MKS_MINI_12864_V3, BTT_MINI_12864_V1, FYSETC_MINI_12864_2_1
175
-    #define DOGLCD_CS                EXP1_08_PIN
176
-    #define DOGLCD_A0                EXP1_07_PIN
177
-    #define LCD_RESET_PIN            EXP1_06_PIN
178
-    #define NEOPIXEL_PIN             EXP1_05_PIN
175
+    #define DOGLCD_CS                EXP1_03_PIN
176
+    #define DOGLCD_A0                EXP1_04_PIN
177
+    #define LCD_RESET_PIN            EXP1_05_PIN
178
+    #define NEOPIXEL_PIN             EXP1_06_PIN
179
     #if SD_CONNECTION_IS(ONBOARD)
179
     #if SD_CONNECTION_IS(ONBOARD)
180
       #define FORCE_SOFT_SPI
180
       #define FORCE_SOFT_SPI
181
     #endif
181
     #endif
182
   #else
182
   #else
183
-   #define LCD_PINS_D4               EXP1_06_PIN
183
+   #define LCD_PINS_D4               EXP1_05_PIN
184
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
184
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
185
-      #define LCD_PINS_D5            EXP1_05_PIN
186
-      #define LCD_PINS_D6            EXP1_04_PIN
187
-      #define LCD_PINS_D7            EXP1_03_PIN
185
+      #define LCD_PINS_D5            EXP1_06_PIN
186
+      #define LCD_PINS_D6            EXP1_07_PIN
187
+      #define LCD_PINS_D7            EXP1_08_PIN
188
     #endif
188
     #endif
189
     #define BOARD_ST7920_DELAY_1              96
189
     #define BOARD_ST7920_DELAY_1              96
190
     #define BOARD_ST7920_DELAY_2              48
190
     #define BOARD_ST7920_DELAY_2              48

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

82
 #endif
82
 #endif
83
 
83
 
84
 /**            ------                              ------
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)
85
+ * (MISO 19?) | 1  2 | (18 SCK?)     (BEEPER) 129 | 1  2 | 12 (^ENC)
86
+ *   (EN1) 33 | 3  4 | (5 SDSS?)     (EN)      26 | 3  4 | 27 (RS)
87
+ *   (EN2) 32   5  6 | (23 MOSI?)    (D4)      14 | 5  6   --
88
+ * (SDDET 2?) | 7  8 | (RESET)                 -- | 7  8 | --
89
+ *         -- | 9 10 | --                   (GND) | 9 10 | (5V)
90
  *             ------                              ------
90
  *             ------                              ------
91
  *              EXP2                                EXP1
91
  *              EXP2                                EXP1
92
  */
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  // ?
93
+#define EXP1_05_PIN                           14
94
+#define EXP1_04_PIN                           27
95
+#define EXP1_03_PIN                           26
96
+#define EXP1_02_PIN                           12
97
+#define EXP1_01_PIN                          129
98
+
99
+#define EXP2_07_PIN                            2  // ?
100
+#define EXP2_06_PIN                           23  // ?
101
+#define EXP2_05_PIN                           32
102
+#define EXP2_04_PIN                            5  // ?
103
+#define EXP2_03_PIN                           33
104
+#define EXP2_02_PIN                           18  // ?
105
+#define EXP2_01_PIN                           19  // ?
106
 
106
 
107
 //
107
 //
108
 // SD Card
108
 // SD Card
109
 //
109
 //
110
 #if ENABLED(SDSUPPORT)
110
 #if ENABLED(SDSUPPORT)
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
111
+  #define SD_MOSI_PIN                EXP2_06_PIN
112
+  #define SD_MISO_PIN                EXP2_01_PIN
113
+  #define SD_SCK_PIN                 EXP2_02_PIN
114
+  #define SDSS                       EXP2_04_PIN
115
+  #define SD_DETECT_PIN              EXP2_07_PIN
116
 #endif
116
 #endif
117
 
117
 
118
 #if HAS_WIRED_LCD
118
 #if HAS_WIRED_LCD
119
-  #define BEEPER_PIN                 EXP1_10_PIN
119
+  #define BEEPER_PIN                 EXP1_01_PIN
120
 
120
 
121
-  #define BTN_ENC                    EXP1_09_PIN
122
-  #define BTN_EN1                    EXP2_08_PIN
123
-  #define BTN_EN2                    EXP2_06_PIN
121
+  #define BTN_ENC                    EXP1_02_PIN
122
+  #define BTN_EN1                    EXP2_03_PIN
123
+  #define BTN_EN2                    EXP2_05_PIN
124
 
124
 
125
-  #define LCD_PINS_RS                EXP1_07_PIN
126
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
127
-  #define LCD_PINS_D4                EXP1_06_PIN
125
+  #define LCD_PINS_RS                EXP1_04_PIN
126
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
127
+  #define LCD_PINS_D4                EXP1_05_PIN
128
 #endif
128
 #endif

+ 41
- 41
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h 查看文件

58
 
58
 
59
 
59
 
60
 /**        ------                  ------
60
 /**        ------                  ------
61
- *   1.30 |10  9 | 2.11      0.17 |10  9 | 0.15
62
- *   0.18 | 8  7 | 0.16      3.26 | 8  7 | 1.23
63
- *   0.15   6  5 | --        3.25   6  5 | 0.18
64
- *     -- | 4  3 | --        1.31 | 4  3 | RESET
65
- *    GND | 2  1 | 5V         GND | 2  1 | --
61
+ *   1.30 | 1  2 | 2.11      0.17 | 1  2 | 0.15
62
+ *   0.18 | 3  4 | 0.16      3.26 | 3  4 | 1.23
63
+ *   0.15   5  6 | --        3.25   5  6 | 0.18
64
+ *     -- | 7  8 | --        1.31 | 7  8 | RESET
65
+ *    GND | 9 10 | 5V         GND | 9 10 | --
66
  *         ------                  ------
66
  *         ------                  ------
67
  *          EXP1                    EXP2
67
  *          EXP1                    EXP2
68
  */
68
  */
69
-#define EXP1_03_PIN                        -1     // NC
70
-#define EXP1_04_PIN                        -1     // NC
71
-#define EXP1_05_PIN                        -1     // NC
72
-#define EXP1_06_PIN                        P0_15
73
-#define EXP1_07_PIN                        P0_16
74
-#define EXP1_08_PIN                        P0_18
75
-#define EXP1_09_PIN                        P2_11
76
-#define EXP1_10_PIN                        P1_30
77
-
78
-#define EXP2_03_PIN                        -1     // RESET
79
-#define EXP2_04_PIN                        P1_31
80
-#define EXP2_05_PIN                        P0_18
81
-#define EXP2_06_PIN                        P3_25
82
-#define EXP2_07_PIN                        P1_23
83
-#define EXP2_08_PIN                        P3_26
84
-#define EXP2_09_PIN                        P0_15
85
-#define EXP2_10_PIN                        P0_17
69
+#define EXP1_08_PIN                        -1     // NC
70
+#define EXP1_07_PIN                        -1     // NC
71
+#define EXP1_06_PIN                        -1     // NC
72
+#define EXP1_05_PIN                        P0_15
73
+#define EXP1_04_PIN                        P0_16
74
+#define EXP1_03_PIN                        P0_18
75
+#define EXP1_02_PIN                        P2_11
76
+#define EXP1_01_PIN                        P1_30
77
+
78
+#define EXP2_08_PIN                        -1     // RESET
79
+#define EXP2_07_PIN                        P1_31
80
+#define EXP2_06_PIN                        P0_18
81
+#define EXP2_05_PIN                        P3_25
82
+#define EXP2_04_PIN                        P1_23
83
+#define EXP2_03_PIN                        P3_26
84
+#define EXP2_02_PIN                        P0_15
85
+#define EXP2_01_PIN                        P0_17
86
 
86
 
87
 /**
87
 /**
88
  * LCD / Controller
88
  * LCD / Controller
100
 #if IS_TFTGLCD_PANEL
100
 #if IS_TFTGLCD_PANEL
101
 
101
 
102
   #if ENABLED(TFTGLCD_PANEL_SPI)
102
   #if ENABLED(TFTGLCD_PANEL_SPI)
103
-    #define TFTGLCD_CS               EXP2_08_PIN
103
+    #define TFTGLCD_CS               EXP2_03_PIN
104
   #endif
104
   #endif
105
 
105
 
106
 #elif HAS_WIRED_LCD
106
 #elif HAS_WIRED_LCD
107
 
107
 
108
-  #define BTN_EN1                    EXP2_08_PIN
109
-  #define BTN_EN2                    EXP2_06_PIN
110
-  #define BTN_ENC                    EXP1_09_PIN
108
+  #define BTN_EN1                    EXP2_03_PIN
109
+  #define BTN_EN2                    EXP2_05_PIN
110
+  #define BTN_ENC                    EXP1_02_PIN
111
 
111
 
112
-  #define LCD_SDSS                   EXP2_07_PIN
113
-  #define LCD_PINS_RS                EXP1_07_PIN
114
-  #define LCD_PINS_ENABLE            EXP2_05_PIN
115
-  #define LCD_PINS_D4                EXP2_09_PIN
112
+  #define LCD_SDSS                   EXP2_04_PIN
113
+  #define LCD_PINS_RS                EXP1_04_PIN
114
+  #define LCD_PINS_ENABLE            EXP2_06_PIN
115
+  #define LCD_PINS_D4                EXP2_02_PIN
116
 
116
 
117
   #if ENABLED(MKS_MINI_12864)
117
   #if ENABLED(MKS_MINI_12864)
118
     #define DOGLCD_CS                      P2_06
118
     #define DOGLCD_CS                      P2_06
119
-    #define DOGLCD_A0                EXP1_07_PIN
119
+    #define DOGLCD_A0                EXP1_04_PIN
120
   #endif
120
   #endif
121
 
121
 
122
 #endif // HAS_WIRED_LCD
122
 #endif // HAS_WIRED_LCD
165
   // When using any TMC SPI-based drivers, software SPI is used
165
   // When using any TMC SPI-based drivers, software SPI is used
166
   // because pins may be shared with the display or SD card.
166
   // because pins may be shared with the display or SD card.
167
   #define TMC_USE_SW_SPI
167
   #define TMC_USE_SW_SPI
168
-  #define TMC_SW_MOSI                EXP2_05_PIN
169
-  #define TMC_SW_MISO                EXP2_10_PIN
168
+  #define TMC_SW_MOSI                EXP2_06_PIN
169
+  #define TMC_SW_MISO                EXP2_01_PIN
170
   // To minimize pin usage use the same clock pin as the display/SD card reader. (May generate LCD noise.)
170
   // To minimize pin usage use the same clock pin as the display/SD card reader. (May generate LCD noise.)
171
-  #define TMC_SW_SCK                 EXP2_09_PIN
171
+  #define TMC_SW_SCK                 EXP2_02_PIN
172
   // If pin 2_06 is unused, it can be used for the clock to avoid the LCD noise.
172
   // If pin 2_06 is unused, it can be used for the clock to avoid the LCD noise.
173
   //#define TMC_SW_SCK                     P2_06
173
   //#define TMC_SW_SCK                     P2_06
174
 
174
 
211
     //            SDCARD_CONNECTION must not be 'LCD'. Nothing should be connected to EXP1/EXP2.
211
     //            SDCARD_CONNECTION must not be 'LCD'. Nothing should be connected to EXP1/EXP2.
212
     //#define SKR_USE_LCD_PINS_FOR_CS
212
     //#define SKR_USE_LCD_PINS_FOR_CS
213
     #if ENABLED(SKR_USE_LCD_PINS_FOR_CS)
213
     #if ENABLED(SKR_USE_LCD_PINS_FOR_CS)
214
-      #define X_CS_PIN               EXP2_07_PIN
215
-      #define Y_CS_PIN               EXP2_08_PIN
216
-      #define Z_CS_PIN               EXP1_09_PIN
217
-      #define E0_CS_PIN              EXP2_06_PIN
218
-      #define E1_CS_PIN              EXP2_04_PIN
214
+      #define X_CS_PIN               EXP2_04_PIN
215
+      #define Y_CS_PIN               EXP2_03_PIN
216
+      #define Z_CS_PIN               EXP1_02_PIN
217
+      #define E0_CS_PIN              EXP2_05_PIN
218
+      #define E1_CS_PIN              EXP2_07_PIN
219
     #endif
219
     #endif
220
 
220
 
221
     // Example 2: A REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
221
     // Example 2: A REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
228
       #define Z_CS_PIN                     P2_06
228
       #define Z_CS_PIN                     P2_06
229
       // We use SD_DETECT_PIN for E0
229
       // We use SD_DETECT_PIN for E0
230
       #undef SD_DETECT_PIN
230
       #undef SD_DETECT_PIN
231
-      #define E0_CS_PIN              EXP2_04_PIN
231
+      #define E0_CS_PIN              EXP2_07_PIN
232
       // We use LCD_SDSS pin for E1
232
       // We use LCD_SDSS pin for E1
233
       #undef LCD_SDSS
233
       #undef LCD_SDSS
234
       #define LCD_SDSS                     -1
234
       #define LCD_SDSS                     -1
235
-      #define E1_CS_PIN              EXP2_07_PIN
235
+      #define E1_CS_PIN              EXP2_04_PIN
236
     #endif
236
     #endif
237
 
237
 
238
     // Example 3: Use the driver enable pins for chip-select.
238
     // Example 3: Use the driver enable pins for chip-select.

+ 106
- 106
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h 查看文件

191
 
191
 
192
 /**
192
 /**
193
  *                 ------                                     ------
193
  *                 ------                                     ------
194
- *  (BEEPER) 1.30 |10  9 | 0.28 (BTN_ENC)        (MISO) 0.17 |10  9 | 0.15 (SCK)
195
- *  (LCD_EN) 1.18 | 8  7 | 1.19  (LCD_RS)     (BTN_EN1) 3.26 | 8  7 | 0.16 (SD_SS)
196
- *  (LCD_D4) 1.20   6  5 | 1.21  (LCD_D5)     (BTN_EN2) 3.25   6  5 | 0.18 (MOSI)
197
- *  (LCD_D6) 1.22 | 4  3 | 1.23  (LCD_D7)   (SD_DETECT) 1.31 | 4  3 | RESET
198
- *            GND | 2  1 | 5V                            GND | 2  1 | --
194
+ *  (BEEPER) 1.30 | 1  2 | 0.28 (BTN_ENC)        (MISO) 0.17 | 1  2 | 0.15 (SCK)
195
+ *  (LCD_EN) 1.18 | 3  4 | 1.19  (LCD_RS)     (BTN_EN1) 3.26 | 3  4 | 0.16 (SD_SS)
196
+ *  (LCD_D4) 1.20   5  6 | 1.21  (LCD_D5)     (BTN_EN2) 3.25   5  6 | 0.18 (MOSI)
197
+ *  (LCD_D6) 1.22 | 7  8 | 1.23  (LCD_D7)   (SD_DETECT) 1.31 | 7  8 | RESET
198
+ *            GND | 9 10 | 5V                            GND | 9 10 | --
199
  *                 ------                                     ------
199
  *                 ------                                     ------
200
  *                  EXP1                                       EXP2
200
  *                  EXP1                                       EXP2
201
  */
201
  */
202
-#define EXP1_03_PIN                        P1_23
203
-#define EXP1_04_PIN                        P1_22
204
-#define EXP1_05_PIN                        P1_21
205
-#define EXP1_06_PIN                        P1_20
206
-#define EXP1_07_PIN                        P1_19
207
-#define EXP1_08_PIN                        P1_18
208
-#define EXP1_09_PIN                        P0_28
209
-#define EXP1_10_PIN                        P1_30
210
-
211
-#define EXP2_03_PIN                        -1
212
-#define EXP2_04_PIN                        P1_31
213
-#define EXP2_05_PIN                        P0_18
214
-#define EXP2_06_PIN                        P3_25
215
-#define EXP2_07_PIN                        P0_16
216
-#define EXP2_08_PIN                        P3_26
217
-#define EXP2_09_PIN                        P0_15
218
-#define EXP2_10_PIN                        P0_17
202
+#define EXP1_08_PIN                        P1_23
203
+#define EXP1_07_PIN                        P1_22
204
+#define EXP1_06_PIN                        P1_21
205
+#define EXP1_05_PIN                        P1_20
206
+#define EXP1_04_PIN                        P1_19
207
+#define EXP1_03_PIN                        P1_18
208
+#define EXP1_02_PIN                        P0_28
209
+#define EXP1_01_PIN                        P1_30
210
+
211
+#define EXP2_08_PIN                        -1
212
+#define EXP2_07_PIN                        P1_31
213
+#define EXP2_06_PIN                        P0_18
214
+#define EXP2_05_PIN                        P3_25
215
+#define EXP2_04_PIN                        P0_16
216
+#define EXP2_03_PIN                        P3_26
217
+#define EXP2_02_PIN                        P0_15
218
+#define EXP2_01_PIN                        P0_17
219
 
219
 
220
 #if HAS_WIRED_LCD
220
 #if HAS_WIRED_LCD
221
   #if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
221
   #if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
239
     *
239
     *
240
     *                  BEFORE                          AFTER
240
     *                  BEFORE                          AFTER
241
     *                  ------                          ------
241
     *                  ------                          ------
242
-    *           (CLK) |10  9 | (BEEPER)      (BEEPER) |10  9 | --
243
-    *              -- | 8  7 | (BTN_ENC)    (BTN_ENC) | 8  7 | (CLK)
244
-    *           (SID)   6  5 | (BTN_EN1)    (BTN_EN1)   6  5 | (SID)
245
-    *            (CS) | 4  3 | (BTN_EN2)    (BTN_EN2) | 4  3 | (CS)
246
-    *             GND | 2  1 | 5V                 GND | 2  1 | 5V
242
+    *           (CLK) | 1  2 | (BEEPER)      (BEEPER) | 1  2 | --
243
+    *              -- | 3  4 | (BTN_ENC)    (BTN_ENC) | 3  4 | (CLK)
244
+    *           (SID)   5  6 | (BTN_EN1)    (BTN_EN1)   5  6 | (SID)
245
+    *            (CS) | 7  8 | (BTN_EN2)    (BTN_EN2) | 7  8 | (CS)
246
+    *             GND | 9 10 | 5V                 GND | 9 10 | 5V
247
     *                  ------                          ------
247
     *                  ------                          ------
248
     *                   LCD                             LCD
248
     *                   LCD                             LCD
249
     */
249
     */
250
 
250
 
251
-    #define LCD_PINS_RS              EXP1_03_PIN
251
+    #define LCD_PINS_RS              EXP1_08_PIN
252
 
252
 
253
-    #define BTN_EN1                  EXP1_06_PIN
254
-    #define BTN_EN2                  EXP1_04_PIN
255
-    #define BTN_ENC                  EXP1_08_PIN
253
+    #define BTN_EN1                  EXP1_05_PIN
254
+    #define BTN_EN2                  EXP1_07_PIN
255
+    #define BTN_ENC                  EXP1_03_PIN
256
 
256
 
257
-    #define LCD_PINS_ENABLE          EXP1_05_PIN
258
-    #define LCD_PINS_D4              EXP1_07_PIN
257
+    #define LCD_PINS_ENABLE          EXP1_06_PIN
258
+    #define LCD_PINS_D4              EXP1_04_PIN
259
 
259
 
260
   #elif ENABLED(WYH_L12864)
260
   #elif ENABLED(WYH_L12864)
261
 
261
 
274
      *
274
      *
275
      *                  BEFORE                      AFTER
275
      *                  BEFORE                      AFTER
276
      *                  ______                     ______
276
      *                  ______                     ______
277
-     *                 |10  9 | (MOSI)     (MOSI) |10  9 | --
278
-     *       (BTN_ENC) | 8  7 | (SCK)   (BTN_ENC) | 8  7 | (SCK)
279
-     *       (BTN_EN1)   6  5 | (SID)   (BTN_EN1)   6  5 | (SID)
280
-     *       (BTN_EN2) | 4  3 | (CS)    (BTN_EN2) | 4  3 | (CS)
281
-     *              5V | 2  1 | GND           GND | 2  1 | 5V
277
+     *                 | 1  2 | (MOSI)     (MOSI) | 1  2 | --
278
+     *       (BTN_ENC) | 3  4 | (SCK)   (BTN_ENC) | 3  4 | (SCK)
279
+     *       (BTN_EN1)   5  6 | (SID)   (BTN_EN1)   5  6 | (SID)
280
+     *       (BTN_EN2) | 7  8 | (CS)    (BTN_EN2) | 7  8 | (CS)
281
+     *              5V | 9 10 | GND           GND | 9 10 | 5V
282
      *                  ------                     ------
282
      *                  ------                     ------
283
      *                   LCD                        LCD
283
      *                   LCD                        LCD
284
      */
284
      */
285
-    #define BTN_EN1                  EXP1_06_PIN
286
-    #define BTN_EN2                  EXP1_04_PIN
287
-    #define BTN_ENC                  EXP1_08_PIN
288
-    #define DOGLCD_CS                EXP1_03_PIN
289
-    #define DOGLCD_A0                EXP1_05_PIN
290
-    #define DOGLCD_SCK               EXP1_07_PIN
291
-    #define DOGLCD_MOSI              EXP1_10_PIN
285
+    #define BTN_EN1                  EXP1_05_PIN
286
+    #define BTN_EN2                  EXP1_07_PIN
287
+    #define BTN_ENC                  EXP1_03_PIN
288
+    #define DOGLCD_CS                EXP1_08_PIN
289
+    #define DOGLCD_A0                EXP1_06_PIN
290
+    #define DOGLCD_SCK               EXP1_04_PIN
291
+    #define DOGLCD_MOSI              EXP1_01_PIN
292
     #define LCD_BACKLIGHT_PIN            -1
292
     #define LCD_BACKLIGHT_PIN            -1
293
 
293
 
294
   #elif ENABLED(CR10_STOCKDISPLAY)
294
   #elif ENABLED(CR10_STOCKDISPLAY)
295
 
295
 
296
-    #define LCD_PINS_RS              EXP1_04_PIN
296
+    #define LCD_PINS_RS              EXP1_07_PIN
297
 
297
 
298
-    #define BTN_EN1                  EXP1_08_PIN
299
-    #define BTN_EN2                  EXP1_06_PIN
300
-    #define BTN_ENC                  EXP1_09_PIN  // (58) open-drain
298
+    #define BTN_EN1                  EXP1_03_PIN
299
+    #define BTN_EN2                  EXP1_05_PIN
300
+    #define BTN_ENC                  EXP1_02_PIN  // (58) open-drain
301
 
301
 
302
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
303
-    #define LCD_PINS_D4              EXP1_05_PIN
302
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
303
+    #define LCD_PINS_D4              EXP1_06_PIN
304
 
304
 
305
   #elif HAS_ADC_BUTTONS
305
   #elif HAS_ADC_BUTTONS
306
 
306
 
308
 
308
 
309
   #elif HAS_SPI_TFT                               // Config for Classic UI (emulated DOGM) and Color UI
309
   #elif HAS_SPI_TFT                               // Config for Classic UI (emulated DOGM) and Color UI
310
 
310
 
311
-    #define TFT_A0_PIN               EXP1_03_PIN
312
-    #define TFT_DC_PIN               EXP1_03_PIN
313
-    #define TFT_CS_PIN               EXP1_04_PIN
314
-    #define TFT_RESET_PIN            EXP1_07_PIN
315
-    #define TFT_BACKLIGHT_PIN        EXP1_08_PIN
311
+    #define TFT_A0_PIN               EXP1_08_PIN
312
+    #define TFT_DC_PIN               EXP1_08_PIN
313
+    #define TFT_CS_PIN               EXP1_07_PIN
314
+    #define TFT_RESET_PIN            EXP1_04_PIN
315
+    #define TFT_BACKLIGHT_PIN        EXP1_03_PIN
316
 
316
 
317
-    //#define TFT_RST_PIN            EXP2_04_PIN
318
-    #define TFT_MOSI_PIN             EXP2_05_PIN
319
-    #define TFT_SCK_PIN              EXP2_09_PIN
320
-    #define TFT_MISO_PIN             EXP2_10_PIN
317
+    //#define TFT_RST_PIN            EXP2_07_PIN
318
+    #define TFT_MOSI_PIN             EXP2_06_PIN
319
+    #define TFT_SCK_PIN              EXP2_02_PIN
320
+    #define TFT_MISO_PIN             EXP2_01_PIN
321
 
321
 
322
-    #define BTN_EN2                  EXP2_06_PIN
323
-    #define BTN_EN1                  EXP2_08_PIN
324
-    #define BTN_ENC                  EXP1_09_PIN
322
+    #define BTN_EN2                  EXP2_05_PIN
323
+    #define BTN_EN1                  EXP2_03_PIN
324
+    #define BTN_ENC                  EXP1_02_PIN
325
 
325
 
326
     #define TOUCH_BUTTONS_HW_SPI
326
     #define TOUCH_BUTTONS_HW_SPI
327
     #define TOUCH_BUTTONS_HW_SPI_DEVICE        1
327
     #define TOUCH_BUTTONS_HW_SPI_DEVICE        1
369
 
369
 
370
   #elif IS_TFTGLCD_PANEL
370
   #elif IS_TFTGLCD_PANEL
371
     #if ENABLED(TFTGLCD_PANEL_SPI)
371
     #if ENABLED(TFTGLCD_PANEL_SPI)
372
-      #define TFTGLCD_CS             EXP2_08_PIN
372
+      #define TFTGLCD_CS             EXP2_03_PIN
373
     #endif
373
     #endif
374
 
374
 
375
-    #define SD_DETECT_PIN            EXP2_04_PIN
375
+    #define SD_DETECT_PIN            EXP2_07_PIN
376
 
376
 
377
   #else                                           // !CR10_STOCKDISPLAY
377
   #else                                           // !CR10_STOCKDISPLAY
378
 
378
 
379
-    #define LCD_PINS_RS              EXP1_07_PIN
379
+    #define LCD_PINS_RS              EXP1_04_PIN
380
 
380
 
381
-    #define BTN_EN1                  EXP2_08_PIN  // (31) J3-2 & AUX-4
382
-    #define BTN_EN2                  EXP2_06_PIN  // (33) J3-4 & AUX-4
383
-    #define BTN_ENC                  EXP1_09_PIN  // (58) open-drain
381
+    #define BTN_EN1                  EXP2_03_PIN  // (31) J3-2 & AUX-4
382
+    #define BTN_EN2                  EXP2_05_PIN  // (33) J3-4 & AUX-4
383
+    #define BTN_ENC                  EXP1_02_PIN  // (58) open-drain
384
 
384
 
385
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
386
-    #define LCD_PINS_D4              EXP1_06_PIN
385
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
386
+    #define LCD_PINS_D4              EXP1_05_PIN
387
 
387
 
388
-    #define LCD_SDSS                 EXP2_07_PIN  // (16) J3-7 & AUX-4
389
-    #define SD_DETECT_PIN            EXP2_04_PIN  // (49) (NOT 5V tolerant)
388
+    #define LCD_SDSS                 EXP2_04_PIN  // (16) J3-7 & AUX-4
389
+    #define SD_DETECT_PIN            EXP2_07_PIN  // (49) (NOT 5V tolerant)
390
 
390
 
391
     #if ENABLED(FYSETC_MINI_12864)
391
     #if ENABLED(FYSETC_MINI_12864)
392
-      #define DOGLCD_CS              EXP1_08_PIN
393
-      #define DOGLCD_A0              EXP1_07_PIN
394
-      #define DOGLCD_SCK             EXP2_09_PIN
395
-      #define DOGLCD_MOSI            EXP2_05_PIN
392
+      #define DOGLCD_CS              EXP1_03_PIN
393
+      #define DOGLCD_A0              EXP1_04_PIN
394
+      #define DOGLCD_SCK             EXP2_02_PIN
395
+      #define DOGLCD_MOSI            EXP2_06_PIN
396
 
396
 
397
       #define LCD_BACKLIGHT_PIN            -1
397
       #define LCD_BACKLIGHT_PIN            -1
398
 
398
 
399
       #define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
399
       #define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
400
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
400
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
401
 
401
 
402
-      #define LCD_RESET_PIN          EXP1_06_PIN  // Must be high or open for LCD to operate normally.
402
+      #define LCD_RESET_PIN          EXP1_05_PIN  // Must be high or open for LCD to operate normally.
403
 
403
 
404
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
404
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
405
         #ifndef RGB_LED_R_PIN
405
         #ifndef RGB_LED_R_PIN
406
-          #define RGB_LED_R_PIN      EXP1_05_PIN
406
+          #define RGB_LED_R_PIN      EXP1_06_PIN
407
         #endif
407
         #endif
408
         #ifndef RGB_LED_G_PIN
408
         #ifndef RGB_LED_G_PIN
409
-          #define RGB_LED_G_PIN      EXP1_04_PIN
409
+          #define RGB_LED_G_PIN      EXP1_07_PIN
410
         #endif
410
         #endif
411
         #ifndef RGB_LED_B_PIN
411
         #ifndef RGB_LED_B_PIN
412
-          #define RGB_LED_B_PIN      EXP1_03_PIN
412
+          #define RGB_LED_B_PIN      EXP1_08_PIN
413
         #endif
413
         #endif
414
       #elif ENABLED(FYSETC_MINI_12864_2_1)
414
       #elif ENABLED(FYSETC_MINI_12864_2_1)
415
-        #define NEOPIXEL_PIN         EXP1_05_PIN
415
+        #define NEOPIXEL_PIN         EXP1_06_PIN
416
       #endif
416
       #endif
417
 
417
 
418
     #else                                         // !FYSETC_MINI_12864
418
     #else                                         // !FYSETC_MINI_12864
419
 
419
 
420
       #if ENABLED(MKS_MINI_12864)
420
       #if ENABLED(MKS_MINI_12864)
421
 
421
 
422
-        #define DOGLCD_CS            EXP1_05_PIN
423
-        #define DOGLCD_A0            EXP1_04_PIN
424
-        #define DOGLCD_SCK           EXP2_09_PIN
425
-        #define DOGLCD_MOSI          EXP2_05_PIN
422
+        #define DOGLCD_CS            EXP1_06_PIN
423
+        #define DOGLCD_A0            EXP1_07_PIN
424
+        #define DOGLCD_SCK           EXP2_02_PIN
425
+        #define DOGLCD_MOSI          EXP2_06_PIN
426
 
426
 
427
       #elif ENABLED(ENDER2_STOCKDISPLAY)
427
       #elif ENABLED(ENDER2_STOCKDISPLAY)
428
 
428
 
429
         /**
429
         /**
430
          * Creality Ender-2 display pinout
430
          * Creality Ender-2 display pinout
431
          *                   ------
431
          *                   ------
432
-         *      (SCK) P1_30 |10  9 | P0_28 (BTN_ENC)
433
-         *  (BTN_EN1) P1_18 | 8  7 | P1_19 (RESET)
434
-         *  (BTN_EN2) P1_20   6  5 | P1_21 (LCD_A0)
435
-         *   (LCD_CS) P1_22 | 4  3 | P1_23 (MOSI)
436
-         *              GND | 2  1 | 5V
432
+         *      (SCK) P1_30 | 1  2 | P0_28 (BTN_ENC)
433
+         *  (BTN_EN1) P1_18 | 3  4 | P1_19 (RESET)
434
+         *  (BTN_EN2) P1_20   5  6 | P1_21 (LCD_A0)
435
+         *   (LCD_CS) P1_22 | 7  8 | P1_23 (MOSI)
436
+         *              GND | 9 10 | 5V
437
          *                   ------
437
          *                   ------
438
          *                    EXP1
438
          *                    EXP1
439
          */
439
          */
440
 
440
 
441
-        #define BTN_EN1              EXP1_08_PIN
442
-        #define BTN_EN2              EXP1_06_PIN
443
-        #define BTN_ENC              EXP1_09_PIN
444
-        #define DOGLCD_CS            EXP1_04_PIN
445
-        #define DOGLCD_A0            EXP1_05_PIN
446
-        #define DOGLCD_SCK           EXP1_10_PIN
447
-        #define DOGLCD_MOSI          EXP1_03_PIN
441
+        #define BTN_EN1              EXP1_03_PIN
442
+        #define BTN_EN2              EXP1_05_PIN
443
+        #define BTN_ENC              EXP1_02_PIN
444
+        #define DOGLCD_CS            EXP1_07_PIN
445
+        #define DOGLCD_A0            EXP1_06_PIN
446
+        #define DOGLCD_SCK           EXP1_01_PIN
447
+        #define DOGLCD_MOSI          EXP1_08_PIN
448
         #define FORCE_SOFT_SPI
448
         #define FORCE_SOFT_SPI
449
         #define LCD_BACKLIGHT_PIN          -1
449
         #define LCD_BACKLIGHT_PIN          -1
450
       #endif
450
       #endif
451
 
451
 
452
       #if IS_ULTIPANEL
452
       #if IS_ULTIPANEL
453
-        #define LCD_PINS_D5          EXP1_05_PIN
454
-        #define LCD_PINS_D6          EXP1_04_PIN
455
-        #define LCD_PINS_D7          EXP1_03_PIN
453
+        #define LCD_PINS_D5          EXP1_06_PIN
454
+        #define LCD_PINS_D6          EXP1_07_PIN
455
+        #define LCD_PINS_D7          EXP1_08_PIN
456
 
456
 
457
         #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
457
         #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
458
           #define BTN_ENC_EN         LCD_PINS_D7  // Detect the presence of the encoder
458
           #define BTN_ENC_EN         LCD_PINS_D7  // Detect the presence of the encoder
467
 #endif // HAS_WIRED_LCD
467
 #endif // HAS_WIRED_LCD
468
 
468
 
469
 #if NEED_TOUCH_PINS
469
 #if NEED_TOUCH_PINS
470
-  #define TOUCH_CS_PIN               EXP1_06_PIN
471
-  #define TOUCH_SCK_PIN              EXP2_09_PIN
472
-  #define TOUCH_MOSI_PIN             EXP2_05_PIN
473
-  #define TOUCH_MISO_PIN             EXP2_10_PIN
474
-  #define TOUCH_INT_PIN              EXP1_05_PIN
470
+  #define TOUCH_CS_PIN               EXP1_05_PIN
471
+  #define TOUCH_SCK_PIN              EXP2_02_PIN
472
+  #define TOUCH_MOSI_PIN             EXP2_06_PIN
473
+  #define TOUCH_MISO_PIN             EXP2_01_PIN
474
+  #define TOUCH_INT_PIN              EXP1_06_PIN
475
 #endif
475
 #endif
476
 
476
 
477
 /**
477
 /**

+ 105
- 105
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h 查看文件

246
 #endif
246
 #endif
247
 
247
 
248
 /**       ------                ------
248
 /**       ------                ------
249
- *  1.30 |10  9 | 0.28    0.17 |10  9 | 0.15
250
- *  1.18 | 8  7 | 1.19    3.26 | 8  7 | 0.16
251
- *  1.20   6  5 | 1.21    3.25   6  5 | 0.18
252
- *  1.22 | 4  3 | 1.23    1.31 | 4  3 | RESET
253
- *   GND | 2  1 | 5V       GND | 2  1 | --
249
+ *  1.30 | 1  2 | 0.28    0.17 | 1  2 | 0.15
250
+ *  1.18 | 3  4 | 1.19    3.26 | 3  4 | 0.16
251
+ *  1.20   5  6 | 1.21    3.25   5  6 | 0.18
252
+ *  1.22 | 7  8 | 1.23    1.31 | 7  8 | RESET
253
+ *   GND | 9 10 | 5V       GND | 9 10 | --
254
  *        ------                ------
254
  *        ------                ------
255
  *         EXP1                  EXP2
255
  *         EXP1                  EXP2
256
  */
256
  */
257
-#define EXP1_03_PIN                        P1_23
258
-#define EXP1_04_PIN                        P1_22
259
-#define EXP1_05_PIN                        P1_21
260
-#define EXP1_06_PIN                        P1_20
261
-#define EXP1_07_PIN                        P1_19
262
-#define EXP1_08_PIN                        P1_18
263
-#define EXP1_09_PIN                        P0_28
264
-#define EXP1_10_PIN                        P1_30
265
-
266
-#define EXP2_03_PIN                        -1     // RESET
267
-#define EXP2_04_PIN                        P1_31
268
-#define EXP2_05_PIN                        P0_18
269
-#define EXP2_06_PIN                        P3_25
270
-#define EXP2_07_PIN                        P0_16
271
-#define EXP2_08_PIN                        P3_26
272
-#define EXP2_09_PIN                        P0_15
273
-#define EXP2_10_PIN                        P0_17
257
+#define EXP1_08_PIN                        P1_23
258
+#define EXP1_07_PIN                        P1_22
259
+#define EXP1_06_PIN                        P1_21
260
+#define EXP1_05_PIN                        P1_20
261
+#define EXP1_04_PIN                        P1_19
262
+#define EXP1_03_PIN                        P1_18
263
+#define EXP1_02_PIN                        P0_28
264
+#define EXP1_01_PIN                        P1_30
265
+
266
+#define EXP2_08_PIN                        -1     // RESET
267
+#define EXP2_07_PIN                        P1_31
268
+#define EXP2_06_PIN                        P0_18
269
+#define EXP2_05_PIN                        P3_25
270
+#define EXP2_04_PIN                        P0_16
271
+#define EXP2_03_PIN                        P3_26
272
+#define EXP2_02_PIN                        P0_15
273
+#define EXP2_01_PIN                        P0_17
274
 
274
 
275
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
275
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
276
 
276
 
277
   // RET6 DWIN ENCODER LCD
277
   // RET6 DWIN ENCODER LCD
278
-  #define BTN_ENC                    EXP1_06_PIN
279
-  #define BTN_EN1                    EXP1_03_PIN
280
-  #define BTN_EN2                    EXP1_04_PIN
278
+  #define BTN_ENC                    EXP1_05_PIN
279
+  #define BTN_EN1                    EXP1_08_PIN
280
+  #define BTN_EN2                    EXP1_07_PIN
281
 
281
 
282
   #ifndef BEEPER_PIN
282
   #ifndef BEEPER_PIN
283
-    #define BEEPER_PIN               EXP1_05_PIN
283
+    #define BEEPER_PIN               EXP1_06_PIN
284
   #endif
284
   #endif
285
 
285
 
286
 #elif HAS_WIRED_LCD
286
 #elif HAS_WIRED_LCD
300
      *
300
      *
301
      *                BEFORE                     AFTER
301
      *                BEFORE                     AFTER
302
      *                ------                     ------
302
      *                ------                     ------
303
-     *      (BEEPER) | 10 9 | (CLK)    (BEEPER) | 10 9 | (CLK)
304
-     *     (BTN_ENC) | 8  7 | --      (BTN_ENC) | 8  7 | --
305
-     *     (BTN_EN1)   6  5 | (SID)   (BTN_EN1)   6  5 | (SID)
306
-     *     (BTN_EN2) | 4  3 | (CS)    (BTN_EN2) | 4  3 | (CS)
307
-     *            5V | 2  1 | GND           GND | 2  1 | 5V
303
+     *      (BEEPER) | 1  2 | (CLK)    (BEEPER) | 1  2 | (CLK)
304
+     *     (BTN_ENC) | 3  4 | --      (BTN_ENC) | 3  4 | --
305
+     *     (BTN_EN1)   5  6 | (SID)   (BTN_EN1)   5  6 | (SID)
306
+     *     (BTN_EN2) | 7  8 | (CS)    (BTN_EN2) | 7  8 | (CS)
307
+     *            5V | 9 10 | GND           GND | 9 10 | 5V
308
      *                ------                     ------
308
      *                ------                     ------
309
      *                 LCD                        LCD
309
      *                 LCD                        LCD
310
      */
310
      */
311
 
311
 
312
-    #define LCD_PINS_RS              EXP1_07_PIN
312
+    #define LCD_PINS_RS              EXP1_04_PIN
313
 
313
 
314
-    #define BTN_EN1                  EXP1_05_PIN
315
-    #define BTN_EN2                  EXP1_04_PIN
316
-    #define BTN_ENC                  EXP1_10_PIN
314
+    #define BTN_EN1                  EXP1_06_PIN
315
+    #define BTN_EN2                  EXP1_07_PIN
316
+    #define BTN_ENC                  EXP1_01_PIN
317
 
317
 
318
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
319
-    #define LCD_PINS_D4              EXP1_06_PIN
320
-    #define BEEPER_PIN               EXP1_03_PIN
318
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
319
+    #define LCD_PINS_D4              EXP1_05_PIN
320
+    #define BEEPER_PIN               EXP1_08_PIN
321
 
321
 
322
   #elif ENABLED(ANET_FULL_GRAPHICS_LCD)
322
   #elif ENABLED(ANET_FULL_GRAPHICS_LCD)
323
     #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
323
     #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
336
     *
336
     *
337
     *            BEFORE                     AFTER
337
     *            BEFORE                     AFTER
338
     *            ------                     ------
338
     *            ------                     ------
339
-    *  (BEEPER) |10  9 | (CLK)    (BEEPER) |10  9 | --
340
-    * (BTN_ENC) | 8  7 | --      (BTN_ENC) | 8  7 | (CLK)
341
-    * (BTN_EN1)   6  5 | (SID)   (BTN_EN1)   6  5 | (SID)
342
-    * (BTN_EN2) | 4  3 | (CS)    (BTN_EN2) | 4  3 | (CS)
343
-    *        5V | 2  1 | GND           GND | 2  1 | 5V
339
+    *  (BEEPER) | 1  2 | (CLK)    (BEEPER) | 1  2 | --
340
+    * (BTN_ENC) | 3  4 | --      (BTN_ENC) | 3  4 | (CLK)
341
+    * (BTN_EN1)   5  6 | (SID)   (BTN_EN1)   5  6 | (SID)
342
+    * (BTN_EN2) | 7  8 | (CS)    (BTN_EN2) | 7  8 | (CS)
343
+    *        5V | 9 10 | GND           GND | 9 10 | 5V
344
     *            ------                     ------
344
     *            ------                     ------
345
     *             LCD                        LCD
345
     *             LCD                        LCD
346
     */
346
     */
347
 
347
 
348
-    #define LCD_PINS_RS              EXP1_03_PIN
348
+    #define LCD_PINS_RS              EXP1_08_PIN
349
 
349
 
350
-    #define BTN_EN1                  EXP1_06_PIN
351
-    #define BTN_EN2                  EXP1_04_PIN
352
-    #define BTN_ENC                  EXP1_08_PIN
350
+    #define BTN_EN1                  EXP1_05_PIN
351
+    #define BTN_EN2                  EXP1_07_PIN
352
+    #define BTN_ENC                  EXP1_03_PIN
353
 
353
 
354
-    #define LCD_PINS_ENABLE          EXP1_05_PIN
355
-    #define LCD_PINS_D4              EXP1_07_PIN
354
+    #define LCD_PINS_ENABLE          EXP1_06_PIN
355
+    #define LCD_PINS_D4              EXP1_04_PIN
356
 
356
 
357
-    #define BEEPER_PIN               EXP1_10_PIN
357
+    #define BEEPER_PIN               EXP1_01_PIN
358
 
358
 
359
   #elif ENABLED(CR10_STOCKDISPLAY)
359
   #elif ENABLED(CR10_STOCKDISPLAY)
360
-    #define BTN_ENC                  EXP1_09_PIN  // (58) open-drain
361
-    #define LCD_PINS_RS              EXP1_04_PIN
360
+    #define BTN_ENC                  EXP1_02_PIN  // (58) open-drain
361
+    #define LCD_PINS_RS              EXP1_07_PIN
362
 
362
 
363
-    #define BTN_EN1                  EXP1_08_PIN
364
-    #define BTN_EN2                  EXP1_06_PIN
363
+    #define BTN_EN1                  EXP1_03_PIN
364
+    #define BTN_EN2                  EXP1_05_PIN
365
 
365
 
366
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
367
-    #define LCD_PINS_D4              EXP1_05_PIN
366
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
367
+    #define LCD_PINS_D4              EXP1_06_PIN
368
 
368
 
369
   #elif ENABLED(ENDER2_STOCKDISPLAY)
369
   #elif ENABLED(ENDER2_STOCKDISPLAY)
370
 
370
 
371
     /** Creality Ender-2 display pinout
371
     /** Creality Ender-2 display pinout
372
      *                   ------
372
      *                   ------
373
-     *   (SCK)     1.30 |10  9 | 0.28 (BTN_ENC)
374
-     *   (BTN_EN1) 1.18 | 8  7 | 1.19 (RESET)
375
-     *   (BTN_EN2) 1.20   6  5 | 1.21 (LCD_A0)
376
-     *   (LCD_RS)  1.22 | 4  3 | 1.23 (MOSI)
377
-     *              GND | 2  1 | 5V
373
+     *   (SCK)     1.30 | 1  2 | 0.28 (BTN_ENC)
374
+     *   (BTN_EN1) 1.18 | 3  4 | 1.19 (RESET)
375
+     *   (BTN_EN2) 1.20   5  6 | 1.21 (LCD_A0)
376
+     *   (LCD_RS)  1.22 | 7  8 | 1.23 (MOSI)
377
+     *              GND | 9 10 | 5V
378
      *                   ------
378
      *                   ------
379
      *                    EXP1
379
      *                    EXP1
380
      */
380
      */
381
 
381
 
382
-    #define BTN_EN1                  EXP1_08_PIN
383
-    #define BTN_EN2                  EXP1_06_PIN
384
-    #define BTN_ENC                  EXP1_09_PIN
382
+    #define BTN_EN1                  EXP1_03_PIN
383
+    #define BTN_EN2                  EXP1_05_PIN
384
+    #define BTN_ENC                  EXP1_02_PIN
385
 
385
 
386
-    #define DOGLCD_CS                EXP1_04_PIN
387
-    #define DOGLCD_A0                EXP1_05_PIN
388
-    #define DOGLCD_SCK               EXP1_10_PIN
389
-    #define DOGLCD_MOSI              EXP1_03_PIN
386
+    #define DOGLCD_CS                EXP1_07_PIN
387
+    #define DOGLCD_A0                EXP1_06_PIN
388
+    #define DOGLCD_SCK               EXP1_01_PIN
389
+    #define DOGLCD_MOSI              EXP1_08_PIN
390
     #define FORCE_SOFT_SPI
390
     #define FORCE_SOFT_SPI
391
     #define LCD_BACKLIGHT_PIN              -1
391
     #define LCD_BACKLIGHT_PIN              -1
392
 
392
 
393
   #elif HAS_SPI_TFT                               // Config for Classic UI (emulated DOGM) and Color UI
393
   #elif HAS_SPI_TFT                               // Config for Classic UI (emulated DOGM) and Color UI
394
-    #define TFT_CS_PIN               EXP1_04_PIN
395
-    #define TFT_A0_PIN               EXP1_03_PIN
396
-    #define TFT_DC_PIN               EXP1_03_PIN
397
-    #define TFT_MISO_PIN             EXP2_10_PIN
398
-    #define TFT_BACKLIGHT_PIN        EXP1_08_PIN
399
-    #define TFT_RESET_PIN            EXP1_07_PIN
394
+    #define TFT_CS_PIN               EXP1_07_PIN
395
+    #define TFT_A0_PIN               EXP1_08_PIN
396
+    #define TFT_DC_PIN               EXP1_08_PIN
397
+    #define TFT_MISO_PIN             EXP2_01_PIN
398
+    #define TFT_BACKLIGHT_PIN        EXP1_03_PIN
399
+    #define TFT_RESET_PIN            EXP1_04_PIN
400
 
400
 
401
     #define LCD_USE_DMA_SPI
401
     #define LCD_USE_DMA_SPI
402
 
402
 
403
-    #define TOUCH_INT_PIN            EXP1_05_PIN
404
-    #define TOUCH_CS_PIN             EXP1_06_PIN
403
+    #define TOUCH_INT_PIN            EXP1_06_PIN
404
+    #define TOUCH_CS_PIN             EXP1_05_PIN
405
     #define TOUCH_BUTTONS_HW_SPI
405
     #define TOUCH_BUTTONS_HW_SPI
406
     #define TOUCH_BUTTONS_HW_SPI_DEVICE        1
406
     #define TOUCH_BUTTONS_HW_SPI_DEVICE        1
407
 
407
 
408
     // SPI 1
408
     // SPI 1
409
-    #define SD_SCK_PIN               EXP2_09_PIN
410
-    #define SD_MISO_PIN              EXP2_10_PIN
411
-    #define SD_MOSI_PIN              EXP2_05_PIN
409
+    #define SD_SCK_PIN               EXP2_02_PIN
410
+    #define SD_MISO_PIN              EXP2_01_PIN
411
+    #define SD_MOSI_PIN              EXP2_06_PIN
412
 
412
 
413
     #define TFT_BUFFER_SIZE                 2400
413
     #define TFT_BUFFER_SIZE                 2400
414
 
414
 
415
   #elif IS_TFTGLCD_PANEL
415
   #elif IS_TFTGLCD_PANEL
416
 
416
 
417
     #if ENABLED(TFTGLCD_PANEL_SPI)
417
     #if ENABLED(TFTGLCD_PANEL_SPI)
418
-      #define TFTGLCD_CS             EXP2_08_PIN
418
+      #define TFTGLCD_CS             EXP2_03_PIN
419
     #endif
419
     #endif
420
 
420
 
421
-    #define SD_DETECT_PIN            EXP2_04_PIN
421
+    #define SD_DETECT_PIN            EXP2_07_PIN
422
 
422
 
423
   #else
423
   #else
424
 
424
 
425
-    #define BTN_ENC                  EXP1_09_PIN  // (58) open-drain
426
-    #define LCD_PINS_RS              EXP1_07_PIN
425
+    #define BTN_ENC                  EXP1_02_PIN  // (58) open-drain
426
+    #define LCD_PINS_RS              EXP1_04_PIN
427
 
427
 
428
-    #define BTN_EN1                  EXP2_08_PIN  // (31) J3-2 & AUX-4
429
-    #define BTN_EN2                  EXP2_06_PIN  // (33) J3-4 & AUX-4
428
+    #define BTN_EN1                  EXP2_03_PIN  // (31) J3-2 & AUX-4
429
+    #define BTN_EN2                  EXP2_05_PIN  // (33) J3-4 & AUX-4
430
 
430
 
431
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
432
-    #define LCD_PINS_D4              EXP1_06_PIN
431
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
432
+    #define LCD_PINS_D4              EXP1_05_PIN
433
 
433
 
434
-    #define LCD_SDSS                 EXP2_07_PIN  // (16) J3-7 & AUX-4
434
+    #define LCD_SDSS                 EXP2_04_PIN  // (16) J3-7 & AUX-4
435
 
435
 
436
     #if ENABLED(FYSETC_MINI_12864)
436
     #if ENABLED(FYSETC_MINI_12864)
437
-      #define DOGLCD_CS              EXP1_08_PIN
438
-      #define DOGLCD_A0              EXP1_07_PIN
439
-      #define DOGLCD_SCK             EXP2_09_PIN
440
-      #define DOGLCD_MOSI            EXP2_05_PIN
437
+      #define DOGLCD_CS              EXP1_03_PIN
438
+      #define DOGLCD_A0              EXP1_04_PIN
439
+      #define DOGLCD_SCK             EXP2_02_PIN
440
+      #define DOGLCD_MOSI            EXP2_06_PIN
441
 
441
 
442
       #define LCD_BACKLIGHT_PIN            -1
442
       #define LCD_BACKLIGHT_PIN            -1
443
 
443
 
444
       #define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
444
       #define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
445
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
445
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
446
 
446
 
447
-      #define LCD_RESET_PIN          EXP1_06_PIN  // Must be high or open for LCD to operate normally.
447
+      #define LCD_RESET_PIN          EXP1_05_PIN  // Must be high or open for LCD to operate normally.
448
 
448
 
449
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
449
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
450
         #ifndef RGB_LED_R_PIN
450
         #ifndef RGB_LED_R_PIN
451
-          #define RGB_LED_R_PIN      EXP1_05_PIN
451
+          #define RGB_LED_R_PIN      EXP1_06_PIN
452
         #endif
452
         #endif
453
         #ifndef RGB_LED_G_PIN
453
         #ifndef RGB_LED_G_PIN
454
-          #define RGB_LED_G_PIN      EXP1_04_PIN
454
+          #define RGB_LED_G_PIN      EXP1_07_PIN
455
         #endif
455
         #endif
456
         #ifndef RGB_LED_B_PIN
456
         #ifndef RGB_LED_B_PIN
457
-          #define RGB_LED_B_PIN      EXP1_03_PIN
457
+          #define RGB_LED_B_PIN      EXP1_08_PIN
458
         #endif
458
         #endif
459
       #elif ENABLED(FYSETC_MINI_12864_2_1)
459
       #elif ENABLED(FYSETC_MINI_12864_2_1)
460
-        #define NEOPIXEL_PIN         EXP1_05_PIN
460
+        #define NEOPIXEL_PIN         EXP1_06_PIN
461
       #endif
461
       #endif
462
 
462
 
463
     #else                                         // !FYSETC_MINI_12864
463
     #else                                         // !FYSETC_MINI_12864
464
 
464
 
465
       #if ENABLED(MKS_MINI_12864)
465
       #if ENABLED(MKS_MINI_12864)
466
-        #define DOGLCD_CS            EXP1_05_PIN
467
-        #define DOGLCD_A0            EXP1_04_PIN
468
-        #define DOGLCD_SCK           EXP2_09_PIN
469
-        #define DOGLCD_MOSI          EXP2_05_PIN
466
+        #define DOGLCD_CS            EXP1_06_PIN
467
+        #define DOGLCD_A0            EXP1_07_PIN
468
+        #define DOGLCD_SCK           EXP2_02_PIN
469
+        #define DOGLCD_MOSI          EXP2_06_PIN
470
         #define FORCE_SOFT_SPI
470
         #define FORCE_SOFT_SPI
471
       #endif
471
       #endif
472
 
472
 
473
       #if IS_ULTIPANEL
473
       #if IS_ULTIPANEL
474
-        #define LCD_PINS_D5          EXP1_05_PIN
475
-        #define LCD_PINS_D6          EXP1_04_PIN
476
-        #define LCD_PINS_D7          EXP1_03_PIN
474
+        #define LCD_PINS_D5          EXP1_06_PIN
475
+        #define LCD_PINS_D6          EXP1_07_PIN
476
+        #define LCD_PINS_D7          EXP1_08_PIN
477
 
477
 
478
         #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
478
         #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
479
-          #define BTN_ENC_EN         EXP1_03_PIN  // Detect the presence of the encoder
479
+          #define BTN_ENC_EN         EXP1_08_PIN  // Detect the presence of the encoder
480
         #endif
480
         #endif
481
 
481
 
482
       #endif
482
       #endif

+ 27
- 27
Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h 查看文件

134
   #define SD_SCK_PIN                       P0_15
134
   #define SD_SCK_PIN                       P0_15
135
   #define SD_MISO_PIN                      P0_17
135
   #define SD_MISO_PIN                      P0_17
136
   #define SD_MOSI_PIN                      P0_18
136
   #define SD_MOSI_PIN                      P0_18
137
-  #define SD_SS_PIN                  EXP2_07_PIN
138
-  #define SD_DETECT_PIN              EXP2_04_PIN
137
+  #define SD_SS_PIN                  EXP2_04_PIN
138
+  #define SD_DETECT_PIN              EXP2_07_PIN
139
 
139
 
140
 #elif SD_CONNECTION_IS(ONBOARD)
140
 #elif SD_CONNECTION_IS(ONBOARD)
141
   #undef SD_DETECT_PIN
141
   #undef SD_DETECT_PIN
152
 #if ENABLED(BTT_MOTOR_EXPANSION)
152
 #if ENABLED(BTT_MOTOR_EXPANSION)
153
   /**
153
   /**
154
    *          ------                       ------
154
    *          ------                       ------
155
-   * (M3STP) |10  9 | (M3DIR)    (M3DIAG) |10  9 | (M3RX)
156
-   * (M2STP) | 8  7 | (M2DIR)    (M2DIAG) | 8  7 | (M2RX)
157
-   * (M1DIR)   6  5 | (M1STP)    (M1DIAG)   6  5 | (M1RX)
158
-   *  (M1EN) | 4  3 | --           (M3EN) | 4  3 | (M2EN)
159
-   *     GND | 2  1 | --              GND | 2  1 | --
155
+   * (M3STP) | 1  2 | (M3DIR)    (M3DIAG) | 1  2 | (M3RX)
156
+   * (M2STP) | 3  4 | (M2DIR)    (M2DIAG) | 3  4 | (M2RX)
157
+   * (M1DIR)   5  6 | (M1STP)    (M1DIAG)   5  6 | (M1RX)
158
+   *  (M1EN) | 7  8 | --           (M3EN) | 7  8 | (M2EN)
159
+   *     GND | 9 10 | --              GND | 9 10 | --
160
    *          ------                       ------
160
    *          ------                       ------
161
    *           EXP2                         EXP1
161
    *           EXP2                         EXP1
162
    *
162
    *
164
    */
164
    */
165
 
165
 
166
   // M1 on Driver Expansion Module
166
   // M1 on Driver Expansion Module
167
-  #define E2_STEP_PIN                EXP2_05_PIN
168
-  #define E2_DIR_PIN                 EXP2_06_PIN
169
-  #define E2_ENABLE_PIN              EXP2_04_PIN
167
+  #define E2_STEP_PIN                EXP2_06_PIN
168
+  #define E2_DIR_PIN                 EXP2_05_PIN
169
+  #define E2_ENABLE_PIN              EXP2_07_PIN
170
   #if !EXP_MOT_USE_EXP2_ONLY
170
   #if !EXP_MOT_USE_EXP2_ONLY
171
-    #define E2_DIAG_PIN              EXP1_06_PIN
172
-    #define E2_CS_PIN                EXP1_05_PIN
171
+    #define E2_DIAG_PIN              EXP1_05_PIN
172
+    #define E2_CS_PIN                EXP1_06_PIN
173
     #if HAS_TMC_UART
173
     #if HAS_TMC_UART
174
-      #define E2_SERIAL_TX_PIN       EXP1_05_PIN
174
+      #define E2_SERIAL_TX_PIN       EXP1_06_PIN
175
       #define E2_SERIAL_RX_PIN  E2_SERIAL_TX_PIN
175
       #define E2_SERIAL_RX_PIN  E2_SERIAL_TX_PIN
176
     #endif
176
     #endif
177
   #endif
177
   #endif
178
 
178
 
179
   // M2 on Driver Expansion Module
179
   // M2 on Driver Expansion Module
180
-  #define E3_STEP_PIN                EXP2_08_PIN
181
-  #define E3_DIR_PIN                 EXP2_07_PIN
180
+  #define E3_STEP_PIN                EXP2_03_PIN
181
+  #define E3_DIR_PIN                 EXP2_04_PIN
182
   #if !EXP_MOT_USE_EXP2_ONLY
182
   #if !EXP_MOT_USE_EXP2_ONLY
183
-    #define E3_ENABLE_PIN            EXP1_03_PIN
184
-    #define E3_DIAG_PIN              EXP1_08_PIN
185
-    #define E3_CS_PIN                EXP1_07_PIN
183
+    #define E3_ENABLE_PIN            EXP1_08_PIN
184
+    #define E3_DIAG_PIN              EXP1_03_PIN
185
+    #define E3_CS_PIN                EXP1_04_PIN
186
     #if HAS_TMC_UART
186
     #if HAS_TMC_UART
187
-      #define E3_SERIAL_TX_PIN       EXP1_07_PIN
187
+      #define E3_SERIAL_TX_PIN       EXP1_04_PIN
188
       #define E3_SERIAL_RX_PIN  E3_SERIAL_TX_PIN
188
       #define E3_SERIAL_RX_PIN  E3_SERIAL_TX_PIN
189
     #endif
189
     #endif
190
   #else
190
   #else
191
-    #define E3_ENABLE_PIN            EXP2_04_PIN
191
+    #define E3_ENABLE_PIN            EXP2_07_PIN
192
   #endif
192
   #endif
193
 
193
 
194
   // M3 on Driver Expansion Module
194
   // M3 on Driver Expansion Module
195
-  #define E4_STEP_PIN                EXP2_10_PIN
196
-  #define E4_DIR_PIN                 EXP2_09_PIN
195
+  #define E4_STEP_PIN                EXP2_01_PIN
196
+  #define E4_DIR_PIN                 EXP2_02_PIN
197
   #if !EXP_MOT_USE_EXP2_ONLY
197
   #if !EXP_MOT_USE_EXP2_ONLY
198
-    #define E4_ENABLE_PIN            EXP1_04_PIN
199
-    #define E4_DIAG_PIN              EXP1_10_PIN
200
-    #define E4_CS_PIN                EXP1_09_PIN
198
+    #define E4_ENABLE_PIN            EXP1_07_PIN
199
+    #define E4_DIAG_PIN              EXP1_01_PIN
200
+    #define E4_CS_PIN                EXP1_02_PIN
201
     #if HAS_TMC_UART
201
     #if HAS_TMC_UART
202
-      #define E4_SERIAL_TX_PIN       EXP1_09_PIN
202
+      #define E4_SERIAL_TX_PIN       EXP1_02_PIN
203
       #define E4_SERIAL_RX_PIN  E4_SERIAL_TX_PIN
203
       #define E4_SERIAL_RX_PIN  E4_SERIAL_TX_PIN
204
     #endif
204
     #endif
205
   #else
205
   #else
206
-    #define E4_ENABLE_PIN            EXP2_04_PIN
206
+    #define E4_ENABLE_PIN            EXP2_07_PIN
207
   #endif
207
   #endif
208
 
208
 
209
 #endif // BTT_MOTOR_EXPANSION
209
 #endif // BTT_MOTOR_EXPANSION

+ 33
- 35
Marlin/src/pins/lpc1768/pins_EMOTRONIC.h 查看文件

91
 //
91
 //
92
 // Extension ports
92
 // Extension ports
93
 //
93
 //
94
-// warning: pins are backward numbered w.r.t. to the
95
-// schematics, e.g. EXP1_01 / EXP1_02 are X1-10 / X1-9.
96
-#define EXP1_01_PIN                        P0_28  // SCL0
97
-#define EXP1_02_PIN                        P0_27  // SDA0
98
-#define EXP1_03_PIN                        P0_16  // SSEL0
99
-#define EXP1_04_PIN                        P0_15  // SCK0
100
-#define EXP1_05_PIN                        P0_18  // MOSI0
101
-#define EXP1_06_PIN                        P0_17  // MISO0
102
-#define EXP1_07_PIN                        P1_31
103
-#define EXP1_08_PIN                        P1_30
104
-#define EXP1_09_PIN                        P0_02  // TX0
105
-#define EXP1_10_PIN                        P0_03  // RX0
106
-
107
-#define EXP2_03_PIN                        P1_27
108
-#define EXP2_04_PIN                        P1_26
109
-#define EXP2_05_PIN                        P1_29
110
-#define EXP2_06_PIN                        P1_28
111
-#define EXP2_07_PIN                        P0_01  // SCL1
112
-#define EXP2_08_PIN                        P0_00  // SDA1
113
-#define EXP2_09_PIN                        P0_11
114
-#define EXP2_10_PIN                        P0_10
94
+#define EXP1_10_PIN                        P0_28  // SCL0
95
+#define EXP1_09_PIN                        P0_27  // SDA0
96
+#define EXP1_08_PIN                        P0_16  // SSEL0
97
+#define EXP1_07_PIN                        P0_15  // SCK0
98
+#define EXP1_06_PIN                        P0_18  // MOSI0
99
+#define EXP1_05_PIN                        P0_17  // MISO0
100
+#define EXP1_04_PIN                        P1_31
101
+#define EXP1_03_PIN                        P1_30
102
+#define EXP1_02_PIN                        P0_02  // TX0
103
+#define EXP1_01_PIN                        P0_03  // RX0
104
+
105
+#define EXP2_08_PIN                        P1_27
106
+#define EXP2_07_PIN                        P1_26
107
+#define EXP2_06_PIN                        P1_29
108
+#define EXP2_05_PIN                        P1_28
109
+#define EXP2_04_PIN                        P0_01  // SCL1
110
+#define EXP2_03_PIN                        P0_00  // SDA1
111
+#define EXP2_02_PIN                        P0_11
112
+#define EXP2_01_PIN                        P0_10
115
 
113
 
116
 //
114
 //
117
 // SD Support
115
 // SD Support
126
   #define SD_MOSI_PIN                      P0_09
124
   #define SD_MOSI_PIN                      P0_09
127
   #define SD_SS_PIN                        P0_06
125
   #define SD_SS_PIN                        P0_06
128
 #elif SD_CONNECTION_IS(LCD)
126
 #elif SD_CONNECTION_IS(LCD)
129
-  #define SD_SCK_PIN                 EXP1_04_PIN
130
-  #define SD_MISO_PIN                EXP1_06_PIN
131
-  #define SD_MOSI_PIN                EXP1_05_PIN
132
-  #define SD_SS_PIN                  EXP1_03_PIN
133
-  #define SD_DETECT_PIN              EXP1_07_PIN
127
+  #define SD_SCK_PIN                 EXP1_07_PIN
128
+  #define SD_MISO_PIN                EXP1_05_PIN
129
+  #define SD_MOSI_PIN                EXP1_06_PIN
130
+  #define SD_SS_PIN                  EXP1_08_PIN
131
+  #define SD_DETECT_PIN              EXP1_04_PIN
134
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
132
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
135
   #error "No custom SD drive cable defined for this board."
133
   #error "No custom SD drive cable defined for this board."
136
 #endif
134
 #endif
139
 // LCD / Controller
137
 // LCD / Controller
140
 //
138
 //
141
 #if ENABLED(EMOTION_TECH_LCD)
139
 #if ENABLED(EMOTION_TECH_LCD)
142
-  #define BEEPER_PIN                 EXP2_10_PIN
143
-  #define DOGLCD_A0                  EXP2_05_PIN
144
-  #define DOGLCD_CS                  EXP2_07_PIN
145
-  #define DOGLCD_SCK                 EXP1_04_PIN
146
-  #define DOGLCD_MOSI                EXP1_05_PIN
147
-
148
-  #define BTN_EN1                    EXP2_04_PIN
149
-  #define BTN_EN2                    EXP2_06_PIN
150
-  #define BTN_ENC                    EXP2_09_PIN
140
+  #define BEEPER_PIN                 EXP2_01_PIN
141
+  #define DOGLCD_A0                  EXP2_06_PIN
142
+  #define DOGLCD_CS                  EXP2_04_PIN
143
+  #define DOGLCD_SCK                 EXP1_07_PIN
144
+  #define DOGLCD_MOSI                EXP1_06_PIN
145
+
146
+  #define BTN_EN1                    EXP2_07_PIN
147
+  #define BTN_EN2                    EXP2_05_PIN
148
+  #define BTN_ENC                    EXP2_02_PIN
151
 #endif
149
 #endif

+ 71
- 71
Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h 查看文件

231
 #define LED4_PIN                           P1_21
231
 #define LED4_PIN                           P1_21
232
 
232
 
233
 /**               ------                                        ------
233
 /**               ------                                        ------
234
- * (BEEPER) 1.31 |10  9 | 1.30 (BTN_ENC)      (MISO)       0.8 |10  9 | 0.7  (SD_SCK)
235
- * (LCD_EN) 0.18 | 8  7 | 0.16 (LCD_RS)       (BTN_EN1)   3.25 | 8  7 | 0.28 (SD_CS2)
236
- * (LCD_D4) 0.15   6  5 | 0.17 (LCD_D5)       (BTN_EN2)   3.26   6  5 | 0.9  (SD_MOSI)
237
- * (LCD_D6)  1.0 | 4  3 | 1.22 (LCD_D7)       (SD_DETECT) 0.27 | 4  3 | RESET
238
- *           GND | 2  1 | 5V                               GND | 2  1 | --
234
+ * (BEEPER) 1.31 | 1  2 | 1.30 (BTN_ENC)      (MISO)       0.8 | 1  2 | 0.7  (SD_SCK)
235
+ * (LCD_EN) 0.18 | 3  4 | 0.16 (LCD_RS)       (BTN_EN1)   3.25 | 3  4 | 0.28 (SD_CS2)
236
+ * (LCD_D4) 0.15   5  6 | 0.17 (LCD_D5)       (BTN_EN2)   3.26   5  6 | 0.9  (SD_MOSI)
237
+ * (LCD_D6)  1.0 | 7  8 | 1.22 (LCD_D7)       (SD_DETECT) 0.27 | 7  8 | RESET
238
+ *           GND | 9 10 | 5V                               GND | 9 10 | --
239
  *                ------                                        ------
239
  *                ------                                        ------
240
  *                 EXP1                                          EXP2
240
  *                 EXP1                                          EXP2
241
  */
241
  */
242
-#define EXP1_03_PIN                        P1_22
243
-#define EXP1_04_PIN                        P1_00
244
-#define EXP1_05_PIN                        P0_17
245
-#define EXP1_06_PIN                        P0_15
246
-#define EXP1_07_PIN                        P0_16
247
-#define EXP1_08_PIN                        P0_18
248
-#define EXP1_09_PIN                        P1_30
249
-#define EXP1_10_PIN                        P1_31
250
-
251
-#define EXP2_03_PIN                        -1     // RESET
252
-#define EXP2_04_PIN                        P0_27
253
-#define EXP2_05_PIN                        P0_09
254
-#define EXP2_06_PIN                        P3_26
255
-#define EXP2_07_PIN                        P0_28
256
-#define EXP2_08_PIN                        P3_25
257
-#define EXP2_09_PIN                        P0_07
258
-#define EXP2_10_PIN                        P0_08
242
+#define EXP1_08_PIN                        P1_22
243
+#define EXP1_07_PIN                        P1_00
244
+#define EXP1_06_PIN                        P0_17
245
+#define EXP1_05_PIN                        P0_15
246
+#define EXP1_04_PIN                        P0_16
247
+#define EXP1_03_PIN                        P0_18
248
+#define EXP1_02_PIN                        P1_30
249
+#define EXP1_01_PIN                        P1_31
250
+
251
+#define EXP2_08_PIN                        -1     // RESET
252
+#define EXP2_07_PIN                        P0_27
253
+#define EXP2_06_PIN                        P0_09
254
+#define EXP2_05_PIN                        P3_26
255
+#define EXP2_04_PIN                        P0_28
256
+#define EXP2_03_PIN                        P3_25
257
+#define EXP2_02_PIN                        P0_07
258
+#define EXP2_01_PIN                        P0_08
259
 
259
 
260
 #ifndef SDCARD_CONNECTION
260
 #ifndef SDCARD_CONNECTION
261
   #define SDCARD_CONNECTION              ONBOARD
261
   #define SDCARD_CONNECTION              ONBOARD
262
 #endif
262
 #endif
263
 
263
 
264
 #if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
264
 #if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
265
-  #define SD_DETECT_PIN              EXP2_04_PIN
266
-  #define SD_SCK_PIN                 EXP2_09_PIN
267
-  #define SD_MISO_PIN                EXP2_10_PIN
268
-  #define SD_MOSI_PIN                EXP2_05_PIN
265
+  #define SD_DETECT_PIN              EXP2_07_PIN
266
+  #define SD_SCK_PIN                 EXP2_02_PIN
267
+  #define SD_MISO_PIN                EXP2_01_PIN
268
+  #define SD_MOSI_PIN                EXP2_06_PIN
269
   #if SD_CONNECTION_IS(ONBOARD)
269
   #if SD_CONNECTION_IS(ONBOARD)
270
     #define ONBOARD_SD_CS_PIN              P0_06  // Chip select for "System" SD card
270
     #define ONBOARD_SD_CS_PIN              P0_06  // Chip select for "System" SD card
271
     #define SD_SS_PIN          ONBOARD_SD_CS_PIN
271
     #define SD_SS_PIN          ONBOARD_SD_CS_PIN
272
   #else
272
   #else
273
-    #define SD_SS_PIN                EXP2_07_PIN
273
+    #define SD_SS_PIN                EXP2_04_PIN
274
   #endif
274
   #endif
275
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
275
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
276
   #error "No custom SD drive cable defined for this board."
276
   #error "No custom SD drive cable defined for this board."
278
 
278
 
279
 #if HAS_WIRED_LCD
279
 #if HAS_WIRED_LCD
280
 
280
 
281
-  #define BEEPER_PIN                 EXP1_10_PIN
282
-  #define BTN_ENC                    EXP1_09_PIN
281
+  #define BEEPER_PIN                 EXP1_01_PIN
282
+  #define BTN_ENC                    EXP1_02_PIN
283
 
283
 
284
   #if ENABLED(CR10_STOCKDISPLAY)
284
   #if ENABLED(CR10_STOCKDISPLAY)
285
-    #define LCD_PINS_RS              EXP1_04_PIN
285
+    #define LCD_PINS_RS              EXP1_07_PIN
286
 
286
 
287
-    #define BTN_EN1                  EXP1_08_PIN
288
-    #define BTN_EN2                  EXP1_06_PIN
287
+    #define BTN_EN1                  EXP1_03_PIN
288
+    #define BTN_EN2                  EXP1_05_PIN
289
 
289
 
290
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
291
-    #define LCD_PINS_D4              EXP1_05_PIN
290
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
291
+    #define LCD_PINS_D4              EXP1_06_PIN
292
 
292
 
293
   #elif HAS_SPI_TFT                               // Config for Classic UI (emulated DOGM) and Color UI
293
   #elif HAS_SPI_TFT                               // Config for Classic UI (emulated DOGM) and Color UI
294
-    #define TFT_CS_PIN               EXP1_04_PIN
295
-    #define TFT_A0_PIN               EXP1_03_PIN
296
-    #define TFT_DC_PIN               EXP1_03_PIN
297
-    #define TFT_MISO_PIN             EXP2_10_PIN
298
-    #define TFT_BACKLIGHT_PIN        EXP1_08_PIN
299
-    #define TFT_RESET_PIN            EXP1_07_PIN
294
+    #define TFT_CS_PIN               EXP1_07_PIN
295
+    #define TFT_A0_PIN               EXP1_08_PIN
296
+    #define TFT_DC_PIN               EXP1_08_PIN
297
+    #define TFT_MISO_PIN             EXP2_01_PIN
298
+    #define TFT_BACKLIGHT_PIN        EXP1_03_PIN
299
+    #define TFT_RESET_PIN            EXP1_04_PIN
300
 
300
 
301
     #define LCD_USE_DMA_SPI
301
     #define LCD_USE_DMA_SPI
302
 
302
 
303
-    #define TOUCH_INT_PIN            EXP1_05_PIN
304
-    #define TOUCH_CS_PIN             EXP1_06_PIN
303
+    #define TOUCH_INT_PIN            EXP1_06_PIN
304
+    #define TOUCH_CS_PIN             EXP1_05_PIN
305
     #define TOUCH_BUTTONS_HW_SPI
305
     #define TOUCH_BUTTONS_HW_SPI
306
     #define TOUCH_BUTTONS_HW_SPI_DEVICE        2
306
     #define TOUCH_BUTTONS_HW_SPI_DEVICE        2
307
 
307
 
316
       #define TFT_QUEUE_SIZE                6144
316
       #define TFT_QUEUE_SIZE                6144
317
     #endif
317
     #endif
318
 
318
 
319
-    #define BTN_EN1                  EXP2_08_PIN
320
-    #define BTN_EN2                  EXP2_06_PIN
319
+    #define BTN_EN1                  EXP2_03_PIN
320
+    #define BTN_EN2                  EXP2_05_PIN
321
 
321
 
322
   #elif IS_TFTGLCD_PANEL
322
   #elif IS_TFTGLCD_PANEL
323
 
323
 
325
     #undef BTN_ENC
325
     #undef BTN_ENC
326
 
326
 
327
     #if ENABLED(TFTGLCD_PANEL_SPI)
327
     #if ENABLED(TFTGLCD_PANEL_SPI)
328
-      #define TFTGLCD_CS             EXP2_08_PIN
328
+      #define TFTGLCD_CS             EXP2_03_PIN
329
     #endif
329
     #endif
330
 
330
 
331
   #else
331
   #else
332
 
332
 
333
-    #define BTN_EN1                  EXP2_08_PIN
334
-    #define BTN_EN2                  EXP2_06_PIN
333
+    #define BTN_EN1                  EXP2_03_PIN
334
+    #define BTN_EN2                  EXP2_05_PIN
335
 
335
 
336
-    #define LCD_SDSS                 EXP2_07_PIN
336
+    #define LCD_SDSS                 EXP2_04_PIN
337
 
337
 
338
     #if ENABLED(MKS_12864OLED_SSD1306)
338
     #if ENABLED(MKS_12864OLED_SSD1306)
339
 
339
 
340
-      #define LCD_PINS_DC            EXP1_05_PIN
341
-      #define DOGLCD_CS              EXP1_07_PIN
340
+      #define LCD_PINS_DC            EXP1_06_PIN
341
+      #define DOGLCD_CS              EXP1_04_PIN
342
       #define DOGLCD_A0              LCD_PINS_DC
342
       #define DOGLCD_A0              LCD_PINS_DC
343
-      #define DOGLCD_SCK             EXP1_06_PIN
344
-      #define DOGLCD_MOSI            EXP1_08_PIN
343
+      #define DOGLCD_SCK             EXP1_05_PIN
344
+      #define DOGLCD_MOSI            EXP1_03_PIN
345
 
345
 
346
-      #define LCD_PINS_RS            EXP1_04_PIN
347
-      #define LCD_PINS_D7            EXP1_03_PIN
346
+      #define LCD_PINS_RS            EXP1_07_PIN
347
+      #define LCD_PINS_D7            EXP1_08_PIN
348
       #define KILL_PIN                     -1     // NC
348
       #define KILL_PIN                     -1     // NC
349
 
349
 
350
     #else                                         // !MKS_12864OLED_SSD1306
350
     #else                                         // !MKS_12864OLED_SSD1306
351
 
351
 
352
-      #define LCD_PINS_RS            EXP1_07_PIN
352
+      #define LCD_PINS_RS            EXP1_04_PIN
353
 
353
 
354
-      #define LCD_PINS_ENABLE        EXP1_08_PIN
355
-      #define LCD_PINS_D4            EXP1_06_PIN
354
+      #define LCD_PINS_ENABLE        EXP1_03_PIN
355
+      #define LCD_PINS_D4            EXP1_05_PIN
356
 
356
 
357
       #if ENABLED(FYSETC_MINI_12864)
357
       #if ENABLED(FYSETC_MINI_12864)
358
 
358
 
359
-        #define DOGLCD_CS            EXP1_08_PIN
360
-        #define DOGLCD_A0            EXP1_07_PIN
361
-        #define DOGLCD_SCK           EXP2_09_PIN
362
-        #define DOGLCD_MOSI          EXP2_05_PIN
359
+        #define DOGLCD_CS            EXP1_03_PIN
360
+        #define DOGLCD_A0            EXP1_04_PIN
361
+        #define DOGLCD_SCK           EXP2_02_PIN
362
+        #define DOGLCD_MOSI          EXP2_06_PIN
363
 
363
 
364
         #define LCD_BACKLIGHT_PIN          -1
364
         #define LCD_BACKLIGHT_PIN          -1
365
 
365
 
366
         #define FORCE_SOFT_SPI                    // Use this if default of hardware SPI causes display problems
366
         #define FORCE_SOFT_SPI                    // Use this if default of hardware SPI causes display problems
367
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
367
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
368
 
368
 
369
-        #define LCD_RESET_PIN        EXP1_06_PIN  // Must be high or open for LCD to operate normally.
369
+        #define LCD_RESET_PIN        EXP1_05_PIN  // Must be high or open for LCD to operate normally.
370
 
370
 
371
         #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
371
         #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
372
           #ifndef RGB_LED_R_PIN
372
           #ifndef RGB_LED_R_PIN
373
-            #define RGB_LED_R_PIN    EXP1_05_PIN
373
+            #define RGB_LED_R_PIN    EXP1_06_PIN
374
           #endif
374
           #endif
375
           #ifndef RGB_LED_G_PIN
375
           #ifndef RGB_LED_G_PIN
376
-            #define RGB_LED_G_PIN    EXP1_04_PIN
376
+            #define RGB_LED_G_PIN    EXP1_07_PIN
377
           #endif
377
           #endif
378
           #ifndef RGB_LED_B_PIN
378
           #ifndef RGB_LED_B_PIN
379
-            #define RGB_LED_B_PIN    EXP1_03_PIN
379
+            #define RGB_LED_B_PIN    EXP1_08_PIN
380
           #endif
380
           #endif
381
         #elif ENABLED(FYSETC_MINI_12864_2_1)
381
         #elif ENABLED(FYSETC_MINI_12864_2_1)
382
-          #define NEOPIXEL_PIN       EXP1_05_PIN
382
+          #define NEOPIXEL_PIN       EXP1_06_PIN
383
         #endif
383
         #endif
384
 
384
 
385
       #else                                       // !FYSETC_MINI_12864
385
       #else                                       // !FYSETC_MINI_12864
386
 
386
 
387
         #if ENABLED(MKS_MINI_12864)
387
         #if ENABLED(MKS_MINI_12864)
388
-          #define DOGLCD_CS          EXP1_05_PIN
389
-          #define DOGLCD_A0          EXP1_04_PIN
388
+          #define DOGLCD_CS          EXP1_06_PIN
389
+          #define DOGLCD_A0          EXP1_07_PIN
390
         #endif
390
         #endif
391
 
391
 
392
         #if IS_ULTIPANEL
392
         #if IS_ULTIPANEL
393
-          #define LCD_PINS_D5        EXP1_05_PIN
394
-          #define LCD_PINS_D6        EXP1_04_PIN
395
-          #define LCD_PINS_D7        EXP1_03_PIN
393
+          #define LCD_PINS_D5        EXP1_06_PIN
394
+          #define LCD_PINS_D6        EXP1_07_PIN
395
+          #define LCD_PINS_D7        EXP1_08_PIN
396
 
396
 
397
           #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
397
           #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
398
             #define BTN_ENC_EN       LCD_PINS_D7  // Detect the presence of the encoder
398
             #define BTN_ENC_EN       LCD_PINS_D7  // Detect the presence of the encoder

+ 42
- 42
Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h 查看文件

186
 
186
 
187
 /**
187
 /**
188
  *                  ------
188
  *                  ------
189
- * (BEEPER)  P2_08 |10  9 | P0_16 (BTN_ENC)
190
- * (BTN_EN1) P0_19 | 8  7 | RESET
191
- * (BTN_EN2) P0_20   6  5 | P0_15 (LCD_D4)
192
- * (LCD_RS)  P0_17 | 4  3 | P0_18 (LCD_EN)
193
- *             GND | 2  1 | 5V
189
+ * (BEEPER)  P2_08 | 1  2 | P0_16 (BTN_ENC)
190
+ * (BTN_EN1) P0_19 | 3  4 | RESET
191
+ * (BTN_EN2) P0_20   5  6 | P0_15 (LCD_D4)
192
+ * (LCD_RS)  P0_17 | 7  8 | P0_18 (LCD_EN)
193
+ *             GND | 9 10 | 5V
194
  *                  ------
194
  *                  ------
195
  *                   EXP
195
  *                   EXP
196
  */
196
  */
197
-#define EXP1_03_PIN                        P0_18
198
-#define EXP1_04_PIN                        P0_17
199
-#define EXP1_05_PIN                        P0_15
200
-#define EXP1_06_PIN                        P0_20
201
-#define EXP1_07_PIN                        -1
202
-#define EXP1_08_PIN                        P0_19
203
-#define EXP1_09_PIN                        P0_16
204
-#define EXP1_10_PIN                        P2_08
197
+#define EXP1_08_PIN                        P0_18
198
+#define EXP1_07_PIN                        P0_17
199
+#define EXP1_06_PIN                        P0_15
200
+#define EXP1_05_PIN                        P0_20
201
+#define EXP1_04_PIN                        -1
202
+#define EXP1_03_PIN                        P0_19
203
+#define EXP1_02_PIN                        P0_16
204
+#define EXP1_01_PIN                        P2_08
205
 
205
 
206
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
206
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
207
   #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
207
   #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
211
  /**
211
  /**
212
   *          Ender 3 V2 display                       SKR E3 Turbo (EXP1)                Ender 3 V2 display --> SKR E3 Turbo
212
   *          Ender 3 V2 display                       SKR E3 Turbo (EXP1)                Ender 3 V2 display --> SKR E3 Turbo
213
   *                ------                                     ------                                  RX  8 -->  5  P0_15
213
   *                ------                                     ------                                  RX  8 -->  5  P0_15
214
-  *           --  |10  9 | --                (BEEPER)  P2_08 |10  9 | P0_16 (BTN_ENC)                 TX  7 -->  9  P0_16
215
-  * (SKR_TX1) RX  | 8  7 | TX (SKR_RX1)      (BTN_EN1) P0_19 | 8  7 | RESET                       BEEPER  5 --> 10  P2_08
216
-  * (BTN_ENC) ENT   6  5 | BEEPER            (BTN_EN2) P0_20   6  5 | P0_15 (LCD_D4)
217
-  * (BTN_E2)  B   | 4  3 | A  (BTN_E1)       (LCD_RS)  P0_17 | 4  3 | P0_18 (LCD_EN)
218
-  *           GND | 2  1 | 5V                            GND | 2  1 | 5V
214
+  *           --  | 1  2 | --                (BEEPER)  P2_08 | 1  2 | P0_16 (BTN_ENC)                 TX  7 -->  9  P0_16
215
+  * (SKR_TX1) RX  | 3  4 | TX (SKR_RX1)      (BTN_EN1) P0_19 | 3  4 | RESET                       BEEPER  5 --> 10  P2_08
216
+  * (BTN_ENC) ENT   5  6 | BEEPER            (BTN_EN2) P0_20   5  6 | P0_15 (LCD_D4)
217
+  * (BTN_E2)  B   | 7  8 | A  (BTN_E1)       (LCD_RS)  P0_17 | 7  8 | P0_18 (LCD_EN)
218
+  *           GND | 9 10 | 5V                            GND | 9 10 | 5V
219
   *                ------                                     ------
219
   *                ------                                     ------
220
   */
220
   */
221
 
221
 
222
-  #define BEEPER_PIN                 EXP1_10_PIN
223
-  #define BTN_EN1                    EXP1_03_PIN
224
-  #define BTN_EN2                    EXP1_04_PIN
225
-  #define BTN_ENC                    EXP1_06_PIN
222
+  #define BEEPER_PIN                 EXP1_01_PIN
223
+  #define BTN_EN1                    EXP1_08_PIN
224
+  #define BTN_EN2                    EXP1_07_PIN
225
+  #define BTN_ENC                    EXP1_05_PIN
226
 
226
 
227
 #elif HAS_WIRED_LCD
227
 #elif HAS_WIRED_LCD
228
 
228
 
229
   #if ENABLED(CR10_STOCKDISPLAY)
229
   #if ENABLED(CR10_STOCKDISPLAY)
230
 
230
 
231
-    #define BEEPER_PIN               EXP1_10_PIN
231
+    #define BEEPER_PIN               EXP1_01_PIN
232
 
232
 
233
-    #define BTN_EN1                  EXP1_08_PIN
234
-    #define BTN_EN2                  EXP1_06_PIN
235
-    #define BTN_ENC                  EXP1_09_PIN
233
+    #define BTN_EN1                  EXP1_03_PIN
234
+    #define BTN_EN2                  EXP1_05_PIN
235
+    #define BTN_ENC                  EXP1_02_PIN
236
 
236
 
237
-    #define LCD_PINS_RS              EXP1_04_PIN
238
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
239
-    #define LCD_PINS_D4              EXP1_05_PIN
237
+    #define LCD_PINS_RS              EXP1_07_PIN
238
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
239
+    #define LCD_PINS_D4              EXP1_06_PIN
240
 
240
 
241
   #elif ENABLED(ZONESTAR_LCD)                     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
241
   #elif ENABLED(ZONESTAR_LCD)                     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
242
 
242
 
244
       #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_E3_TURBO.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
244
       #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_E3_TURBO.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
245
     #endif
245
     #endif
246
 
246
 
247
-    #define LCD_PINS_RS              EXP1_05_PIN
248
-    #define LCD_PINS_ENABLE          EXP1_09_PIN
249
-    #define LCD_PINS_D4              EXP1_04_PIN
250
-    #define LCD_PINS_D5              EXP1_06_PIN
251
-    #define LCD_PINS_D6              EXP1_08_PIN
252
-    #define LCD_PINS_D7              EXP1_10_PIN
247
+    #define LCD_PINS_RS              EXP1_06_PIN
248
+    #define LCD_PINS_ENABLE          EXP1_02_PIN
249
+    #define LCD_PINS_D4              EXP1_07_PIN
250
+    #define LCD_PINS_D5              EXP1_05_PIN
251
+    #define LCD_PINS_D6              EXP1_03_PIN
252
+    #define LCD_PINS_D7              EXP1_01_PIN
253
     #define ADC_KEYPAD_PIN                 P1_23  // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
253
     #define ADC_KEYPAD_PIN                 P1_23  // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
254
 
254
 
255
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
255
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
256
 
256
 
257
-    #define BTN_EN1                  EXP1_08_PIN
258
-    #define BTN_EN2                  EXP1_06_PIN
259
-    #define BTN_ENC                  EXP1_09_PIN
257
+    #define BTN_EN1                  EXP1_03_PIN
258
+    #define BTN_EN2                  EXP1_05_PIN
259
+    #define BTN_ENC                  EXP1_02_PIN
260
 
260
 
261
-    #define DOGLCD_CS                EXP1_04_PIN
262
-    #define DOGLCD_A0                EXP1_05_PIN
263
-    #define DOGLCD_SCK               EXP1_10_PIN
264
-    #define DOGLCD_MOSI              EXP1_03_PIN
261
+    #define DOGLCD_CS                EXP1_07_PIN
262
+    #define DOGLCD_A0                EXP1_06_PIN
263
+    #define DOGLCD_SCK               EXP1_01_PIN
264
+    #define DOGLCD_MOSI              EXP1_08_PIN
265
     #define FORCE_SOFT_SPI
265
     #define FORCE_SOFT_SPI
266
     #define LCD_BACKLIGHT_PIN              -1
266
     #define LCD_BACKLIGHT_PIN              -1
267
 
267
 

+ 69
- 69
Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h 查看文件

270
 #endif
270
 #endif
271
 
271
 
272
 /**                ------                                     ------
272
 /**                ------                                     ------
273
- *  (BEEPER) 1.31 |10  9 | 1.30 (BTN_ENC)        (MISO) 0.8  |10  9 | 0.7  (SD_SCK)
274
- *  (LCD_EN) 0.18 | 8  7 | 0.16 (LCD_RS)      (BTN_EN1) 3.25 | 8  7 | 0.28 (SD_CS2)
275
- *  (LCD_D4) 0.15   6  5 | 0.17 (LCD_D5)      (BTN_EN2) 3.26   6  5 | 0.9  (SD_MOSI)
276
- *  (LCD_D6)  1.0 | 4  3 | 1.22 (LCD_D7)    (SD_DETECT) 0.27 | 4  3 | RST
277
- *            GND | 2  1 | 5V                            GND | 2  1 | --
273
+ *  (BEEPER) 1.31 | 1  2 | 1.30 (BTN_ENC)        (MISO) 0.8  | 1  2 | 0.7  (SD_SCK)
274
+ *  (LCD_EN) 0.18 | 3  4 | 0.16 (LCD_RS)      (BTN_EN1) 3.25 | 3  4 | 0.28 (SD_CS2)
275
+ *  (LCD_D4) 0.15   5  6 | 0.17 (LCD_D5)      (BTN_EN2) 3.26   5  6 | 0.9  (SD_MOSI)
276
+ *  (LCD_D6)  1.0 | 7  8 | 1.22 (LCD_D7)    (SD_DETECT) 0.27 | 7  8 | RST
277
+ *            GND | 9 10 | 5V                            GND | 9 10 | --
278
  *                 ------                                     ------
278
  *                 ------                                     ------
279
  *                  EXP1                                       EXP2
279
  *                  EXP1                                       EXP2
280
  */
280
  */
281
-#define EXP1_03_PIN                        P1_22
282
-#define EXP1_04_PIN                        P1_00
283
-#define EXP1_05_PIN                        P0_17
284
-#define EXP1_06_PIN                        P0_15
285
-#define EXP1_07_PIN                        P0_16
286
-#define EXP1_08_PIN                        P0_18
287
-#define EXP1_09_PIN                        P1_30
288
-#define EXP1_10_PIN                        P1_31
289
-
290
-#define EXP2_03_PIN                        -1     // RESET
291
-#define EXP2_04_PIN                        P0_27
292
-#define EXP2_05_PIN                        P0_09
293
-#define EXP2_06_PIN                        P3_26
294
-#define EXP2_07_PIN                        P0_28
295
-#define EXP2_08_PIN                        P3_25
296
-#define EXP2_09_PIN                        P0_07
297
-#define EXP2_10_PIN                        P0_08
281
+#define EXP1_08_PIN                        P1_22
282
+#define EXP1_07_PIN                        P1_00
283
+#define EXP1_06_PIN                        P0_17
284
+#define EXP1_05_PIN                        P0_15
285
+#define EXP1_04_PIN                        P0_16
286
+#define EXP1_03_PIN                        P0_18
287
+#define EXP1_02_PIN                        P1_30
288
+#define EXP1_01_PIN                        P1_31
289
+
290
+#define EXP2_08_PIN                        -1     // RESET
291
+#define EXP2_07_PIN                        P0_27
292
+#define EXP2_06_PIN                        P0_09
293
+#define EXP2_05_PIN                        P3_26
294
+#define EXP2_04_PIN                        P0_28
295
+#define EXP2_03_PIN                        P3_25
296
+#define EXP2_02_PIN                        P0_07
297
+#define EXP2_01_PIN                        P0_08
298
 
298
 
299
 #if IS_TFTGLCD_PANEL
299
 #if IS_TFTGLCD_PANEL
300
 
300
 
301
   #if ENABLED(TFTGLCD_PANEL_SPI)
301
   #if ENABLED(TFTGLCD_PANEL_SPI)
302
-    #define TFTGLCD_CS               EXP2_08_PIN
302
+    #define TFTGLCD_CS               EXP2_03_PIN
303
   #endif
303
   #endif
304
 
304
 
305
-  #define SD_DETECT_PIN              EXP2_04_PIN
305
+  #define SD_DETECT_PIN              EXP2_07_PIN
306
 
306
 
307
 #elif HAS_WIRED_LCD
307
 #elif HAS_WIRED_LCD
308
 
308
 
309
-  #define BEEPER_PIN                 EXP1_10_PIN
310
-  #define BTN_ENC                    EXP1_09_PIN
309
+  #define BEEPER_PIN                 EXP1_01_PIN
310
+  #define BTN_ENC                    EXP1_02_PIN
311
 
311
 
312
   #if ENABLED(CR10_STOCKDISPLAY)
312
   #if ENABLED(CR10_STOCKDISPLAY)
313
 
313
 
314
-    #define LCD_PINS_RS              EXP1_04_PIN
314
+    #define LCD_PINS_RS              EXP1_07_PIN
315
 
315
 
316
-    #define BTN_EN1                  EXP1_08_PIN
317
-    #define BTN_EN2                  EXP1_06_PIN
316
+    #define BTN_EN1                  EXP1_03_PIN
317
+    #define BTN_EN2                  EXP1_05_PIN
318
 
318
 
319
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
320
-    #define LCD_PINS_D4              EXP1_05_PIN
319
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
320
+    #define LCD_PINS_D4              EXP1_06_PIN
321
 
321
 
322
   #else
322
   #else
323
 
323
 
324
-    #define BTN_EN1                  EXP2_08_PIN
325
-    #define BTN_EN2                  EXP2_06_PIN
324
+    #define BTN_EN1                  EXP2_03_PIN
325
+    #define BTN_EN2                  EXP2_05_PIN
326
 
326
 
327
-    #define LCD_SDSS                 EXP2_07_PIN
327
+    #define LCD_SDSS                 EXP2_04_PIN
328
 
328
 
329
     #if ENABLED(MKS_12864OLED_SSD1306)
329
     #if ENABLED(MKS_12864OLED_SSD1306)
330
 
330
 
331
-      #define LCD_PINS_DC            EXP1_05_PIN
332
-      #define DOGLCD_CS              EXP1_07_PIN
331
+      #define LCD_PINS_DC            EXP1_06_PIN
332
+      #define DOGLCD_CS              EXP1_04_PIN
333
       #define DOGLCD_A0              LCD_PINS_DC
333
       #define DOGLCD_A0              LCD_PINS_DC
334
-      #define DOGLCD_SCK             EXP1_06_PIN
335
-      #define DOGLCD_MOSI            EXP1_08_PIN
334
+      #define DOGLCD_SCK             EXP1_05_PIN
335
+      #define DOGLCD_MOSI            EXP1_03_PIN
336
 
336
 
337
-      #define LCD_PINS_RS            EXP1_04_PIN
338
-      #define LCD_PINS_D7            EXP1_03_PIN
337
+      #define LCD_PINS_RS            EXP1_07_PIN
338
+      #define LCD_PINS_D7            EXP1_08_PIN
339
       #define KILL_PIN                     -1     // NC
339
       #define KILL_PIN                     -1     // NC
340
 
340
 
341
     #elif HAS_SPI_TFT                             // Config for Classic UI (emulated DOGM) and Color UI
341
     #elif HAS_SPI_TFT                             // Config for Classic UI (emulated DOGM) and Color UI
342
 
342
 
343
-      #define TFT_CS_PIN             EXP1_04_PIN
344
-      #define TFT_DC_PIN             EXP1_03_PIN
343
+      #define TFT_CS_PIN             EXP1_07_PIN
344
+      #define TFT_DC_PIN             EXP1_08_PIN
345
       #define TFT_A0_PIN             TFT_DC_PIN
345
       #define TFT_A0_PIN             TFT_DC_PIN
346
-      #define TFT_MISO_PIN           EXP2_10_PIN
347
-      #define TFT_BACKLIGHT_PIN      EXP1_08_PIN
348
-      #define TFT_RESET_PIN          EXP1_07_PIN
346
+      #define TFT_MISO_PIN           EXP2_01_PIN
347
+      #define TFT_BACKLIGHT_PIN      EXP1_03_PIN
348
+      #define TFT_RESET_PIN          EXP1_04_PIN
349
 
349
 
350
       #define LCD_USE_DMA_SPI
350
       #define LCD_USE_DMA_SPI
351
 
351
 
352
-      #define TOUCH_INT_PIN          EXP1_05_PIN
353
-      #define TOUCH_CS_PIN           EXP1_06_PIN
352
+      #define TOUCH_INT_PIN          EXP1_06_PIN
353
+      #define TOUCH_CS_PIN           EXP1_05_PIN
354
       #define TOUCH_BUTTONS_HW_SPI
354
       #define TOUCH_BUTTONS_HW_SPI
355
       #define TOUCH_BUTTONS_HW_SPI_DEVICE      2
355
       #define TOUCH_BUTTONS_HW_SPI_DEVICE      2
356
 
356
 
367
 
367
 
368
     #else                                         // !MKS_12864OLED_SSD1306
368
     #else                                         // !MKS_12864OLED_SSD1306
369
 
369
 
370
-      #define LCD_PINS_RS            EXP1_07_PIN
370
+      #define LCD_PINS_RS            EXP1_04_PIN
371
 
371
 
372
-      #define LCD_PINS_ENABLE        EXP1_08_PIN
373
-      #define LCD_PINS_D4            EXP1_06_PIN
372
+      #define LCD_PINS_ENABLE        EXP1_03_PIN
373
+      #define LCD_PINS_D4            EXP1_05_PIN
374
 
374
 
375
       #if ENABLED(FYSETC_MINI_12864)
375
       #if ENABLED(FYSETC_MINI_12864)
376
 
376
 
377
-        #define DOGLCD_CS            EXP1_08_PIN
378
-        #define DOGLCD_A0            EXP1_07_PIN
379
-        #define DOGLCD_SCK           EXP2_09_PIN
380
-        #define DOGLCD_MOSI          EXP2_05_PIN
377
+        #define DOGLCD_CS            EXP1_03_PIN
378
+        #define DOGLCD_A0            EXP1_04_PIN
379
+        #define DOGLCD_SCK           EXP2_02_PIN
380
+        #define DOGLCD_MOSI          EXP2_06_PIN
381
 
381
 
382
         #define LCD_BACKLIGHT_PIN          -1
382
         #define LCD_BACKLIGHT_PIN          -1
383
 
383
 
384
         #define FORCE_SOFT_SPI                    // Use this if default of hardware SPI causes display problems
384
         #define FORCE_SOFT_SPI                    // Use this if default of hardware SPI causes display problems
385
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
385
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
386
 
386
 
387
-        #define LCD_RESET_PIN        EXP1_06_PIN  // Must be high or open for LCD to operate normally.
387
+        #define LCD_RESET_PIN        EXP1_05_PIN  // Must be high or open for LCD to operate normally.
388
 
388
 
389
         #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
389
         #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
390
           #ifndef RGB_LED_R_PIN
390
           #ifndef RGB_LED_R_PIN
391
-            #define RGB_LED_R_PIN    EXP1_05_PIN
391
+            #define RGB_LED_R_PIN    EXP1_06_PIN
392
           #endif
392
           #endif
393
           #ifndef RGB_LED_G_PIN
393
           #ifndef RGB_LED_G_PIN
394
-            #define RGB_LED_G_PIN    EXP1_04_PIN
394
+            #define RGB_LED_G_PIN    EXP1_07_PIN
395
           #endif
395
           #endif
396
           #ifndef RGB_LED_B_PIN
396
           #ifndef RGB_LED_B_PIN
397
-            #define RGB_LED_B_PIN    EXP1_03_PIN
397
+            #define RGB_LED_B_PIN    EXP1_08_PIN
398
           #endif
398
           #endif
399
         #elif ENABLED(FYSETC_MINI_12864_2_1)
399
         #elif ENABLED(FYSETC_MINI_12864_2_1)
400
-          #define NEOPIXEL_PIN       EXP1_05_PIN
400
+          #define NEOPIXEL_PIN       EXP1_06_PIN
401
         #endif
401
         #endif
402
 
402
 
403
       #else                                       // !FYSETC_MINI_12864
403
       #else                                       // !FYSETC_MINI_12864
404
 
404
 
405
         #if ENABLED(MKS_MINI_12864)
405
         #if ENABLED(MKS_MINI_12864)
406
-          #define DOGLCD_CS          EXP1_05_PIN
407
-          #define DOGLCD_A0          EXP1_04_PIN
406
+          #define DOGLCD_CS          EXP1_06_PIN
407
+          #define DOGLCD_A0          EXP1_07_PIN
408
         #endif
408
         #endif
409
 
409
 
410
         #if IS_ULTIPANEL
410
         #if IS_ULTIPANEL
411
-          #define LCD_PINS_D5        EXP1_05_PIN
412
-          #define LCD_PINS_D6        EXP1_04_PIN
413
-          #define LCD_PINS_D7        EXP1_03_PIN
411
+          #define LCD_PINS_D5        EXP1_06_PIN
412
+          #define LCD_PINS_D6        EXP1_07_PIN
413
+          #define LCD_PINS_D7        EXP1_08_PIN
414
 
414
 
415
           #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
415
           #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
416
             #define BTN_ENC_EN       LCD_PINS_D7  // Detect the presence of the encoder
416
             #define BTN_ENC_EN       LCD_PINS_D7  // Detect the presence of the encoder
431
 #endif
431
 #endif
432
 
432
 
433
 #if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
433
 #if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
434
-  #define SD_DETECT_PIN              EXP2_04_PIN
435
-  #define SD_SCK_PIN                 EXP2_09_PIN
436
-  #define SD_MISO_PIN                EXP2_10_PIN
437
-  #define SD_MOSI_PIN                EXP2_05_PIN
434
+  #define SD_DETECT_PIN              EXP2_07_PIN
435
+  #define SD_SCK_PIN                 EXP2_02_PIN
436
+  #define SD_MISO_PIN                EXP2_01_PIN
437
+  #define SD_MOSI_PIN                EXP2_06_PIN
438
   #if SD_CONNECTION_IS(ONBOARD)
438
   #if SD_CONNECTION_IS(ONBOARD)
439
     #define ONBOARD_SD_CS_PIN              P0_06  // Chip select for "System" SD card
439
     #define ONBOARD_SD_CS_PIN              P0_06  // Chip select for "System" SD card
440
     #define SD_SS_PIN          ONBOARD_SD_CS_PIN
440
     #define SD_SS_PIN          ONBOARD_SD_CS_PIN
441
   #else
441
   #else
442
-    #define SD_SS_PIN                EXP2_07_PIN
442
+    #define SD_SS_PIN                EXP2_04_PIN
443
   #endif
443
   #endif
444
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
444
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
445
   #error "No custom SD drive cable defined for this board."
445
   #error "No custom SD drive cable defined for this board."

+ 35
- 35
Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h 查看文件

157
 
157
 
158
 /**
158
 /**
159
  *         ------
159
  *         ------
160
- *  P1_31 |10  9 | P1_30
161
- *  P3_26 | 8  7 | P2_11
162
- *  P3_25   6  5 | P0_15
163
- *  P0_16 | 4  3 | P0_18
164
- *    GND | 2  1 | 5V
160
+ *  P1_31 | 1  2 | P1_30
161
+ *  P3_26 | 3  4 | P2_11
162
+ *  P3_25   5  6 | P0_15
163
+ *  P0_16 | 7  8 | P0_18
164
+ *    GND | 9 10 | 5V
165
  *         ------
165
  *         ------
166
  *          EXP1
166
  *          EXP1
167
  *
167
  *
171
  * A remote SD card is currently not supported because the pins routed to the EXP2
171
  * A remote SD card is currently not supported because the pins routed to the EXP2
172
  * connector are shared with the onboard SD card.
172
  * connector are shared with the onboard SD card.
173
  */
173
  */
174
-#define EXP1_03_PIN                        P0_18
175
-#define EXP1_04_PIN                        P0_16
176
-#define EXP1_05_PIN                        P0_15
177
-#define EXP1_06_PIN                        P3_25
178
-#define EXP1_07_PIN                        P2_11
179
-#define EXP1_08_PIN                        P3_26
180
-#define EXP1_09_PIN                        P1_30
181
-#define EXP1_10_PIN                        P1_31
174
+#define EXP1_08_PIN                        P0_18
175
+#define EXP1_07_PIN                        P0_16
176
+#define EXP1_06_PIN                        P0_15
177
+#define EXP1_05_PIN                        P3_25
178
+#define EXP1_04_PIN                        P2_11
179
+#define EXP1_03_PIN                        P3_26
180
+#define EXP1_02_PIN                        P1_30
181
+#define EXP1_01_PIN                        P1_31
182
 
182
 
183
 #if ENABLED(CR10_STOCKDISPLAY)
183
 #if ENABLED(CR10_STOCKDISPLAY)
184
   /**          ------
184
   /**          ------
185
-   *   BEEPER |10  9 | ENC
186
-   *      EN1 | 8  7 | KILL
187
-   *      EN2   6  5 | LCD_D4
188
-   *   LCD_RS | 4  3 | LCD_EN
189
-   *      GND | 2  1 | 5V
185
+   *   BEEPER | 1  2 | ENC
186
+   *      EN1 | 3  4 | KILL
187
+   *      EN2   5  6 | LCD_D4
188
+   *   LCD_RS | 7  8 | LCD_EN
189
+   *      GND | 9 10 | 5V
190
    *           ------
190
    *           ------
191
    */
191
    */
192
-  #define BEEPER_PIN                 EXP1_10_PIN
193
-  #define LCD_PINS_RS                EXP1_04_PIN
194
-  #define LCD_PINS_ENABLE            EXP1_03_PIN
195
-  #define LCD_PINS_D4                EXP1_05_PIN
196
-  #define KILL_PIN                   EXP1_07_PIN
192
+  #define BEEPER_PIN                 EXP1_01_PIN
193
+  #define LCD_PINS_RS                EXP1_07_PIN
194
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
195
+  #define LCD_PINS_D4                EXP1_06_PIN
196
+  #define KILL_PIN                   EXP1_04_PIN
197
 
197
 
198
 #elif ENABLED(MKS_MINI_12864)
198
 #elif ENABLED(MKS_MINI_12864)
199
   /**          ------
199
   /**          ------
200
-   *      SCK |10  9 | ENC
201
-   *      EN1 | 8  7 | --
202
-   *      EN2   6  5 | A0
203
-   *       CS | 4  3 | MOSI
204
-   *      GND | 2  1 | 5V
200
+   *      SCK | 1  2 | ENC
201
+   *      EN1 | 3  4 | --
202
+   *      EN2   5  6 | A0
203
+   *       CS | 7  8 | MOSI
204
+   *      GND | 9 10 | 5V
205
    *           ------
205
    *           ------
206
    */
206
    */
207
-  #define DOGLCD_CS                  EXP1_04_PIN
208
-  #define DOGLCD_A0                  EXP1_05_PIN
209
-  #define DOGLCD_SCK                 EXP1_10_PIN
210
-  #define DOGLCD_MOSI                EXP1_03_PIN
207
+  #define DOGLCD_CS                  EXP1_07_PIN
208
+  #define DOGLCD_A0                  EXP1_06_PIN
209
+  #define DOGLCD_SCK                 EXP1_01_PIN
210
+  #define DOGLCD_MOSI                EXP1_08_PIN
211
   #define LCD_CONTRAST_INIT                  160
211
   #define LCD_CONTRAST_INIT                  160
212
   #define LCD_CONTRAST_MIN                   120
212
   #define LCD_CONTRAST_MIN                   120
213
   #define LCD_CONTRAST_MAX                   180
213
   #define LCD_CONTRAST_MAX                   180
221
 #endif
221
 #endif
222
 
222
 
223
 #if EITHER(CR10_STOCKDISPLAY, MKS_MINI_12864)
223
 #if EITHER(CR10_STOCKDISPLAY, MKS_MINI_12864)
224
-  #define BTN_EN1                    EXP1_08_PIN
225
-  #define BTN_EN2                    EXP1_06_PIN
226
-  #define BTN_ENC                    EXP1_09_PIN
224
+  #define BTN_EN1                    EXP1_03_PIN
225
+  #define BTN_EN2                    EXP1_05_PIN
226
+  #define BTN_ENC                    EXP1_02_PIN
227
 #endif
227
 #endif

+ 21
- 21
Marlin/src/pins/ramps/pins_MKS_GEN_13.h 查看文件

54
 
54
 
55
 #include "pins_RAMPS.h"
55
 #include "pins_RAMPS.h"
56
 
56
 
57
-#undef EXP2_03_PIN
58
-#define EXP2_03_PIN                           -1  // RESET
57
+#undef EXP2_08_PIN
58
+#define EXP2_08_PIN                           -1  // RESET
59
 
59
 
60
 //
60
 //
61
 // LCD / Controller
61
 // LCD / Controller
85
    * This configuration uses the following arrangement:
85
    * This configuration uses the following arrangement:
86
    *
86
    *
87
    *             ------                       ------
87
    *             ------                       ------
88
-   *       ENCB |10  9 |  ENCA          MISO |10  9 | SCK
89
-   *   BLUE_LED | 8  7 |  RED_LED     ENCBTN | 8  7 | SDCS
90
-   *       KILL   6  5 |  BEEPER               6  5 | MOSI
91
-   *         A0 | 4  3 |  LCD_CS        SDCD | 4  3 |
92
-   *        GND | 2  1 | 5V              GND | 2  1 | --
88
+   *       ENCB | 1  2 |  ENCA          MISO | 1  2 | SCK
89
+   *   BLUE_LED | 3  4 |  RED_LED     ENCBTN | 3  4 | SDCS
90
+   *       KILL   5  6 |  BEEPER               5  6 | MOSI
91
+   *         A0 | 7  8 |  LCD_CS        SDCD | 7  8 |
92
+   *        GND | 9 10 | 5V              GND | 9 10 | --
93
    *             ------                       ------
93
    *             ------                       ------
94
    *              EXP1                         EXP2
94
    *              EXP1                         EXP2
95
    */
95
    */
107
   //
107
   //
108
   // VIKI2 12-wire lead
108
   // VIKI2 12-wire lead
109
   //
109
   //
110
-  #define SD_DETECT_PIN              EXP2_04_PIN  // SDCD     orange/white
111
-  #define BTN_EN1                    EXP1_09_PIN  // ENCA     white
112
-  #define BTN_EN2                    EXP1_10_PIN  // ENCB     green
113
-  #define BTN_ENC                    EXP2_08_PIN  // ENCBTN   purple
114
-  #define DOGLCD_A0                  EXP1_04_PIN  // A0       brown
115
-  #define DOGLCD_CS                  EXP1_03_PIN  // LCS      green/white
110
+  #define SD_DETECT_PIN              EXP2_07_PIN  // SDCD     orange/white
111
+  #define BTN_EN1                    EXP1_02_PIN  // ENCA     white
112
+  #define BTN_EN2                    EXP1_01_PIN  // ENCB     green
113
+  #define BTN_ENC                    EXP2_03_PIN  // ENCBTN   purple
114
+  #define DOGLCD_A0                  EXP1_07_PIN  // A0       brown
115
+  #define DOGLCD_CS                  EXP1_08_PIN  // LCS      green/white
116
 
116
 
117
-  // EXP2_10_PIN  gray   MISO
118
-  // EXP2_05_PIN  yellow MOSI
119
-  // EXP2_09_PIN  orange SCK
117
+  // EXP2_01_PIN  gray   MISO
118
+  // EXP2_06_PIN  yellow MOSI
119
+  // EXP2_02_PIN  orange SCK
120
 
120
 
121
-  //#define SDSS                     EXP2_07_PIN  // SDCS     blue
121
+  //#define SDSS                     EXP2_04_PIN  // SDCS     blue
122
 
122
 
123
   //
123
   //
124
   // VIKI2 4-wire lead
124
   // VIKI2 4-wire lead
125
   //
125
   //
126
-  #define KILL_PIN                   EXP1_06_PIN  // BTN      blue
127
-  #define BEEPER_PIN                 EXP1_05_PIN  // BUZZER   green
128
-  #define STAT_LED_RED_PIN           EXP1_07_PIN  // RED-LED  yellow
129
-  #define STAT_LED_BLUE_PIN          EXP1_08_PIN  // BLUE-LED white
126
+  #define KILL_PIN                   EXP1_05_PIN  // BTN      blue
127
+  #define BEEPER_PIN                 EXP1_06_PIN  // BUZZER   green
128
+  #define STAT_LED_RED_PIN           EXP1_04_PIN  // RED-LED  yellow
129
+  #define STAT_LED_BLUE_PIN          EXP1_03_PIN  // BLUE-LED white
130
 #endif
130
 #endif

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

513
  * LCD adapters come in different variants. The socket keys can be
513
  * LCD adapters come in different variants. The socket keys can be
514
  * on either side, and may be backwards on some boards / displays.
514
  * on either side, and may be backwards on some boards / displays.
515
  */
515
  */
516
-#ifndef EXP1_03_PIN
516
+#ifndef EXP1_08_PIN
517
 
517
 
518
-  #define EXP1_03_PIN                AUX4_13_PIN
519
-  #define EXP1_04_PIN                AUX4_14_PIN
520
-  #define EXP1_05_PIN                AUX4_15_PIN
521
-  #define EXP1_06_PIN                AUX4_16_PIN
522
-  #define EXP1_07_PIN                AUX4_18_PIN
523
-  #define EXP1_08_PIN                AUX4_17_PIN
518
+  #define EXP1_08_PIN                AUX4_13_PIN
519
+  #define EXP1_07_PIN                AUX4_14_PIN
520
+  #define EXP1_06_PIN                AUX4_15_PIN
521
+  #define EXP1_05_PIN                AUX4_16_PIN
522
+  #define EXP1_04_PIN                AUX4_18_PIN
523
+  #define EXP1_03_PIN                AUX4_17_PIN
524
 
524
 
525
-  #define EXP2_04_PIN                AUX3_02_PIN
526
-  #define EXP2_05_PIN                AUX3_04_PIN
527
-  #define EXP2_07_PIN                AUX3_06_PIN
528
-  #define EXP2_09_PIN                AUX3_05_PIN
529
-  #define EXP2_10_PIN                AUX3_03_PIN
525
+  #define EXP2_07_PIN                AUX3_02_PIN
526
+  #define EXP2_06_PIN                AUX3_04_PIN
527
+  #define EXP2_04_PIN                AUX3_06_PIN
528
+  #define EXP2_02_PIN                AUX3_05_PIN
529
+  #define EXP2_01_PIN                AUX3_03_PIN
530
 
530
 
531
   #if ENABLED(G3D_PANEL)
531
   #if ENABLED(G3D_PANEL)
532
     /**                  Gadgets3D Smart Adapter
532
     /**                  Gadgets3D Smart Adapter
533
      *              ------                        ------
533
      *              ------                        ------
534
-     *        4-11 |10  9 | 4-12     (MISO) 3-03 |10  9 | 3-05 (SCK)
535
-     *        4-17 | 8  7 | 4-18            4-10 | 8  7 | 3-06
536
-     *        4-16   6  5 | 4-15            4-09   6  5 | 3-04 (MOSI)
537
-     *        4-14 | 4  3 | 4-13            3-02 | 4  3 | 4-07
538
-     *  (GND) 4-02 | 2  1 | 4-01 (5V)         -- | 2  1 | --
534
+     *        4-11 | 1  2 | 4-12     (MISO) 3-03 | 1  2 | 3-05 (SCK)
535
+     *        4-17 | 3  4 | 4-18            4-10 | 3  4 | 3-06
536
+     *        4-16   5  6 | 4-15            4-09   5  6 | 3-04 (MOSI)
537
+     *        4-14 | 7  8 | 4-13            3-02 | 7  8 | 4-07
538
+     *  (GND) 4-02 | 9 10 | 4-01 (5V)         -- | 9 10 | --
539
      *              ------                        ------
539
      *              ------                        ------
540
      *               EXP1                          EXP2
540
      *               EXP1                          EXP2
541
      */
541
      */
542
-    #define EXP1_09_PIN              AUX4_12_PIN
543
-    #define EXP1_10_PIN              AUX4_11_PIN
542
+    #define EXP1_02_PIN              AUX4_12_PIN
543
+    #define EXP1_01_PIN              AUX4_11_PIN
544
 
544
 
545
-    #define EXP2_03_PIN              AUX4_07_PIN
546
-    #define EXP2_06_PIN              AUX4_09_PIN
547
-    #define EXP2_08_PIN              AUX4_10_PIN
545
+    #define EXP2_08_PIN              AUX4_07_PIN
546
+    #define EXP2_05_PIN              AUX4_09_PIN
547
+    #define EXP2_03_PIN              AUX4_10_PIN
548
 
548
 
549
   #else
549
   #else
550
 
550
 
551
     /**                     Smart Adapter (c) RRD
551
     /**                     Smart Adapter (c) RRD
552
      *             ------                           ------
552
      *             ------                           ------
553
-     *       4-09 |10  9 | 4-10        (MISO) 3-03 |10  9 | 3-05 (SCK)
554
-     *       4-17 | 8  7 | 4-18               4-12 | 8  7 | 3-06
555
-     *       4-16   6  5 | 4-15               4-11   6  5 | 3-04 (MOSI)
556
-     *       4-14 | 4  3 | 4-13               3-02 | 4  3 | 4-07
557
-     * (GND) 3-07 | 2  1 | 3-01 (5V)    (GND) 3-07 | 2  1 | --
553
+     *       4-09 | 1  2 | 4-10        (MISO) 3-03 | 1  2 | 3-05 (SCK)
554
+     *       4-17 | 3  4 | 4-18               4-12 | 3  4 | 3-06
555
+     *       4-16   5  6 | 4-15               4-11   5  6 | 3-04 (MOSI)
556
+     *       4-14 | 7  8 | 4-13               3-02 | 7  8 | 4-07
557
+     * (GND) 3-07 | 9 10 | 3-01 (5V)    (GND) 3-07 | 9 10 | --
558
      *             ------                           ------
558
      *             ------                           ------
559
      *              EXP1                             EXP2
559
      *              EXP1                             EXP2
560
      */
560
      */
561
-    #define EXP1_09_PIN              AUX4_10_PIN
562
-    #define EXP1_10_PIN              AUX4_09_PIN
561
+    #define EXP1_02_PIN              AUX4_10_PIN
562
+    #define EXP1_01_PIN              AUX4_09_PIN
563
 
563
 
564
     #if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
564
     #if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
565
-      #define EXP2_03_PIN                     -1  // RESET
566
-      #define EXP2_06_PIN            AUX4_12_PIN
567
-      #define EXP2_08_PIN            AUX4_11_PIN
565
+      #define EXP2_08_PIN                     -1  // RESET
566
+      #define EXP2_05_PIN            AUX4_12_PIN
567
+      #define EXP2_03_PIN            AUX4_11_PIN
568
     #else
568
     #else
569
-      #define EXP2_03_PIN            AUX4_07_PIN
570
-      #define EXP2_06_PIN            AUX4_11_PIN
571
-      #define EXP2_08_PIN            AUX4_12_PIN
569
+      #define EXP2_08_PIN            AUX4_07_PIN
570
+      #define EXP2_05_PIN            AUX4_11_PIN
571
+      #define EXP2_03_PIN            AUX4_12_PIN
572
     #endif
572
     #endif
573
 
573
 
574
   #endif
574
   #endif
588
   //
588
   //
589
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
589
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
590
 
590
 
591
-    #define LCD_PINS_RS              EXP2_04_PIN  // CS chip select /SS chip slave select
592
-    #define LCD_PINS_ENABLE          EXP2_05_PIN  // SID (MOSI)
593
-    #define LCD_PINS_D4              EXP2_09_PIN  // SCK (CLK) clock
591
+    #define LCD_PINS_RS              EXP2_07_PIN  // CS chip select /SS chip slave select
592
+    #define LCD_PINS_ENABLE          EXP2_06_PIN  // SID (MOSI)
593
+    #define LCD_PINS_D4              EXP2_02_PIN  // SCK (CLK) clock
594
 
594
 
595
   #elif BOTH(IS_NEWPANEL, PANEL_ONE)
595
   #elif BOTH(IS_NEWPANEL, PANEL_ONE)
596
 
596
 
603
 
603
 
604
   #elif ENABLED(TFTGLCD_PANEL_SPI)
604
   #elif ENABLED(TFTGLCD_PANEL_SPI)
605
 
605
 
606
-    #define TFTGLCD_CS               EXP2_06_PIN
606
+    #define TFTGLCD_CS               EXP2_05_PIN
607
 
607
 
608
   #else
608
   #else
609
 
609
 
610
     #if ENABLED(CR10_STOCKDISPLAY)
610
     #if ENABLED(CR10_STOCKDISPLAY)
611
 
611
 
612
-      #define LCD_PINS_RS            EXP1_04_PIN
613
-      #define LCD_PINS_ENABLE        EXP1_03_PIN
614
-      #define LCD_PINS_D4            EXP1_05_PIN
612
+      #define LCD_PINS_RS            EXP1_07_PIN
613
+      #define LCD_PINS_ENABLE        EXP1_08_PIN
614
+      #define LCD_PINS_D4            EXP1_06_PIN
615
 
615
 
616
       #if !IS_NEWPANEL
616
       #if !IS_NEWPANEL
617
-        #define BEEPER_PIN           EXP1_10_PIN
617
+        #define BEEPER_PIN           EXP1_01_PIN
618
       #endif
618
       #endif
619
 
619
 
620
     #elif ENABLED(ZONESTAR_LCD)
620
     #elif ENABLED(ZONESTAR_LCD)
637
     #else
637
     #else
638
 
638
 
639
       #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
639
       #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
640
-        #define LCD_PINS_DC          EXP1_05_PIN  // Set as output on init
641
-        #define LCD_PINS_RS          EXP1_04_PIN  // Pull low for 1s to init
640
+        #define LCD_PINS_DC          EXP1_06_PIN  // Set as output on init
641
+        #define LCD_PINS_RS          EXP1_07_PIN  // Pull low for 1s to init
642
         // DOGM SPI LCD Support
642
         // DOGM SPI LCD Support
643
         #define DOGLCD_A0            LCD_PINS_DC
643
         #define DOGLCD_A0            LCD_PINS_DC
644
-        #define DOGLCD_CS            EXP1_07_PIN
645
-        #define DOGLCD_MOSI          EXP1_08_PIN
646
-        #define DOGLCD_SCK           EXP1_06_PIN
644
+        #define DOGLCD_CS            EXP1_04_PIN
645
+        #define DOGLCD_MOSI          EXP1_03_PIN
646
+        #define DOGLCD_SCK           EXP1_05_PIN
647
       #else
647
       #else
648
-        #define LCD_PINS_RS          EXP1_07_PIN
649
-        #define LCD_PINS_ENABLE      EXP1_08_PIN
650
-        #define LCD_PINS_D4          EXP1_06_PIN
651
-        #define LCD_PINS_D5          EXP1_05_PIN
652
-        #define LCD_PINS_D6          EXP1_04_PIN
648
+        #define LCD_PINS_RS          EXP1_04_PIN
649
+        #define LCD_PINS_ENABLE      EXP1_03_PIN
650
+        #define LCD_PINS_D4          EXP1_05_PIN
651
+        #define LCD_PINS_D5          EXP1_06_PIN
652
+        #define LCD_PINS_D6          EXP1_07_PIN
653
       #endif
653
       #endif
654
 
654
 
655
-      #define LCD_PINS_D7            EXP1_03_PIN
655
+      #define LCD_PINS_D7            EXP1_08_PIN
656
 
656
 
657
       #if !IS_NEWPANEL
657
       #if !IS_NEWPANEL
658
-        #define BEEPER_PIN           EXP2_06_PIN
658
+        #define BEEPER_PIN           EXP2_05_PIN
659
       #endif
659
       #endif
660
 
660
 
661
     #endif
661
     #endif
666
       //#define SHIFT_CLK_PIN                 38
666
       //#define SHIFT_CLK_PIN                 38
667
       //#define SHIFT_LD_PIN         AUX2_08_PIN
667
       //#define SHIFT_LD_PIN         AUX2_08_PIN
668
       //#define SHIFT_OUT_PIN        AUX2_06_PIN
668
       //#define SHIFT_OUT_PIN        AUX2_06_PIN
669
-      //#define SHIFT_EN_PIN         EXP1_08_PIN
669
+      //#define SHIFT_EN_PIN         EXP1_03_PIN
670
     #endif
670
     #endif
671
 
671
 
672
   #endif
672
   #endif
682
 
682
 
683
     #if IS_RRD_SC
683
     #if IS_RRD_SC
684
 
684
 
685
-      #define BEEPER_PIN             EXP1_10_PIN
685
+      #define BEEPER_PIN             EXP1_01_PIN
686
 
686
 
687
       #if ENABLED(CR10_STOCKDISPLAY)
687
       #if ENABLED(CR10_STOCKDISPLAY)
688
-        #define BTN_EN1              EXP1_08_PIN
689
-        #define BTN_EN2              EXP1_06_PIN
688
+        #define BTN_EN1              EXP1_03_PIN
689
+        #define BTN_EN2              EXP1_05_PIN
690
       #else
690
       #else
691
-        #define BTN_EN1              EXP2_08_PIN
692
-        #define BTN_EN2              EXP2_06_PIN
691
+        #define BTN_EN1              EXP2_03_PIN
692
+        #define BTN_EN2              EXP2_05_PIN
693
       #endif
693
       #endif
694
 
694
 
695
-      #define BTN_ENC                EXP1_09_PIN
695
+      #define BTN_ENC                EXP1_02_PIN
696
       #ifndef SD_DETECT_PIN
696
       #ifndef SD_DETECT_PIN
697
-        #define SD_DETECT_PIN        EXP2_04_PIN
697
+        #define SD_DETECT_PIN        EXP2_07_PIN
698
       #endif
698
       #endif
699
       #ifndef KILL_PIN
699
       #ifndef KILL_PIN
700
-        #define KILL_PIN             EXP2_03_PIN
700
+        #define KILL_PIN             EXP2_08_PIN
701
       #endif
701
       #endif
702
 
702
 
703
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
703
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
717
       #define BTN_EN2                AUX4_06_PIN
717
       #define BTN_EN2                AUX4_06_PIN
718
       #define BTN_ENC                AUX4_03_PIN
718
       #define BTN_ENC                AUX4_03_PIN
719
       #define LCD_SDSS                      SDSS
719
       #define LCD_SDSS                      SDSS
720
-      #define KILL_PIN               EXP2_03_PIN
720
+      #define KILL_PIN               EXP2_08_PIN
721
 
721
 
722
     #elif ENABLED(LCD_I2C_VIKI)
722
     #elif ENABLED(LCD_I2C_VIKI)
723
 
723
 
726
       #define BTN_ENC                         -1
726
       #define BTN_ENC                         -1
727
 
727
 
728
       #define LCD_SDSS                      SDSS
728
       #define LCD_SDSS                      SDSS
729
-      #define SD_DETECT_PIN          EXP2_04_PIN
729
+      #define SD_DETECT_PIN          EXP2_07_PIN
730
 
730
 
731
     #elif EITHER(VIKI2, miniVIKI)
731
     #elif EITHER(VIKI2, miniVIKI)
732
 
732
 
734
       #define DOGLCD_A0              AUX2_07_PIN
734
       #define DOGLCD_A0              AUX2_07_PIN
735
       #define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
735
       #define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
736
 
736
 
737
-      #define BEEPER_PIN             EXP2_06_PIN
737
+      #define BEEPER_PIN             EXP2_05_PIN
738
       #define STAT_LED_RED_PIN       AUX4_03_PIN
738
       #define STAT_LED_RED_PIN       AUX4_03_PIN
739
-      #define STAT_LED_BLUE_PIN      EXP1_09_PIN
739
+      #define STAT_LED_BLUE_PIN      EXP1_02_PIN
740
 
740
 
741
       #define BTN_EN1                         22
741
       #define BTN_EN1                         22
742
       #define BTN_EN2                          7
742
       #define BTN_EN2                          7
743
       #define BTN_ENC                AUX4_08_PIN
743
       #define BTN_ENC                AUX4_08_PIN
744
 
744
 
745
       #define SD_DETECT_PIN                   -1  // Pin 49 for display SD interface, 72 for easy adapter board
745
       #define SD_DETECT_PIN                   -1  // Pin 49 for display SD interface, 72 for easy adapter board
746
-      #define KILL_PIN               EXP2_08_PIN
746
+      #define KILL_PIN               EXP2_03_PIN
747
 
747
 
748
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
748
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
749
 
749
 
750
-      #define DOGLCD_CS              EXP1_03_PIN
751
-      #define DOGLCD_A0              EXP1_04_PIN
750
+      #define DOGLCD_CS              EXP1_08_PIN
751
+      #define DOGLCD_A0              EXP1_07_PIN
752
 
752
 
753
-      #define BEEPER_PIN             EXP1_06_PIN
754
-      #define LCD_BACKLIGHT_PIN      EXP2_06_PIN
753
+      #define BEEPER_PIN             EXP1_05_PIN
754
+      #define LCD_BACKLIGHT_PIN      EXP2_05_PIN
755
 
755
 
756
-      #define BTN_EN1                EXP1_09_PIN
757
-      #define BTN_EN2                EXP1_10_PIN
758
-      #define BTN_ENC                EXP2_08_PIN
756
+      #define BTN_EN1                EXP1_02_PIN
757
+      #define BTN_EN2                EXP1_01_PIN
758
+      #define BTN_ENC                EXP2_03_PIN
759
 
759
 
760
       #define LCD_SDSS                      SDSS
760
       #define LCD_SDSS                      SDSS
761
-      #define SD_DETECT_PIN          EXP2_04_PIN
762
-      #define KILL_PIN               EXP2_03_PIN
761
+      #define SD_DETECT_PIN          EXP2_07_PIN
762
+      #define KILL_PIN               EXP2_08_PIN
763
 
763
 
764
     #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
764
     #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
765
 
765
 
766
-      #define BEEPER_PIN             EXP1_10_PIN
767
-      #define BTN_ENC                EXP1_09_PIN
766
+      #define BEEPER_PIN             EXP1_01_PIN
767
+      #define BTN_ENC                EXP1_02_PIN
768
       #ifndef SD_DETECT_PIN
768
       #ifndef SD_DETECT_PIN
769
-        #define SD_DETECT_PIN        EXP2_04_PIN
769
+        #define SD_DETECT_PIN        EXP2_07_PIN
770
       #endif
770
       #endif
771
 
771
 
772
       #ifndef KILL_PIN
772
       #ifndef KILL_PIN
773
-        #define KILL_PIN             EXP2_03_PIN
773
+        #define KILL_PIN             EXP2_08_PIN
774
       #endif
774
       #endif
775
 
775
 
776
       #if ENABLED(MKS_MINI_12864)
776
       #if ENABLED(MKS_MINI_12864)
777
 
777
 
778
-        #define DOGLCD_A0            EXP1_04_PIN
779
-        #define DOGLCD_CS            EXP1_05_PIN
778
+        #define DOGLCD_A0            EXP1_07_PIN
779
+        #define DOGLCD_CS            EXP1_06_PIN
780
 
780
 
781
         // not connected to a pin
781
         // not connected to a pin
782
         #define LCD_BACKLIGHT_PIN             -1  // 65 (MKS mini12864 can't adjust backlight by software!)
782
         #define LCD_BACKLIGHT_PIN             -1  // 65 (MKS mini12864 can't adjust backlight by software!)
783
 
783
 
784
-        #define BTN_EN1              EXP2_08_PIN
785
-        #define BTN_EN2              EXP2_06_PIN
784
+        #define BTN_EN1              EXP2_03_PIN
785
+        #define BTN_EN2              EXP2_05_PIN
786
 
786
 
787
       #elif ENABLED(FYSETC_MINI_12864)
787
       #elif ENABLED(FYSETC_MINI_12864)
788
 
788
 
789
         // From https://wiki.fysetc.com/Mini12864_Panel/
789
         // From https://wiki.fysetc.com/Mini12864_Panel/
790
 
790
 
791
-        #define DOGLCD_A0            EXP1_07_PIN
792
-        #define DOGLCD_CS            EXP1_08_PIN
791
+        #define DOGLCD_A0            EXP1_04_PIN
792
+        #define DOGLCD_CS            EXP1_03_PIN
793
 
793
 
794
-        #define BTN_EN1              EXP2_06_PIN
795
-        #define BTN_EN2              EXP2_08_PIN
794
+        #define BTN_EN1              EXP2_05_PIN
795
+        #define BTN_EN2              EXP2_03_PIN
796
 
796
 
797
         //#define FORCE_SOFT_SPI                  // Use this if default of hardware SPI causes display problems
797
         //#define FORCE_SOFT_SPI                  // Use this if default of hardware SPI causes display problems
798
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
798
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
799
 
799
 
800
-        #define LCD_RESET_PIN        EXP1_06_PIN  // Must be high or open for LCD to operate normally.
800
+        #define LCD_RESET_PIN        EXP1_05_PIN  // Must be high or open for LCD to operate normally.
801
 
801
 
802
         #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
802
         #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
803
           #ifndef RGB_LED_R_PIN
803
           #ifndef RGB_LED_R_PIN
804
-            #define RGB_LED_R_PIN    EXP1_05_PIN
804
+            #define RGB_LED_R_PIN    EXP1_06_PIN
805
           #endif
805
           #endif
806
           #ifndef RGB_LED_G_PIN
806
           #ifndef RGB_LED_G_PIN
807
-            #define RGB_LED_G_PIN    EXP1_04_PIN
807
+            #define RGB_LED_G_PIN    EXP1_07_PIN
808
           #endif
808
           #endif
809
           #ifndef RGB_LED_B_PIN
809
           #ifndef RGB_LED_B_PIN
810
-            #define RGB_LED_B_PIN    EXP1_03_PIN
810
+            #define RGB_LED_B_PIN    EXP1_08_PIN
811
           #endif
811
           #endif
812
         #elif ENABLED(FYSETC_MINI_12864_2_1)
812
         #elif ENABLED(FYSETC_MINI_12864_2_1)
813
-          #define NEOPIXEL_PIN       EXP1_05_PIN
813
+          #define NEOPIXEL_PIN       EXP1_06_PIN
814
         #endif
814
         #endif
815
 
815
 
816
       #endif
816
       #endif
840
 
840
 
841
     #elif ENABLED(G3D_PANEL)
841
     #elif ENABLED(G3D_PANEL)
842
 
842
 
843
-      #define BEEPER_PIN             EXP1_10_PIN
843
+      #define BEEPER_PIN             EXP1_01_PIN
844
 
844
 
845
-      #define SD_DETECT_PIN          EXP2_04_PIN
846
-      #define KILL_PIN               EXP2_03_PIN
845
+      #define SD_DETECT_PIN          EXP2_07_PIN
846
+      #define KILL_PIN               EXP2_08_PIN
847
 
847
 
848
-      #define BTN_EN1                EXP2_06_PIN
849
-      #define BTN_EN2                EXP2_08_PIN
850
-      #define BTN_ENC                EXP1_09_PIN
848
+      #define BTN_EN1                EXP2_05_PIN
849
+      #define BTN_EN2                EXP2_03_PIN
850
+      #define BTN_ENC                EXP1_02_PIN
851
 
851
 
852
     #elif IS_TFTGLCD_PANEL
852
     #elif IS_TFTGLCD_PANEL
853
 
853
 
854
-      #define SD_DETECT_PIN          EXP2_04_PIN
854
+      #define SD_DETECT_PIN          EXP2_07_PIN
855
 
855
 
856
     #else
856
     #else
857
 
857
 
858
-      #define BEEPER_PIN             EXP2_06_PIN
858
+      #define BEEPER_PIN             EXP2_05_PIN
859
 
859
 
860
       #if ENABLED(PANEL_ONE)                       // Buttons connect directly to AUX-2
860
       #if ENABLED(PANEL_ONE)                       // Buttons connect directly to AUX-2
861
         #define BTN_EN1              AUX2_03_PIN
861
         #define BTN_EN1              AUX2_03_PIN
862
         #define BTN_EN2              AUX2_04_PIN
862
         #define BTN_EN2              AUX2_04_PIN
863
         #define BTN_ENC              AUX3_02_PIN
863
         #define BTN_ENC              AUX3_02_PIN
864
       #else
864
       #else
865
-        #define BTN_EN1              EXP1_10_PIN
866
-        #define BTN_EN2              EXP1_09_PIN
867
-        #define BTN_ENC              EXP2_08_PIN
865
+        #define BTN_EN1              EXP1_01_PIN
866
+        #define BTN_EN2              EXP1_02_PIN
867
+        #define BTN_ENC              EXP2_03_PIN
868
       #endif
868
       #endif
869
 
869
 
870
     #endif
870
     #endif
898
    *
898
    *
899
    *               Board                            Display
899
    *               Board                            Display
900
    *               ------                           ------
900
    *               ------                           ------
901
-   *    (MISO) 50 |10  9 | 52 (SCK)             5V |10  9 | GND
902
-   * (BTN_EN2) 33 | 8  7 | 53 (SD_CS)        RESET | 8  7 | (SD_DET)
903
-   * (BTN_EN1) 31   6  5 | 51 (MOSI)        (MOSI)   6  5 | (LCD_CS)
904
-   *  (SD_DET) 49 | 4  3 | RESET           (SD_CS) | 4  3 | (MOD_RESET)
905
-   *          GND | 2  1 | --                (SCK) | 2  1 | (MISO)
901
+   *    (MISO) 50 | 1  2 | 52 (SCK)             5V | 1  2 | GND
902
+   * (BTN_EN2) 33 | 3  4 | 53 (SD_CS)        RESET | 3  4 | (SD_DET)
903
+   * (BTN_EN1) 31   5  6 | 51 (MOSI)        (MOSI)   5  6 | (LCD_CS)
904
+   *  (SD_DET) 49 | 7  8 | RESET           (SD_CS) | 7  8 | (MOD_RESET)
905
+   *          GND | 9 10 | --                (SCK) | 9 10 | (MISO)
906
    *               ------                           ------
906
    *               ------                           ------
907
    *                EXP2
907
    *                EXP2
908
    *
908
    *
925
    *        To fix, insert a 1N4148 diode in the MISO line.
925
    *        To fix, insert a 1N4148 diode in the MISO line.
926
    */
926
    */
927
 
927
 
928
-  #define BEEPER_PIN                 EXP1_10_PIN
928
+  #define BEEPER_PIN                 EXP1_01_PIN
929
 
929
 
930
-  #define SD_DETECT_PIN              EXP2_04_PIN
930
+  #define SD_DETECT_PIN              EXP2_07_PIN
931
 
931
 
932
-  #define CLCD_MOD_RESET             EXP2_06_PIN
933
-  #define CLCD_SPI_CS                EXP2_08_PIN
932
+  #define CLCD_MOD_RESET             EXP2_05_PIN
933
+  #define CLCD_SPI_CS                EXP2_03_PIN
934
 
934
 
935
 #endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050
935
 #endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050

+ 21
- 21
Marlin/src/pins/ramps/pins_RAMPS_PLUS.h 查看文件

65
 
65
 
66
 /**             3DYMY Expansion Headers
66
 /**             3DYMY Expansion Headers
67
  *         ------                     ------
67
  *         ------                     ------
68
- *     37 |10  9 | 35      (MISO) 50 |10  9 | 52 (SCK)
69
- *     31 | 8  7 | 41             29 | 8  7 | 53
70
- *     33   6  5 | 23             25   6  5 | 51 (MOSI)
71
- *     42 | 4  3 | 44             49 | 4  3 | 27
72
- *    GND | 2  1 | 5V            GND | 2  1 | --
68
+ *     37 | 1  2 | 35      (MISO) 50 | 1  2 | 52 (SCK)
69
+ *     31 | 3  4 | 41             29 | 3  4 | 53
70
+ *     33   5  6 | 23             25   5  6 | 51 (MOSI)
71
+ *     42 | 7  8 | 44             49 | 7  8 | 27
72
+ *    GND | 9 10 | 5V            GND | 9 10 | --
73
  *         ------                     ------
73
  *         ------                     ------
74
  *          EXP1                       EXP2
74
  *          EXP1                       EXP2
75
  */
75
  */
76
-#define EXP1_03_PIN                           44
77
-#define EXP1_04_PIN                           42
78
-#define EXP1_05_PIN                           23
79
-#define EXP1_06_PIN                           33
80
-#define EXP1_07_PIN                           41
81
-#define EXP1_08_PIN                           31
82
-#define EXP1_09_PIN                           35
83
-#define EXP1_10_PIN                           37
76
+#define EXP1_08_PIN                           44
77
+#define EXP1_07_PIN                           42
78
+#define EXP1_06_PIN                           23
79
+#define EXP1_05_PIN                           33
80
+#define EXP1_04_PIN                           41
81
+#define EXP1_03_PIN                           31
82
+#define EXP1_02_PIN                           35
83
+#define EXP1_01_PIN                           37
84
 
84
 
85
-#define EXP2_03_PIN                           27
86
-#define EXP2_04_PIN                           49
87
-#define EXP2_05_PIN                           51
88
-#define EXP2_06_PIN                           25
89
-#define EXP2_07_PIN                           53
90
-#define EXP2_08_PIN                           29
91
-#define EXP2_09_PIN                           52
92
-#define EXP2_10_PIN                           50
85
+#define EXP2_08_PIN                           27
86
+#define EXP2_07_PIN                           49
87
+#define EXP2_06_PIN                           51
88
+#define EXP2_05_PIN                           25
89
+#define EXP2_04_PIN                           53
90
+#define EXP2_03_PIN                           29
91
+#define EXP2_02_PIN                           52
92
+#define EXP2_01_PIN                           50
93
 
93
 
94
 #include "pins_RAMPS.h"
94
 #include "pins_RAMPS.h"

+ 29
- 29
Marlin/src/pins/ramps/pins_ZRIB_V53.h 查看文件

299
  * LCD adapter. NOTE: These come in two variants. The socket keys can be
299
  * LCD adapter. NOTE: These come in two variants. The socket keys can be
300
  * on either side, and may be backwards on some displays.
300
  * on either side, and may be backwards on some displays.
301
  *         ------                     ------
301
  *         ------                     ------
302
- *    D37 |10  9 | D35    (MISO) D50 |10  9 | D52 (SCK)
303
- *    D17 | 8  7 | D16           D31 | 8  7 | D53
302
+ *    D37 | 1  2 | D35    (MISO) D50 | 1  2 | D52 (SCK)
303
+ *    D17 | 3  4 | D16           D31 | 3  4 | D53
304
  *    D23   6  5   D25           D33   6  5   D51 (MOSI)
304
  *    D23   6  5   D25           D33   6  5   D51 (MOSI)
305
- *    D27 | 4  3 | D29           D49 | 4  3 | D41
306
- *    GND | 2  1 | 5V            GND | 2  1 | --
305
+ *    D27 | 7  8 | D29           D49 | 7  8 | D41
306
+ *    GND | 9 10 | 5V            GND | 9 10 | --
307
  *         ------                     ------
307
  *         ------                     ------
308
  *          EXP1                       EXP2
308
  *          EXP1                       EXP2
309
  */
309
  */
310
 
310
 
311
-#ifndef EXP1_03_PIN
312
-  #define EXP1_03_PIN                         29
313
-  #define EXP1_04_PIN                         27
314
-  #define EXP1_05_PIN                         25
315
-  #define EXP1_06_PIN                         23
316
-  #define EXP1_07_PIN                         16
317
-  #define EXP1_08_PIN                         17
318
-  #define EXP1_09_PIN                         35
319
-  #define EXP1_10_PIN                         37
320
-
321
-  #define EXP2_03_PIN                         41
322
-  #define EXP2_04_PIN                         49
323
-  #define EXP2_05_PIN                 XS6_05_PIN
324
-  #define EXP2_06_PIN                         33
325
-  #define EXP2_07_PIN                         53
326
-  #define EXP2_08_PIN                         31
327
-  #define EXP2_09_PIN                 XS6_03_PIN
328
-  #define EXP2_10_PIN                 XS6_07_PIN
311
+#ifndef EXP1_08_PIN
312
+  #define EXP1_08_PIN                         29
313
+  #define EXP1_07_PIN                         27
314
+  #define EXP1_06_PIN                         25
315
+  #define EXP1_05_PIN                         23
316
+  #define EXP1_04_PIN                         16
317
+  #define EXP1_03_PIN                         17
318
+  #define EXP1_02_PIN                         35
319
+  #define EXP1_01_PIN                         37
320
+
321
+  #define EXP2_08_PIN                         41
322
+  #define EXP2_07_PIN                         49
323
+  #define EXP2_06_PIN                 XS6_05_PIN
324
+  #define EXP2_05_PIN                         33
325
+  #define EXP2_04_PIN                         53
326
+  #define EXP2_03_PIN                         31
327
+  #define EXP2_02_PIN                 XS6_03_PIN
328
+  #define EXP2_01_PIN                 XS6_07_PIN
329
 #endif
329
 #endif
330
 
330
 
331
 //////////////////////////
331
 //////////////////////////
386
 
386
 
387
 #if ENABLED(ZONESTAR_LCD)
387
 #if ENABLED(ZONESTAR_LCD)
388
   #define LCDSCREEN_NAME "LCD2004 ADCKEY"
388
   #define LCDSCREEN_NAME "LCD2004 ADCKEY"
389
-  #define LCD_PINS_RS                EXP1_07_PIN
390
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
391
-  #define LCD_PINS_D4                EXP1_06_PIN
392
-  #define LCD_PINS_D5                EXP1_05_PIN
393
-  #define LCD_PINS_D6                EXP1_04_PIN
394
-  #define LCD_PINS_D7                EXP1_03_PIN
389
+  #define LCD_PINS_RS                EXP1_04_PIN
390
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
391
+  #define LCD_PINS_D4                EXP1_05_PIN
392
+  #define LCD_PINS_D5                EXP1_06_PIN
393
+  #define LCD_PINS_D6                EXP1_07_PIN
394
+  #define LCD_PINS_D7                EXP1_08_PIN
395
   #define ADC_KEYPAD_PIN                      10  // A10 for ADCKEY
395
   #define ADC_KEYPAD_PIN                      10  // A10 for ADCKEY
396
-  #define BEEPER_PIN                 EXP1_10_PIN
396
+  #define BEEPER_PIN                 EXP1_01_PIN
397
 #endif
397
 #endif
398
 
398
 
399
 /**
399
 /**

+ 49
- 49
Marlin/src/pins/sam/pins_RAMPS_FD_V1.h 查看文件

135
 #define LED_PIN                               13
135
 #define LED_PIN                               13
136
 
136
 
137
 /**        ------                     ------
137
 /**        ------                     ------
138
- *     37 |10  9 | 35      (MISO) 50 |10  9 | 76 (SCK)
139
- *     29 | 8  7 | 27       (EN2) 31 | 8  7 |  4 (SD_SS)
140
- *     25   6  5 | 23       (EN1) 33   6  5 | 75 (MOSI)
141
- *     16 | 4  3 | 17       (SDD) 49 | 4  3 | RESET
142
- *    GND | 2  1 | 5V            GND | 2  1 | --
138
+ *     37 | 1  2 | 35      (MISO) 50 | 1  2 | 76 (SCK)
139
+ *     29 | 3  4 | 27       (EN2) 31 | 3  4 |  4 (SD_SS)
140
+ *     25   5  6 | 23       (EN1) 33   5  6 | 75 (MOSI)
141
+ *     16 | 7  8 | 17       (SDD) 49 | 7  8 | RESET
142
+ *    GND | 9 10 | 5V            GND | 9 10 | --
143
  *         ------                     ------
143
  *         ------                     ------
144
  *          EXP1                       EXP2
144
  *          EXP1                       EXP2
145
  */
145
  */
146
-#define EXP1_03_PIN                           17
147
-#define EXP1_04_PIN                           16
148
-#define EXP1_05_PIN                           23
149
-#define EXP1_06_PIN                           25
150
-#define EXP1_07_PIN                           27
151
-#define EXP1_08_PIN                           29
152
-#define EXP1_09_PIN                           35
153
-#define EXP1_10_PIN                           37
154
-
155
-#define EXP2_03_PIN                           -1
156
-#define EXP2_04_PIN                           49
157
-#define EXP2_05_PIN                           75
158
-#define EXP2_06_PIN                           33
159
-#define EXP2_07_PIN                            4
160
-#define EXP2_08_PIN                           31
161
-#define EXP2_09_PIN                           76
162
-#define EXP2_10_PIN                           74
146
+#define EXP1_08_PIN                           17
147
+#define EXP1_07_PIN                           16
148
+#define EXP1_06_PIN                           23
149
+#define EXP1_05_PIN                           25
150
+#define EXP1_04_PIN                           27
151
+#define EXP1_03_PIN                           29
152
+#define EXP1_02_PIN                           35
153
+#define EXP1_01_PIN                           37
154
+
155
+#define EXP2_08_PIN                           -1
156
+#define EXP2_07_PIN                           49
157
+#define EXP2_06_PIN                           75
158
+#define EXP2_05_PIN                           33
159
+#define EXP2_04_PIN                            4
160
+#define EXP2_03_PIN                           31
161
+#define EXP2_02_PIN                           76
162
+#define EXP2_01_PIN                           74
163
 
163
 
164
 //
164
 //
165
 // LCD / Controller
165
 // LCD / Controller
167
 #if HAS_WIRED_LCD
167
 #if HAS_WIRED_LCD
168
   // ramps-fd lcd adaptor
168
   // ramps-fd lcd adaptor
169
 
169
 
170
-  #define BEEPER_PIN                 EXP1_10_PIN
171
-  #define BTN_EN1                    EXP2_06_PIN
172
-  #define BTN_EN2                    EXP2_08_PIN
173
-  #define BTN_ENC                    EXP1_09_PIN
174
-  #define SD_DETECT_PIN              EXP2_04_PIN
170
+  #define BEEPER_PIN                 EXP1_01_PIN
171
+  #define BTN_EN1                    EXP2_05_PIN
172
+  #define BTN_EN2                    EXP2_03_PIN
173
+  #define BTN_ENC                    EXP1_02_PIN
174
+  #define SD_DETECT_PIN              EXP2_07_PIN
175
 
175
 
176
   #if IS_NEWPANEL
176
   #if IS_NEWPANEL
177
-    #define LCD_PINS_RS              EXP1_04_PIN
178
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
177
+    #define LCD_PINS_RS              EXP1_07_PIN
178
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
179
   #endif
179
   #endif
180
 
180
 
181
   #if ENABLED(FYSETC_MINI_12864)
181
   #if ENABLED(FYSETC_MINI_12864)
182
     #define DOGLCD_CS            LCD_PINS_ENABLE
182
     #define DOGLCD_CS            LCD_PINS_ENABLE
183
     #define DOGLCD_A0                LCD_PINS_RS
183
     #define DOGLCD_A0                LCD_PINS_RS
184
-    #define DOGLCD_SCK               EXP2_09_PIN
185
-    #define DOGLCD_MOSI              EXP2_05_PIN
184
+    #define DOGLCD_SCK               EXP2_02_PIN
185
+    #define DOGLCD_MOSI              EXP2_06_PIN
186
 
186
 
187
     //#define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
187
     //#define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
188
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
188
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
189
 
189
 
190
-    #define LCD_RESET_PIN            EXP1_05_PIN  // Must be high or open for LCD to operate normally.
190
+    #define LCD_RESET_PIN            EXP1_06_PIN  // Must be high or open for LCD to operate normally.
191
 
191
 
192
     #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
192
     #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
193
       #ifndef RGB_LED_R_PIN
193
       #ifndef RGB_LED_R_PIN
194
-        #define RGB_LED_R_PIN        EXP1_06_PIN
194
+        #define RGB_LED_R_PIN        EXP1_05_PIN
195
       #endif
195
       #endif
196
       #ifndef RGB_LED_G_PIN
196
       #ifndef RGB_LED_G_PIN
197
-        #define RGB_LED_G_PIN        EXP1_07_PIN
197
+        #define RGB_LED_G_PIN        EXP1_04_PIN
198
       #endif
198
       #endif
199
       #ifndef RGB_LED_B_PIN
199
       #ifndef RGB_LED_B_PIN
200
-        #define RGB_LED_B_PIN        EXP1_08_PIN
200
+        #define RGB_LED_B_PIN        EXP1_03_PIN
201
       #endif
201
       #endif
202
     #elif ENABLED(FYSETC_MINI_12864_2_1)
202
     #elif ENABLED(FYSETC_MINI_12864_2_1)
203
-      #define NEOPIXEL_PIN           EXP1_06_PIN
203
+      #define NEOPIXEL_PIN           EXP1_05_PIN
204
     #endif
204
     #endif
205
 
205
 
206
   #elif IS_NEWPANEL
206
   #elif IS_NEWPANEL
207
 
207
 
208
-    #define LCD_PINS_D4              EXP1_05_PIN
209
-    #define LCD_PINS_D5              EXP1_06_PIN
210
-    #define LCD_PINS_D6              EXP1_07_PIN
211
-    #define LCD_PINS_D7              EXP1_08_PIN
208
+    #define LCD_PINS_D4              EXP1_06_PIN
209
+    #define LCD_PINS_D5              EXP1_05_PIN
210
+    #define LCD_PINS_D6              EXP1_04_PIN
211
+    #define LCD_PINS_D7              EXP1_03_PIN
212
 
212
 
213
     #if ENABLED(MINIPANEL)
213
     #if ENABLED(MINIPANEL)
214
-      #define DOGLCD_CS              EXP1_06_PIN
215
-      #define DOGLCD_A0              EXP1_07_PIN
214
+      #define DOGLCD_CS              EXP1_05_PIN
215
+      #define DOGLCD_A0              EXP1_04_PIN
216
     #endif
216
     #endif
217
 
217
 
218
   #endif
218
   #endif
219
 
219
 
220
   #if EITHER(VIKI2, miniVIKI)
220
   #if EITHER(VIKI2, miniVIKI)
221
-    #define DOGLCD_A0                EXP1_04_PIN
221
+    #define DOGLCD_A0                EXP1_07_PIN
222
     #define KILL_PIN                          51
222
     #define KILL_PIN                          51
223
-    #define STAT_LED_BLUE_PIN        EXP1_08_PIN
224
-    #define STAT_LED_RED_PIN         EXP1_05_PIN
225
-    #define DOGLCD_CS                EXP1_03_PIN
226
-    #define DOGLCD_SCK               EXP2_09_PIN  // SCK_PIN   - Required for DUE Hardware SPI
227
-    #define DOGLCD_MOSI              EXP2_05_PIN  // MOSI_PIN
228
-    #define DOGLCD_MISO              EXP2_10_PIN  // MISO_PIN
223
+    #define STAT_LED_BLUE_PIN        EXP1_03_PIN
224
+    #define STAT_LED_RED_PIN         EXP1_06_PIN
225
+    #define DOGLCD_CS                EXP1_08_PIN
226
+    #define DOGLCD_SCK               EXP2_02_PIN  // SCK_PIN   - Required for DUE Hardware SPI
227
+    #define DOGLCD_MOSI              EXP2_06_PIN  // MOSI_PIN
228
+    #define DOGLCD_MISO              EXP2_01_PIN  // MISO_PIN
229
   #endif
229
   #endif
230
 
230
 
231
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
231
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)

+ 21
- 21
Marlin/src/pins/sam/pins_RAMPS_SMART.h 查看文件

110
 #else
110
 #else
111
 
111
 
112
   /**        ------                     ------
112
   /**        ------                     ------
113
-   *     37 |10  9 | 35      (MISO) 50 |10  9 | 52 (SCK)
114
-   *     31 | 8  7 | 41             29 | 8  7 | 53
115
-   *     33   6  5 | 23             25   6  5 | 51 (MOSI)
116
-   *     42 | 4  3 | 44             49 | 4  3 | 27
117
-   *    GND | 2  1 | 5V            GND | 2  1 | --
113
+   *     37 | 1  2 | 35      (MISO) 50 | 1  2 | 52 (SCK)
114
+   *     31 | 3  4 | 41             29 | 3  4 | 53
115
+   *     33   5  6 | 23             25   5  6 | 51 (MOSI)
116
+   *     42 | 7  8 | 44             49 | 7  8 | 27
117
+   *    GND | 9 10 | 5V            GND | 9 10 | --
118
    *         ------                     ------
118
    *         ------                     ------
119
    *          EXP1                       EXP2
119
    *          EXP1                       EXP2
120
    */
120
    */
121
-  #define EXP1_03_PIN                         44
122
-  #define EXP1_04_PIN                         42
123
-  #define EXP1_05_PIN                         23
124
-  #define EXP1_06_PIN                         33
125
-  #define EXP1_07_PIN                         41
126
-  #define EXP1_08_PIN                         31
127
-  #define EXP1_09_PIN                         35
128
-  #define EXP1_10_PIN                         37
121
+  #define EXP1_08_PIN                         44
122
+  #define EXP1_07_PIN                         42
123
+  #define EXP1_06_PIN                         23
124
+  #define EXP1_05_PIN                         33
125
+  #define EXP1_04_PIN                         41
126
+  #define EXP1_03_PIN                         31
127
+  #define EXP1_02_PIN                         35
128
+  #define EXP1_01_PIN                         37
129
 
129
 
130
-  #define EXP2_03_PIN                         27
131
-  #define EXP2_04_PIN                         49
132
-  #define EXP2_05_PIN                         51
133
-  #define EXP2_06_PIN                         25
134
-  #define EXP2_07_PIN                         53
135
-  #define EXP2_08_PIN                         29
136
-  #define EXP2_09_PIN                         52
137
-  #define EXP2_10_PIN                         50
130
+  #define EXP2_08_PIN                         27
131
+  #define EXP2_07_PIN                         49
132
+  #define EXP2_06_PIN                         51
133
+  #define EXP2_05_PIN                         25
134
+  #define EXP2_04_PIN                         53
135
+  #define EXP2_03_PIN                         29
136
+  #define EXP2_02_PIN                         52
137
+  #define EXP2_01_PIN                         50
138
 
138
 
139
 #endif
139
 #endif
140
 
140
 

+ 47
- 47
Marlin/src/pins/sam/pins_RURAMPS4D_11.h 查看文件

146
 // SPI for MAX Thermocouple
146
 // SPI for MAX Thermocouple
147
 /*
147
 /*
148
 #if DISABLED(SDSUPPORT)
148
 #if DISABLED(SDSUPPORT)
149
-  #define TEMP_0_CS_PIN              EXP1_03_PIN
149
+  #define TEMP_0_CS_PIN              EXP1_08_PIN
150
 #else
150
 #else
151
   #define TEMP_0_CS_PIN                       49
151
   #define TEMP_0_CS_PIN                       49
152
 #endif
152
 #endif
185
 
185
 
186
 /**
186
 /**
187
  *              ------                                ------
187
  *              ------                                ------
188
- * (BEEPER) 62 |10  9 | 40 (BTN_ENC)  (MISO)      74 |10  9 | 76 (SCK)
189
- * (LCD_EN) 64 | 8  7 | 63 (LCD_RS)   (BTN_EN1)   44 | 8  7 | 10 (SD_SS)
190
- * (LCD_D4) 48 | 6  5   50 (LCD_D5)   (BTN_EN2)   42 | 6  5   75 (MOSI)
191
- * (LCD_D6) 52 | 4  3 | 53 (LCD_D7)   (SD_DETECT) 51 | 4  3 | RESET
192
- *         GND | 2  1 | 5V                       GND | 2  1 | --
188
+ * (BEEPER) 62 | 1  2 | 40 (BTN_ENC)  (MISO)      74 | 1  2 | 76 (SCK)
189
+ * (LCD_EN) 64 | 3  4 | 63 (LCD_RS)   (BTN_EN1)   44 | 3  4 | 10 (SD_SS)
190
+ * (LCD_D4) 48 | 5  6   50 (LCD_D5)   (BTN_EN2)   42 | 5  6   75 (MOSI)
191
+ * (LCD_D6) 52 | 7  8 | 53 (LCD_D7)   (SD_DETECT) 51 | 7  8 | RESET
192
+ *         GND | 9 10 | 5V                       GND | 9 10 | --
193
  *              ------                                ------
193
  *              ------                                ------
194
  *               EXP1                                  EXP2
194
  *               EXP1                                  EXP2
195
  */
195
  */
196
-#define EXP1_03_PIN                           53
197
-#define EXP1_04_PIN                           52
198
-#define EXP1_05_PIN                           50
199
-#define EXP1_06_PIN                           48
200
-#define EXP1_07_PIN                           63
201
-#define EXP1_08_PIN                           64
202
-#define EXP1_09_PIN                           40
203
-#define EXP1_10_PIN                           62
204
-
205
-#define EXP2_03_PIN                           -1  // RESET
206
-#define EXP2_04_PIN                           51
207
-#define EXP2_05_PIN                           75  // MOSI
208
-#define EXP2_06_PIN                           42
209
-#define EXP2_07_PIN                           10
210
-#define EXP2_08_PIN                           44
211
-#define EXP2_09_PIN                           76  // SCK
212
-#define EXP2_10_PIN                           74  // MISO
196
+#define EXP1_08_PIN                           53
197
+#define EXP1_07_PIN                           52
198
+#define EXP1_06_PIN                           50
199
+#define EXP1_05_PIN                           48
200
+#define EXP1_04_PIN                           63
201
+#define EXP1_03_PIN                           64
202
+#define EXP1_02_PIN                           40
203
+#define EXP1_01_PIN                           62
204
+
205
+#define EXP2_08_PIN                           -1  // RESET
206
+#define EXP2_07_PIN                           51
207
+#define EXP2_06_PIN                           75  // MOSI
208
+#define EXP2_05_PIN                           42
209
+#define EXP2_04_PIN                           10
210
+#define EXP2_03_PIN                           44
211
+#define EXP2_02_PIN                           76  // SCK
212
+#define EXP2_01_PIN                           74  // MISO
213
 
213
 
214
 //
214
 //
215
 // LCD / Controller
215
 // LCD / Controller
217
 #if HAS_WIRED_LCD
217
 #if HAS_WIRED_LCD
218
 
218
 
219
   #if ANY(RADDS_DISPLAY, IS_RRD_SC, IS_RRD_FG_SC)
219
   #if ANY(RADDS_DISPLAY, IS_RRD_SC, IS_RRD_FG_SC)
220
-    #define BEEPER_PIN               EXP1_10_PIN
221
-    #define LCD_PINS_D4              EXP1_06_PIN
222
-    #define LCD_PINS_D5              EXP1_05_PIN
223
-    #define LCD_PINS_D6              EXP1_04_PIN
224
-    #define LCD_PINS_D7              EXP1_03_PIN
225
-    #define SD_DETECT_PIN            EXP2_04_PIN
220
+    #define BEEPER_PIN               EXP1_01_PIN
221
+    #define LCD_PINS_D4              EXP1_05_PIN
222
+    #define LCD_PINS_D5              EXP1_06_PIN
223
+    #define LCD_PINS_D6              EXP1_07_PIN
224
+    #define LCD_PINS_D7              EXP1_08_PIN
225
+    #define SD_DETECT_PIN            EXP2_07_PIN
226
   #endif
226
   #endif
227
 
227
 
228
   #if EITHER(RADDS_DISPLAY, IS_RRD_SC)
228
   #if EITHER(RADDS_DISPLAY, IS_RRD_SC)
229
 
229
 
230
-    #define LCD_PINS_RS              EXP1_07_PIN
231
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
230
+    #define LCD_PINS_RS              EXP1_04_PIN
231
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
232
 
232
 
233
   #elif IS_RRD_FG_SC
233
   #elif IS_RRD_FG_SC
234
 
234
 
235
-    #define LCD_PINS_RS              EXP1_04_PIN
236
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
235
+    #define LCD_PINS_RS              EXP1_07_PIN
236
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
237
 
237
 
238
   #elif HAS_U8GLIB_I2C_OLED
238
   #elif HAS_U8GLIB_I2C_OLED
239
 
239
 
240
-    #define BEEPER_PIN               EXP1_10_PIN
241
-    #define LCD_SDSS                 EXP2_07_PIN
242
-    #define SD_DETECT_PIN            EXP2_04_PIN
240
+    #define BEEPER_PIN               EXP1_01_PIN
241
+    #define LCD_SDSS                 EXP2_04_PIN
242
+    #define SD_DETECT_PIN            EXP2_07_PIN
243
 
243
 
244
   #elif ENABLED(FYSETC_MINI_12864)
244
   #elif ENABLED(FYSETC_MINI_12864)
245
 
245
 
246
-    #define BEEPER_PIN               EXP1_10_PIN
247
-    #define DOGLCD_CS                EXP1_08_PIN
248
-    #define DOGLCD_A0                EXP1_07_PIN
246
+    #define BEEPER_PIN               EXP1_01_PIN
247
+    #define DOGLCD_CS                EXP1_03_PIN
248
+    #define DOGLCD_A0                EXP1_04_PIN
249
 
249
 
250
     //#define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
250
     //#define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
251
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
251
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
252
 
252
 
253
-    #define LCD_RESET_PIN            EXP1_06_PIN  // Must be high or open for LCD to operate normally.
253
+    #define LCD_RESET_PIN            EXP1_05_PIN  // Must be high or open for LCD to operate normally.
254
 
254
 
255
     #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
255
     #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
256
       #ifndef RGB_LED_R_PIN
256
       #ifndef RGB_LED_R_PIN
257
-        #define RGB_LED_R_PIN        EXP1_05_PIN  // D5
257
+        #define RGB_LED_R_PIN        EXP1_06_PIN  // D5
258
       #endif
258
       #endif
259
       #ifndef RGB_LED_G_PIN
259
       #ifndef RGB_LED_G_PIN
260
-        #define RGB_LED_G_PIN        EXP1_04_PIN  // D6
260
+        #define RGB_LED_G_PIN        EXP1_07_PIN  // D6
261
       #endif
261
       #endif
262
       #ifndef RGB_LED_B_PIN
262
       #ifndef RGB_LED_B_PIN
263
-        #define RGB_LED_B_PIN        EXP1_03_PIN  // D7
263
+        #define RGB_LED_B_PIN        EXP1_08_PIN  // D7
264
       #endif
264
       #endif
265
     #elif ENABLED(FYSETC_MINI_12864_2_1)
265
     #elif ENABLED(FYSETC_MINI_12864_2_1)
266
-      #define NEOPIXEL_PIN           EXP1_05_PIN  // D5
266
+      #define NEOPIXEL_PIN           EXP1_06_PIN  // D5
267
     #endif
267
     #endif
268
 
268
 
269
   #elif ENABLED(SPARK_FULL_GRAPHICS)
269
   #elif ENABLED(SPARK_FULL_GRAPHICS)
280
   #endif // SPARK_FULL_GRAPHICS
280
   #endif // SPARK_FULL_GRAPHICS
281
 
281
 
282
   #if IS_NEWPANEL
282
   #if IS_NEWPANEL
283
-    #define BTN_EN1                  EXP2_08_PIN
284
-    #define BTN_EN2                  EXP2_06_PIN
285
-    #define BTN_ENC                  EXP1_09_PIN
283
+    #define BTN_EN1                  EXP2_03_PIN
284
+    #define BTN_EN2                  EXP2_05_PIN
285
+    #define BTN_ENC                  EXP1_02_PIN
286
   #endif
286
   #endif
287
 
287
 
288
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
288
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)

+ 49
- 49
Marlin/src/pins/sam/pins_RURAMPS4D_13.h 查看文件

175
 
175
 
176
 /**
176
 /**
177
  *              ------                                ------
177
  *              ------                                ------
178
- * (BEEPER) 62 |10  9 | 40 (BTN_ENC)  (MISO)      74 |10  9 | 76 (SCK)
179
- * (LCD_EN) 64 | 8  7 | 63 (LCD_RS)   (BTN_EN1)   44 | 8  7 | 10 (SD_SS)
180
- * (LCD_D4) 48 | 6  5   50 (LCD_D5)   (BTN_EN2)   42 | 6  5   75 (MOSI)
181
- * (LCD_D6) 52 | 4  3 | 53 (LCD_D7)   (SD_DETECT) 51 | 4  3 | RESET
182
- *         GND | 2  1 | 5V                       GND | 2  1 | --
178
+ * (BEEPER) 62 | 1  2 | 40 (BTN_ENC)  (MISO)      74 | 1  2 | 76 (SCK)
179
+ * (LCD_EN) 64 | 3  4 | 63 (LCD_RS)   (BTN_EN1)   44 | 3  4 | 10 (SD_SS)
180
+ * (LCD_D4) 48 | 5  6   50 (LCD_D5)   (BTN_EN2)   42 | 5  6   75 (MOSI)
181
+ * (LCD_D6) 52 | 7  8 | 53 (LCD_D7)   (SD_DETECT) 51 | 7  8 | RESET
182
+ *         GND | 9 10 | 5V                       GND | 9 10 | --
183
  *              ------                                ------
183
  *              ------                                ------
184
  *               EXP1                                  EXP2
184
  *               EXP1                                  EXP2
185
  */
185
  */
186
-#define EXP1_03_PIN                           53
187
-#define EXP1_04_PIN                           52
188
-#define EXP1_05_PIN                           50
189
-#define EXP1_06_PIN                           48
190
-#define EXP1_07_PIN                           63
191
-#define EXP1_08_PIN                           64
192
-#define EXP1_09_PIN                           40
193
-#define EXP1_10_PIN                           62
194
-
195
-#define EXP2_03_PIN                           -1  // RESET
196
-#define EXP2_04_PIN                           51
197
-#define EXP2_05_PIN                           75  // MOSI
198
-#define EXP2_06_PIN                           42
199
-#define EXP2_07_PIN                           10
200
-#define EXP2_08_PIN                           44
201
-#define EXP2_09_PIN                           76  // SCK
202
-#define EXP2_10_PIN                           74  // MISO
186
+#define EXP1_08_PIN                           53
187
+#define EXP1_07_PIN                           52
188
+#define EXP1_06_PIN                           50
189
+#define EXP1_05_PIN                           48
190
+#define EXP1_04_PIN                           63
191
+#define EXP1_03_PIN                           64
192
+#define EXP1_02_PIN                           40
193
+#define EXP1_01_PIN                           62
194
+
195
+#define EXP2_08_PIN                           -1  // RESET
196
+#define EXP2_07_PIN                           51
197
+#define EXP2_06_PIN                           75  // MOSI
198
+#define EXP2_05_PIN                           42
199
+#define EXP2_04_PIN                           10
200
+#define EXP2_03_PIN                           44
201
+#define EXP2_02_PIN                           76  // SCK
202
+#define EXP2_01_PIN                           74  // MISO
203
 
203
 
204
 //
204
 //
205
 // LCD / Controller
205
 // LCD / Controller
207
 #if HAS_WIRED_LCD
207
 #if HAS_WIRED_LCD
208
 
208
 
209
   #if ANY(RADDS_DISPLAY, IS_RRD_SC, IS_RRD_FG_SC)
209
   #if ANY(RADDS_DISPLAY, IS_RRD_SC, IS_RRD_FG_SC)
210
-    #define BEEPER_PIN               EXP1_10_PIN
211
-    #define LCD_PINS_D4              EXP1_06_PIN
212
-    #define LCD_PINS_D5              EXP1_05_PIN
213
-    #define LCD_PINS_D6              EXP1_04_PIN
214
-    #define LCD_PINS_D7              EXP1_03_PIN
215
-    #define SD_DETECT_PIN            EXP2_04_PIN
210
+    #define BEEPER_PIN               EXP1_01_PIN
211
+    #define LCD_PINS_D4              EXP1_05_PIN
212
+    #define LCD_PINS_D5              EXP1_06_PIN
213
+    #define LCD_PINS_D6              EXP1_07_PIN
214
+    #define LCD_PINS_D7              EXP1_08_PIN
215
+    #define SD_DETECT_PIN            EXP2_07_PIN
216
   #endif
216
   #endif
217
 
217
 
218
   #if EITHER(RADDS_DISPLAY, IS_RRD_SC)
218
   #if EITHER(RADDS_DISPLAY, IS_RRD_SC)
219
 
219
 
220
-    #define LCD_PINS_RS              EXP1_07_PIN
221
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
220
+    #define LCD_PINS_RS              EXP1_04_PIN
221
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
222
 
222
 
223
   #elif IS_RRD_FG_SC
223
   #elif IS_RRD_FG_SC
224
 
224
 
225
-    #define LCD_PINS_RS              EXP1_04_PIN
226
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
225
+    #define LCD_PINS_RS              EXP1_07_PIN
226
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
227
 
227
 
228
   #elif HAS_U8GLIB_I2C_OLED
228
   #elif HAS_U8GLIB_I2C_OLED
229
 
229
 
230
-    #define BEEPER_PIN               EXP1_10_PIN
231
-    #define LCD_SDSS                 EXP2_07_PIN
232
-    #define SD_DETECT_PIN            EXP2_04_PIN
230
+    #define BEEPER_PIN               EXP1_01_PIN
231
+    #define LCD_SDSS                 EXP2_04_PIN
232
+    #define SD_DETECT_PIN            EXP2_07_PIN
233
 
233
 
234
   #elif ENABLED(FYSETC_MINI_12864)
234
   #elif ENABLED(FYSETC_MINI_12864)
235
 
235
 
236
-    #define BEEPER_PIN               EXP1_10_PIN
237
-    #define DOGLCD_CS                EXP1_08_PIN
238
-    #define DOGLCD_A0                EXP1_07_PIN
236
+    #define BEEPER_PIN               EXP1_01_PIN
237
+    #define DOGLCD_CS                EXP1_03_PIN
238
+    #define DOGLCD_A0                EXP1_04_PIN
239
 
239
 
240
     //#define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
240
     //#define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
241
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
241
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
242
 
242
 
243
-    #define LCD_RESET_PIN            EXP1_06_PIN  // Must be high or open for LCD to operate normally.
243
+    #define LCD_RESET_PIN            EXP1_05_PIN  // Must be high or open for LCD to operate normally.
244
 
244
 
245
     #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
245
     #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
246
       #ifndef RGB_LED_R_PIN
246
       #ifndef RGB_LED_R_PIN
247
-        #define RGB_LED_R_PIN        EXP1_05_PIN  // D5
247
+        #define RGB_LED_R_PIN        EXP1_06_PIN  // D5
248
       #endif
248
       #endif
249
       #ifndef RGB_LED_G_PIN
249
       #ifndef RGB_LED_G_PIN
250
-        #define RGB_LED_G_PIN        EXP1_04_PIN  // D6
250
+        #define RGB_LED_G_PIN        EXP1_07_PIN  // D6
251
       #endif
251
       #endif
252
       #ifndef RGB_LED_B_PIN
252
       #ifndef RGB_LED_B_PIN
253
-        #define RGB_LED_B_PIN        EXP1_03_PIN  // D7
253
+        #define RGB_LED_B_PIN        EXP1_08_PIN  // D7
254
       #endif
254
       #endif
255
     #elif ENABLED(FYSETC_MINI_12864_2_1)
255
     #elif ENABLED(FYSETC_MINI_12864_2_1)
256
-      #define NEOPIXEL_PIN           EXP1_05_PIN  // D5
256
+      #define NEOPIXEL_PIN           EXP1_06_PIN  // D5
257
     #endif
257
     #endif
258
 
258
 
259
   #elif ENABLED(MKS_MINI_12864)
259
   #elif ENABLED(MKS_MINI_12864)
260
-    #define DOGLCD_A0                EXP1_04_PIN
261
-    #define DOGLCD_CS                EXP1_05_PIN
260
+    #define DOGLCD_A0                EXP1_07_PIN
261
+    #define DOGLCD_CS                EXP1_06_PIN
262
 
262
 
263
-    #define SD_DETECT_PIN            EXP2_04_PIN
263
+    #define SD_DETECT_PIN            EXP2_07_PIN
264
 
264
 
265
   #endif
265
   #endif
266
 
266
 
267
   #if IS_NEWPANEL
267
   #if IS_NEWPANEL
268
-    #define BTN_EN1                  EXP2_08_PIN
269
-    #define BTN_EN2                  EXP2_06_PIN
270
-    #define BTN_ENC                  EXP1_09_PIN
268
+    #define BTN_EN1                  EXP2_03_PIN
269
+    #define BTN_EN2                  EXP2_05_PIN
270
+    #define BTN_ENC                  EXP1_02_PIN
271
   #endif
271
   #endif
272
 
272
 
273
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
273
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)

+ 85
- 85
Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h 查看文件

166
  *      BTN_ENCODER 40         KILL_PIN      49
166
  *      BTN_ENCODER 40         KILL_PIN      49
167
  */
167
  */
168
 
168
 
169
-#define EXP1_03_PIN                           39
170
-#define EXP1_04_PIN                           38
171
-#define EXP1_05_PIN                           37
172
-#define EXP1_06_PIN                           36
173
-#define EXP1_07_PIN                           34
174
-#define EXP1_08_PIN                           35
175
-#define EXP1_09_PIN                           40
176
-#define EXP1_10_PIN                           41
177
-
178
-#define EXP2_01_PIN                           49
179
-#define EXP2_04_PIN                           44
180
-#define EXP2_05_PIN                           51
181
-#define EXP2_06_PIN                           42
182
-#define EXP2_07_PIN                           53
183
-#define EXP2_08_PIN                           43
184
-#define EXP2_09_PIN                           52
185
-#define EXP2_10_PIN                           50
169
+#define EXP1_08_PIN                           39
170
+#define EXP1_07_PIN                           38
171
+#define EXP1_06_PIN                           37
172
+#define EXP1_05_PIN                           36
173
+#define EXP1_04_PIN                           34
174
+#define EXP1_03_PIN                           35
175
+#define EXP1_02_PIN                           40
176
+#define EXP1_01_PIN                           41
177
+
178
+#define EXP2_10_PIN                           49
179
+#define EXP2_07_PIN                           44
180
+#define EXP2_06_PIN                           51
181
+#define EXP2_05_PIN                           42
182
+#define EXP2_04_PIN                           53
183
+#define EXP2_03_PIN                           43
184
+#define EXP2_02_PIN                           52
185
+#define EXP2_01_PIN                           50
186
 
186
 
187
 #if ENABLED(CR10_STOCKDISPLAY)
187
 #if ENABLED(CR10_STOCKDISPLAY)
188
-  #define EXP3_03_PIN                EXP1_03_PIN
189
-  #define EXP3_04_PIN                EXP1_04_PIN
190
-  #define EXP3_05_PIN                EXP1_05_PIN
191
-  #define EXP3_06_PIN                EXP1_06_PIN
192
-  #define EXP3_07_PIN                EXP1_07_PIN
193
-  #define EXP3_08_PIN                EXP1_08_PIN
194
-  #define EXP3_09_PIN                EXP1_09_PIN
195
-  #define EXP3_10_PIN                EXP1_10_PIN
188
+  #define EXP3_03_PIN                EXP1_08_PIN
189
+  #define EXP3_04_PIN                EXP1_07_PIN
190
+  #define EXP3_05_PIN                EXP1_06_PIN
191
+  #define EXP3_06_PIN                EXP1_05_PIN
192
+  #define EXP3_07_PIN                EXP1_04_PIN
193
+  #define EXP3_08_PIN                EXP1_03_PIN
194
+  #define EXP3_09_PIN                EXP1_02_PIN
195
+  #define EXP3_10_PIN                EXP1_01_PIN
196
 #endif
196
 #endif
197
 
197
 
198
 /************************************/
198
 /************************************/
222
     #endif
222
     #endif
223
 
223
 
224
     // DWIN Encoder
224
     // DWIN Encoder
225
-    #define BTN_ENC                  EXP1_09_PIN
226
-    #define BTN_EN1                  EXP1_08_PIN
227
-    #define BTN_EN2                  EXP1_07_PIN
225
+    #define BTN_ENC                  EXP1_02_PIN
226
+    #define BTN_EN1                  EXP1_03_PIN
227
+    #define BTN_EN2                  EXP1_04_PIN
228
 
228
 
229
     #ifndef BEEPER_PIN
229
     #ifndef BEEPER_PIN
230
-      #define BEEPER_PIN             EXP1_10_PIN
230
+      #define BEEPER_PIN             EXP1_01_PIN
231
       #undef SPEAKER
231
       #undef SPEAKER
232
     #endif
232
     #endif
233
 
233
 
234
   #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
234
   #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
235
 
235
 
236
     // TO TEST
236
     // TO TEST
237
-    //#define LCD_PINS_RS            EXP2_01_PIN  // CS chip select /SS chip slave select
238
-    //#define LCD_PINS_ENABLE        EXP2_05_PIN  // SID (MOSI)
239
-    //#define LCD_PINS_D4            EXP2_09_PIN  // SCK (CLK) clock
237
+    //#define LCD_PINS_RS            EXP2_10_PIN  // CS chip select /SS chip slave select
238
+    //#define LCD_PINS_ENABLE        EXP2_06_PIN  // SID (MOSI)
239
+    //#define LCD_PINS_D4            EXP2_02_PIN  // SCK (CLK) clock
240
 
240
 
241
   #elif BOTH(IS_NEWPANEL, PANEL_ONE)
241
   #elif BOTH(IS_NEWPANEL, PANEL_ONE)
242
 
242
 
243
     // TO TEST
243
     // TO TEST
244
-    //#define LCD_PINS_RS            EXP1_09_PIN
245
-    //#define LCD_PINS_ENABLE        EXP2_06_PIN
244
+    //#define LCD_PINS_RS            EXP1_02_PIN
245
+    //#define LCD_PINS_ENABLE        EXP2_05_PIN
246
     //#define LCD_PINS_D4                     57  // Mega/Due:65 - AGCM4:57
246
     //#define LCD_PINS_D4                     57  // Mega/Due:65 - AGCM4:57
247
     //#define LCD_PINS_D5                     58  // Mega/Due:66 - AGCM4:58
247
     //#define LCD_PINS_D5                     58  // Mega/Due:66 - AGCM4:58
248
-    //#define LCD_PINS_D6            EXP2_04_PIN
248
+    //#define LCD_PINS_D6            EXP2_07_PIN
249
     //#define LCD_PINS_D7                     56  // Mega/Due:64 - AGCM4:56
249
     //#define LCD_PINS_D7                     56  // Mega/Due:64 - AGCM4:56
250
 
250
 
251
   #else
251
   #else
266
 
266
 
267
       // TO TEST
267
       // TO TEST
268
       //#define LCD_PINS_RS                   56  // Mega/Due:64 - AGCM4:56
268
       //#define LCD_PINS_RS                   56  // Mega/Due:64 - AGCM4:56
269
-      //#define LCD_PINS_ENABLE      EXP2_04_PIN
269
+      //#define LCD_PINS_ENABLE      EXP2_07_PIN
270
       //#define LCD_PINS_D4                   55  // Mega/Due:63 - AGCM4:55
270
       //#define LCD_PINS_D4                   55  // Mega/Due:63 - AGCM4:55
271
-      //#define LCD_PINS_D5          EXP1_09_PIN
272
-      //#define LCD_PINS_D6          EXP2_06_PIN
271
+      //#define LCD_PINS_D5          EXP1_02_PIN
272
+      //#define LCD_PINS_D6          EXP2_05_PIN
273
       //#define LCD_PINS_D7                   57  // Mega/Due:65 - AGCM4:57
273
       //#define LCD_PINS_D7                   57  // Mega/Due:65 - AGCM4:57
274
 
274
 
275
     #else
275
     #else
287
 
287
 
288
       #else
288
       #else
289
         // Definitions for any standard Display
289
         // Definitions for any standard Display
290
-        #define LCD_PINS_RS          EXP1_07_PIN
291
-        #define LCD_PINS_ENABLE      EXP1_08_PIN
292
-        #define LCD_PINS_D4          EXP1_06_PIN
293
-        #define LCD_PINS_D5          EXP1_05_PIN
294
-        #define LCD_PINS_D6          EXP1_04_PIN
290
+        #define LCD_PINS_RS          EXP1_04_PIN
291
+        #define LCD_PINS_ENABLE      EXP1_03_PIN
292
+        #define LCD_PINS_D4          EXP1_05_PIN
293
+        #define LCD_PINS_D5          EXP1_06_PIN
294
+        #define LCD_PINS_D6          EXP1_07_PIN
295
       #endif
295
       #endif
296
 
296
 
297
-      #define LCD_PINS_D7            EXP1_03_PIN
297
+      #define LCD_PINS_D7            EXP1_08_PIN
298
 
298
 
299
       #if !IS_NEWPANEL
299
       #if !IS_NEWPANEL
300
-        #define BEEPER_PIN           EXP1_10_PIN
300
+        #define BEEPER_PIN           EXP1_01_PIN
301
       #endif
301
       #endif
302
 
302
 
303
     #endif
303
     #endif
305
     #if !IS_NEWPANEL
305
     #if !IS_NEWPANEL
306
       // Buttons attached to a shift register
306
       // Buttons attached to a shift register
307
       // Not wired yet
307
       // Not wired yet
308
-      //#define SHIFT_CLK_PIN        EXP1_04_PIN
309
-      //#define SHIFT_LD_PIN         EXP2_06_PIN
310
-      //#define SHIFT_OUT_PIN        EXP1_09_PIN
308
+      //#define SHIFT_CLK_PIN        EXP1_07_PIN
309
+      //#define SHIFT_LD_PIN         EXP2_05_PIN
310
+      //#define SHIFT_OUT_PIN        EXP1_02_PIN
311
       //#define SHIFT_EN_PIN                  17
311
       //#define SHIFT_EN_PIN                  17
312
     #endif
312
     #endif
313
 
313
 
320
 
320
 
321
     #if IS_RRD_SC
321
     #if IS_RRD_SC
322
 
322
 
323
-      #define BEEPER_PIN             EXP1_10_PIN
323
+      #define BEEPER_PIN             EXP1_01_PIN
324
 
324
 
325
       #if ENABLED(CR10_STOCKDISPLAY)
325
       #if ENABLED(CR10_STOCKDISPLAY)
326
         // TO TEST
326
         // TO TEST
329
 
329
 
330
       #else
330
       #else
331
         // Definitions for any standard Display
331
         // Definitions for any standard Display
332
-        #define BTN_EN1              EXP2_06_PIN
333
-        #define BTN_EN2              EXP2_08_PIN
332
+        #define BTN_EN1              EXP2_05_PIN
333
+        #define BTN_EN2              EXP2_03_PIN
334
         #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
334
         #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
335
           #define BTN_ENC_EN         LCD_PINS_D7  // Detect the presence of the encoder
335
           #define BTN_ENC_EN         LCD_PINS_D7  // Detect the presence of the encoder
336
         #endif
336
         #endif
337
       #endif
337
       #endif
338
 
338
 
339
-      #define BTN_ENC                EXP1_09_PIN
339
+      #define BTN_ENC                EXP1_02_PIN
340
       #ifndef SD_DETECT_PIN
340
       #ifndef SD_DETECT_PIN
341
-        #define SD_DETECT_PIN        EXP2_04_PIN
341
+        #define SD_DETECT_PIN        EXP2_07_PIN
342
       #endif
342
       #endif
343
-      #define KILL_PIN               EXP2_01_PIN
343
+      #define KILL_PIN               EXP2_10_PIN
344
 
344
 
345
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
345
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
346
-        //#define LCD_BACKLIGHT_PIN  EXP1_03_PIN  // TO TEST
346
+        //#define LCD_BACKLIGHT_PIN  EXP1_08_PIN  // TO TEST
347
       #endif
347
       #endif
348
 
348
 
349
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
349
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
352
       //#define BTN_EN1                       56  // Mega/Due:64 - AGCM4:56
352
       //#define BTN_EN1                       56  // Mega/Due:64 - AGCM4:56
353
       //#define BTN_EN2                       72  // Mega/Due:59 - AGCM4:72
353
       //#define BTN_EN2                       72  // Mega/Due:59 - AGCM4:72
354
       //#define BTN_ENC                       55
354
       //#define BTN_ENC                       55
355
-      //#define SD_DETECT_PIN        EXP2_06_PIN
355
+      //#define SD_DETECT_PIN        EXP2_05_PIN
356
 
356
 
357
     #elif ENABLED(LCD_I2C_PANELOLU2)
357
     #elif ENABLED(LCD_I2C_PANELOLU2)
358
 
358
 
359
       // TO TEST
359
       // TO TEST
360
       //#define BTN_EN1                       47
360
       //#define BTN_EN1                       47
361
-      //#define BTN_EN2              EXP2_08_PIN
361
+      //#define BTN_EN2              EXP2_03_PIN
362
       //#define BTN_ENC                       32
362
       //#define BTN_ENC                       32
363
       //#define LCD_SDSS                    SDSS
363
       //#define LCD_SDSS                    SDSS
364
-      //#define KILL_PIN             EXP1_10_PIN
364
+      //#define KILL_PIN             EXP1_01_PIN
365
 
365
 
366
     #elif ENABLED(LCD_I2C_VIKI)
366
     #elif ENABLED(LCD_I2C_VIKI)
367
 
367
 
368
       // TO TEST
368
       // TO TEST
369
-      //#define BTN_EN1              EXP1_09_PIN  // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
370
-      //#define BTN_EN2              EXP2_06_PIN
369
+      //#define BTN_EN1              EXP1_02_PIN  // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
370
+      //#define BTN_EN2              EXP2_05_PIN
371
       //#define BTN_ENC                       -1
371
       //#define BTN_ENC                       -1
372
 
372
 
373
       //#define LCD_SDSS                    SDSS
373
       //#define LCD_SDSS                    SDSS
374
-      //#define SD_DETECT_PIN        EXP2_01_PIN
374
+      //#define SD_DETECT_PIN        EXP2_10_PIN
375
 
375
 
376
     #elif EITHER(VIKI2, miniVIKI)
376
     #elif EITHER(VIKI2, miniVIKI)
377
 
377
 
378
       // TO TEST
378
       // TO TEST
379
       //#define DOGLCD_CS                     45
379
       //#define DOGLCD_CS                     45
380
-      //#define DOGLCD_A0            EXP2_04_PIN
380
+      //#define DOGLCD_A0            EXP2_07_PIN
381
       //#define LCD_SCREEN_ROT_180
381
       //#define LCD_SCREEN_ROT_180
382
 
382
 
383
       //#define BEEPER_PIN                    33
383
       //#define BEEPER_PIN                    33
384
       //#define STAT_LED_RED_PIN              32
384
       //#define STAT_LED_RED_PIN              32
385
-      //#define STAT_LED_BLUE_PIN    EXP1_08_PIN
385
+      //#define STAT_LED_BLUE_PIN    EXP1_03_PIN
386
 
386
 
387
       //#define BTN_EN1                       22
387
       //#define BTN_EN1                       22
388
       //#define BTN_EN2                        7
388
       //#define BTN_EN2                        7
389
-      //#define BTN_ENC              EXP1_03_PIN
389
+      //#define BTN_ENC              EXP1_08_PIN
390
 
390
 
391
       //#define SD_DETECT_PIN                 -1  // Pin 49 for display SD interface, 72 for easy adapter board
391
       //#define SD_DETECT_PIN                 -1  // Pin 49 for display SD interface, 72 for easy adapter board
392
       //#define KILL_PIN                      31
392
       //#define KILL_PIN                      31
400
       //#define BEEPER_PIN                    23
400
       //#define BEEPER_PIN                    23
401
       //#define LCD_BACKLIGHT_PIN             33
401
       //#define LCD_BACKLIGHT_PIN             33
402
 
402
 
403
-      //#define BTN_EN1              EXP1_08_PIN
404
-      //#define BTN_EN2              EXP1_05_PIN
403
+      //#define BTN_EN1              EXP1_03_PIN
404
+      //#define BTN_EN2              EXP1_06_PIN
405
       //#define BTN_ENC                       31
405
       //#define BTN_ENC                       31
406
 
406
 
407
       //#define LCD_SDSS                    SDSS
407
       //#define LCD_SDSS                    SDSS
408
-      //#define SD_DETECT_PIN        EXP2_01_PIN
409
-      //#define KILL_PIN             EXP1_10_PIN
408
+      //#define SD_DETECT_PIN        EXP2_10_PIN
409
+      //#define KILL_PIN             EXP1_01_PIN
410
 
410
 
411
     #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
411
     #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
412
 
412
 
413
       // TO TEST
413
       // TO TEST
414
-      //#define BEEPER_PIN           EXP1_05_PIN
415
-      //#define BTN_ENC              EXP1_08_PIN
416
-      //#define SD_DETECT_PIN        EXP2_01_PIN
414
+      //#define BEEPER_PIN           EXP1_06_PIN
415
+      //#define BTN_ENC              EXP1_03_PIN
416
+      //#define SD_DETECT_PIN        EXP2_10_PIN
417
 
417
 
418
       //#ifndef KILL_PIN
418
       //#ifndef KILL_PIN
419
-      //  #define KILL_PIN           EXP1_10_PIN
419
+      //  #define KILL_PIN           EXP1_01_PIN
420
       //#endif
420
       //#endif
421
 
421
 
422
       #if ENABLED(MKS_MINI_12864)
422
       #if ENABLED(MKS_MINI_12864)
476
     #elif ENABLED(MINIPANEL)
476
     #elif ENABLED(MINIPANEL)
477
 
477
 
478
       // TO TEST
478
       // TO TEST
479
-      //#define BEEPER_PIN           EXP2_06_PIN
479
+      //#define BEEPER_PIN           EXP2_05_PIN
480
       // not connected to a pin
480
       // not connected to a pin
481
       //#define LCD_BACKLIGHT_PIN             57  // backlight LED on A11/D? (Mega/Due:65 - AGCM4:57)
481
       //#define LCD_BACKLIGHT_PIN             57  // backlight LED on A11/D? (Mega/Due:65 - AGCM4:57)
482
 
482
 
483
-      //#define DOGLCD_A0            EXP2_04_PIN
483
+      //#define DOGLCD_A0            EXP2_07_PIN
484
       //#define DOGLCD_CS                     58  // Mega/Due:66 - AGCM4:58
484
       //#define DOGLCD_CS                     58  // Mega/Due:66 - AGCM4:58
485
 
485
 
486
       // GLCD features
486
       // GLCD features
489
       //#define LCD_SCREEN_ROT_180
489
       //#define LCD_SCREEN_ROT_180
490
       //#define LCD_SCREEN_ROT_270
490
       //#define LCD_SCREEN_ROT_270
491
 
491
 
492
-      //#define BTN_EN1              EXP1_09_PIN
492
+      //#define BTN_EN1              EXP1_02_PIN
493
       //#define BTN_EN2                       55  // Mega/Due:63 - AGCM4:55
493
       //#define BTN_EN2                       55  // Mega/Due:63 - AGCM4:55
494
       //#define BTN_ENC                       72  // Mega/Due:59 - AGCM4:72
494
       //#define BTN_ENC                       72  // Mega/Due:59 - AGCM4:72
495
 
495
 
496
-      //#define SD_DETECT_PIN        EXP2_01_PIN
496
+      //#define SD_DETECT_PIN        EXP2_10_PIN
497
       //#define KILL_PIN                      56  // Mega/Due:64 - AGCM4:56
497
       //#define KILL_PIN                      56  // Mega/Due:64 - AGCM4:56
498
 
498
 
499
     #elif ENABLED(ZONESTAR_LCD)
499
     #elif ENABLED(ZONESTAR_LCD)
513
       // Buttons are directly attached to AUX-2
513
       // Buttons are directly attached to AUX-2
514
       #if IS_RRW_KEYPAD
514
       #if IS_RRW_KEYPAD
515
         // TO TEST
515
         // TO TEST
516
-        //#define SHIFT_OUT_PIN      EXP1_09_PIN
517
-        //#define SHIFT_CLK_PIN      EXP2_04_PIN
518
-        //#define SHIFT_LD_PIN       EXP2_06_PIN
516
+        //#define SHIFT_OUT_PIN      EXP1_02_PIN
517
+        //#define SHIFT_CLK_PIN      EXP2_07_PIN
518
+        //#define SHIFT_LD_PIN       EXP2_05_PIN
519
         //#define BTN_EN1                     56  // Mega/Due:64 - AGCM4:56
519
         //#define BTN_EN1                     56  // Mega/Due:64 - AGCM4:56
520
         //#define BTN_EN2                     72  // Mega/Due:59 - AGCM4:72
520
         //#define BTN_EN2                     72  // Mega/Due:59 - AGCM4:72
521
         //#define BTN_ENC                     55  // Mega/Due:63 - AGCM4:55
521
         //#define BTN_ENC                     55  // Mega/Due:63 - AGCM4:55
523
         // TO TEST
523
         // TO TEST
524
         //#define BTN_EN1                     72  // AUX2 PIN 3 (Mega/Due:59 - AGCM4:72)
524
         //#define BTN_EN1                     72  // AUX2 PIN 3 (Mega/Due:59 - AGCM4:72)
525
         //#define BTN_EN2                     55  // AUX2 PIN 4 (Mega/Due:63 - AGCM4:55)
525
         //#define BTN_EN2                     55  // AUX2 PIN 4 (Mega/Due:63 - AGCM4:55)
526
-        //#define BTN_ENC            EXP2_01_PIN  // AUX3 PIN 7
526
+        //#define BTN_ENC            EXP2_10_PIN  // AUX3 PIN 7
527
       #else
527
       #else
528
         // TO TEST
528
         // TO TEST
529
-        //#define BTN_EN1            EXP1_05_PIN
530
-        //#define BTN_EN2            EXP1_08_PIN
529
+        //#define BTN_EN1            EXP1_06_PIN
530
+        //#define BTN_EN2            EXP1_03_PIN
531
         //#define BTN_ENC                     31
531
         //#define BTN_ENC                     31
532
       #endif
532
       #endif
533
 
533
 
534
       #if ENABLED(G3D_PANEL)
534
       #if ENABLED(G3D_PANEL)
535
         // TO TEST
535
         // TO TEST
536
-        //#define SD_DETECT_PIN      EXP2_01_PIN
537
-        //#define KILL_PIN           EXP1_10_PIN
536
+        //#define SD_DETECT_PIN      EXP2_10_PIN
537
+        //#define KILL_PIN           EXP1_01_PIN
538
       #endif
538
       #endif
539
 
539
 
540
     #endif
540
     #endif
565
   #undef SD_DETECT_PIN
565
   #undef SD_DETECT_PIN
566
   #define SD_DETECT_PIN                       95
566
   #define SD_DETECT_PIN                       95
567
 #else
567
 #else
568
-  #define SDSS                       EXP2_07_PIN
568
+  #define SDSS                       EXP2_04_PIN
569
 #endif
569
 #endif
570
 
570
 
571
 #if HAS_TMC_UART
571
 #if HAS_TMC_UART

+ 87
- 87
Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h 查看文件

218
  *      BTN_ENCODER 40
218
  *      BTN_ENCODER 40
219
  */
219
  */
220
 
220
 
221
-#define EXP1_03_PIN                           39
222
-#define EXP1_04_PIN                           38
223
-#define EXP1_05_PIN                           37
224
-#define EXP1_06_PIN                           36
225
-#define EXP1_07_PIN                           34
226
-#define EXP1_08_PIN                           35
227
-#define EXP1_09_PIN                           40
228
-#define EXP1_10_PIN                           41
229
-
230
-#define EXP2_01_PIN                           49
231
-#define EXP2_04_PIN                           44
232
-#define EXP2_05_PIN                           51
233
-#define EXP2_06_PIN                           42
234
-#define EXP2_07_PIN                           53
235
-#define EXP2_08_PIN                           43
236
-#define EXP2_09_PIN                           52
237
-#define EXP2_10_PIN                           50
221
+#define EXP1_08_PIN                           39
222
+#define EXP1_07_PIN                           38
223
+#define EXP1_06_PIN                           37
224
+#define EXP1_05_PIN                           36
225
+#define EXP1_04_PIN                           34
226
+#define EXP1_03_PIN                           35
227
+#define EXP1_02_PIN                           40
228
+#define EXP1_01_PIN                           41
229
+
230
+#define EXP2_10_PIN                           49
231
+#define EXP2_07_PIN                           44
232
+#define EXP2_06_PIN                           51
233
+#define EXP2_05_PIN                           42
234
+#define EXP2_04_PIN                           53
235
+#define EXP2_03_PIN                           43
236
+#define EXP2_02_PIN                           52
237
+#define EXP2_01_PIN                           50
238
 
238
 
239
 #if ENABLED(CR10_STOCKDISPLAY)
239
 #if ENABLED(CR10_STOCKDISPLAY)
240
-  #define EXP3_03_PIN                EXP1_03_PIN
241
-  #define EXP3_04_PIN                EXP1_04_PIN
242
-  #define EXP3_05_PIN                EXP1_05_PIN
243
-  #define EXP3_06_PIN                EXP1_06_PIN
244
-  #define EXP3_07_PIN                EXP1_07_PIN
245
-  #define EXP3_08_PIN                EXP1_08_PIN
246
-  #define EXP3_09_PIN                EXP1_09_PIN
247
-  #define EXP3_10_PIN                EXP1_10_PIN
240
+  #define EXP3_03_PIN                EXP1_08_PIN
241
+  #define EXP3_04_PIN                EXP1_07_PIN
242
+  #define EXP3_05_PIN                EXP1_06_PIN
243
+  #define EXP3_06_PIN                EXP1_05_PIN
244
+  #define EXP3_07_PIN                EXP1_04_PIN
245
+  #define EXP3_08_PIN                EXP1_03_PIN
246
+  #define EXP3_09_PIN                EXP1_02_PIN
247
+  #define EXP3_10_PIN                EXP1_01_PIN
248
 #endif
248
 #endif
249
 
249
 
250
 /************************************/
250
 /************************************/
275
     #endif
275
     #endif
276
 
276
 
277
     // DWIN Encoder
277
     // DWIN Encoder
278
-    #define BTN_ENC                  EXP1_09_PIN
279
-    #define BTN_EN1                  EXP1_08_PIN
280
-    #define BTN_EN2                  EXP1_07_PIN
278
+    #define BTN_ENC                  EXP1_02_PIN
279
+    #define BTN_EN1                  EXP1_03_PIN
280
+    #define BTN_EN2                  EXP1_04_PIN
281
 
281
 
282
     #ifndef BEEPER_PIN
282
     #ifndef BEEPER_PIN
283
-      #define BEEPER_PIN             EXP1_10_PIN
283
+      #define BEEPER_PIN             EXP1_01_PIN
284
       #undef SPEAKER
284
       #undef SPEAKER
285
     #endif
285
     #endif
286
 
286
 
287
   #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
287
   #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
288
 
288
 
289
     // TO TEST
289
     // TO TEST
290
-    //#define LCD_PINS_RS            EXP2_01_PIN  // CS chip select /SS chip slave select
291
-    //#define LCD_PINS_ENABLE        EXP2_05_PIN  // SID (MOSI)
292
-    //#define LCD_PINS_D4            EXP2_09_PIN  // SCK (CLK) clock
290
+    //#define LCD_PINS_RS            EXP2_10_PIN  // CS chip select /SS chip slave select
291
+    //#define LCD_PINS_ENABLE        EXP2_06_PIN  // SID (MOSI)
292
+    //#define LCD_PINS_D4            EXP2_02_PIN  // SCK (CLK) clock
293
 
293
 
294
   #elif BOTH(IS_NEWPANEL, PANEL_ONE)
294
   #elif BOTH(IS_NEWPANEL, PANEL_ONE)
295
 
295
 
296
     // TO TEST
296
     // TO TEST
297
-    //#define LCD_PINS_RS            EXP1_09_PIN
298
-    //#define LCD_PINS_ENABLE        EXP2_06_PIN
297
+    //#define LCD_PINS_RS            EXP1_02_PIN
298
+    //#define LCD_PINS_ENABLE        EXP2_05_PIN
299
     //#define LCD_PINS_D4                     57  // Mega/Due:65 - AGCM4:57
299
     //#define LCD_PINS_D4                     57  // Mega/Due:65 - AGCM4:57
300
     //#define LCD_PINS_D5                     58  // Mega/Due:66 - AGCM4:58
300
     //#define LCD_PINS_D5                     58  // Mega/Due:66 - AGCM4:58
301
-    //#define LCD_PINS_D6            EXP2_04_PIN
301
+    //#define LCD_PINS_D6            EXP2_07_PIN
302
     //#define LCD_PINS_D7                     56  // Mega/Due:64 - AGCM4:56
302
     //#define LCD_PINS_D7                     56  // Mega/Due:64 - AGCM4:56
303
 
303
 
304
   #else
304
   #else
319
 
319
 
320
       // TO TEST
320
       // TO TEST
321
       //#define LCD_PINS_RS                   56  // Mega/Due:64 - AGCM4:56
321
       //#define LCD_PINS_RS                   56  // Mega/Due:64 - AGCM4:56
322
-      //#define LCD_PINS_ENABLE      EXP2_04_PIN
322
+      //#define LCD_PINS_ENABLE      EXP2_07_PIN
323
       //#define LCD_PINS_D4                   55  // Mega/Due:63 - AGCM4:55
323
       //#define LCD_PINS_D4                   55  // Mega/Due:63 - AGCM4:55
324
-      //#define LCD_PINS_D5          EXP1_09_PIN
325
-      //#define LCD_PINS_D6          EXP2_06_PIN
324
+      //#define LCD_PINS_D5          EXP1_02_PIN
325
+      //#define LCD_PINS_D6          EXP2_05_PIN
326
       //#define LCD_PINS_D7                   57  // Mega/Due:65 - AGCM4:57
326
       //#define LCD_PINS_D7                   57  // Mega/Due:65 - AGCM4:57
327
 
327
 
328
     #else
328
     #else
339
 
339
 
340
       #else
340
       #else
341
         // Definitions for any standard Display
341
         // Definitions for any standard Display
342
-        #define LCD_PINS_RS          EXP1_07_PIN
343
-        #define LCD_PINS_ENABLE      EXP1_08_PIN
344
-        #define LCD_PINS_D4          EXP1_06_PIN
345
-        #define LCD_PINS_D5          EXP1_05_PIN
346
-        #define LCD_PINS_D6          EXP1_04_PIN
342
+        #define LCD_PINS_RS          EXP1_04_PIN
343
+        #define LCD_PINS_ENABLE      EXP1_03_PIN
344
+        #define LCD_PINS_D4          EXP1_05_PIN
345
+        #define LCD_PINS_D5          EXP1_06_PIN
346
+        #define LCD_PINS_D6          EXP1_07_PIN
347
       #endif
347
       #endif
348
 
348
 
349
-      #define LCD_PINS_D7            EXP1_03_PIN
349
+      #define LCD_PINS_D7            EXP1_08_PIN
350
 
350
 
351
       #if !IS_NEWPANEL
351
       #if !IS_NEWPANEL
352
-        #define BEEPER_PIN           EXP1_10_PIN
352
+        #define BEEPER_PIN           EXP1_01_PIN
353
       #endif
353
       #endif
354
 
354
 
355
     #endif
355
     #endif
357
     #if !IS_NEWPANEL
357
     #if !IS_NEWPANEL
358
       // Buttons attached to a shift register
358
       // Buttons attached to a shift register
359
       // Not wired yet
359
       // Not wired yet
360
-      //#define SHIFT_CLK_PIN        EXP1_04_PIN
361
-      //#define SHIFT_LD_PIN         EXP2_06_PIN
362
-      //#define SHIFT_OUT_PIN        EXP1_09_PIN
360
+      //#define SHIFT_CLK_PIN        EXP1_07_PIN
361
+      //#define SHIFT_LD_PIN         EXP2_05_PIN
362
+      //#define SHIFT_OUT_PIN        EXP1_02_PIN
363
       //#define SHIFT_EN_PIN                  17
363
       //#define SHIFT_EN_PIN                  17
364
     #endif
364
     #endif
365
 
365
 
372
 
372
 
373
     #if IS_RRD_SC
373
     #if IS_RRD_SC
374
 
374
 
375
-      #define BEEPER_PIN             EXP1_10_PIN
375
+      #define BEEPER_PIN             EXP1_01_PIN
376
 
376
 
377
       #if ENABLED(CR10_STOCKDISPLAY)
377
       #if ENABLED(CR10_STOCKDISPLAY)
378
         // TO TEST
378
         // TO TEST
379
-        #define BTN_EN1              EXP1_08_PIN
380
-        #define BTN_EN2              EXP1_06_PIN
379
+        #define BTN_EN1              EXP1_03_PIN
380
+        #define BTN_EN2              EXP1_05_PIN
381
       #else
381
       #else
382
         // Definitions fpr any standard Display
382
         // Definitions fpr any standard Display
383
-        #define BTN_EN1              EXP2_06_PIN
384
-        #define BTN_EN2              EXP2_08_PIN
383
+        #define BTN_EN1              EXP2_05_PIN
384
+        #define BTN_EN2              EXP2_03_PIN
385
         #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
385
         #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
386
           #define BTN_ENC_EN         LCD_PINS_D7  // Detect the presence of the encoder
386
           #define BTN_ENC_EN         LCD_PINS_D7  // Detect the presence of the encoder
387
         #endif
387
         #endif
388
       #endif
388
       #endif
389
 
389
 
390
-      #define BTN_ENC                EXP1_09_PIN
390
+      #define BTN_ENC                EXP1_02_PIN
391
       #ifndef SD_DETECT_PIN
391
       #ifndef SD_DETECT_PIN
392
-        #define SD_DETECT_PIN        EXP2_04_PIN
392
+        #define SD_DETECT_PIN        EXP2_07_PIN
393
       #endif
393
       #endif
394
-      #define KILL_PIN               EXP2_01_PIN
394
+      #define KILL_PIN               EXP2_10_PIN
395
 
395
 
396
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
396
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
397
-        //#define LCD_BACKLIGHT_PIN  EXP1_03_PIN  // TO TEST
397
+        //#define LCD_BACKLIGHT_PIN  EXP1_08_PIN  // TO TEST
398
       #endif
398
       #endif
399
 
399
 
400
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
400
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
403
       //#define BTN_EN1                       56  // Mega/Due:64 - AGCM4:56
403
       //#define BTN_EN1                       56  // Mega/Due:64 - AGCM4:56
404
       //#define BTN_EN2                       72  // Mega/Due:59 - AGCM4:72
404
       //#define BTN_EN2                       72  // Mega/Due:59 - AGCM4:72
405
       //#define BTN_ENC                       55
405
       //#define BTN_ENC                       55
406
-      //#define SD_DETECT_PIN        EXP2_06_PIN
406
+      //#define SD_DETECT_PIN        EXP2_05_PIN
407
 
407
 
408
     #elif ENABLED(LCD_I2C_PANELOLU2)
408
     #elif ENABLED(LCD_I2C_PANELOLU2)
409
 
409
 
410
       // TO TEST
410
       // TO TEST
411
       //#define BTN_EN1                       47
411
       //#define BTN_EN1                       47
412
-      //#define BTN_EN2              EXP2_08_PIN
412
+      //#define BTN_EN2              EXP2_03_PIN
413
       //#define BTN_ENC                       32
413
       //#define BTN_ENC                       32
414
       //#define LCD_SDSS                    SDSS
414
       //#define LCD_SDSS                    SDSS
415
-      //#define KILL_PIN             EXP1_10_PIN
415
+      //#define KILL_PIN             EXP1_01_PIN
416
 
416
 
417
     #elif ENABLED(LCD_I2C_VIKI)
417
     #elif ENABLED(LCD_I2C_VIKI)
418
 
418
 
419
       // TO TEST
419
       // TO TEST
420
-      //#define BTN_EN1              EXP1_09_PIN  // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
421
-      //#define BTN_EN2              EXP2_06_PIN
420
+      //#define BTN_EN1              EXP1_02_PIN  // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
421
+      //#define BTN_EN2              EXP2_05_PIN
422
       //#define BTN_ENC                       -1
422
       //#define BTN_ENC                       -1
423
 
423
 
424
       //#define LCD_SDSS                    SDSS
424
       //#define LCD_SDSS                    SDSS
425
-      //#define SD_DETECT_PIN        EXP2_01_PIN
425
+      //#define SD_DETECT_PIN        EXP2_10_PIN
426
 
426
 
427
     #elif EITHER(VIKI2, miniVIKI)
427
     #elif EITHER(VIKI2, miniVIKI)
428
 
428
 
429
       // TO TEST
429
       // TO TEST
430
       //#define DOGLCD_CS                     45
430
       //#define DOGLCD_CS                     45
431
-      //#define DOGLCD_A0            EXP2_04_PIN
431
+      //#define DOGLCD_A0            EXP2_07_PIN
432
       //#define LCD_SCREEN_ROT_180
432
       //#define LCD_SCREEN_ROT_180
433
 
433
 
434
       //#define BEEPER_PIN                    33
434
       //#define BEEPER_PIN                    33
435
       //#define STAT_LED_RED_PIN              32
435
       //#define STAT_LED_RED_PIN              32
436
-      //#define STAT_LED_BLUE_PIN    EXP1_08_PIN
436
+      //#define STAT_LED_BLUE_PIN    EXP1_03_PIN
437
 
437
 
438
       //#define BTN_EN1                       22
438
       //#define BTN_EN1                       22
439
       //#define BTN_EN2                        7
439
       //#define BTN_EN2                        7
440
-      //#define BTN_ENC              EXP1_03_PIN
440
+      //#define BTN_ENC              EXP1_08_PIN
441
 
441
 
442
       //#define SD_DETECT_PIN                 -1  // Pin 49 for display SD interface, 72 for easy adapter board
442
       //#define SD_DETECT_PIN                 -1  // Pin 49 for display SD interface, 72 for easy adapter board
443
       //#define KILL_PIN                      31
443
       //#define KILL_PIN                      31
451
       //#define BEEPER_PIN                    23
451
       //#define BEEPER_PIN                    23
452
       //#define LCD_BACKLIGHT_PIN             33
452
       //#define LCD_BACKLIGHT_PIN             33
453
 
453
 
454
-      //#define BTN_EN1              EXP1_08_PIN
455
-      //#define BTN_EN2              EXP1_05_PIN
454
+      //#define BTN_EN1              EXP1_03_PIN
455
+      //#define BTN_EN2              EXP1_06_PIN
456
       //#define BTN_ENC                       31
456
       //#define BTN_ENC                       31
457
 
457
 
458
       //#define LCD_SDSS                    SDSS
458
       //#define LCD_SDSS                    SDSS
459
-      //#define SD_DETECT_PIN        EXP2_01_PIN
460
-      //#define KILL_PIN             EXP1_10_PIN
459
+      //#define SD_DETECT_PIN        EXP2_10_PIN
460
+      //#define KILL_PIN             EXP1_01_PIN
461
 
461
 
462
     #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
462
     #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
463
 
463
 
464
       // TO TEST
464
       // TO TEST
465
-      //#define BEEPER_PIN           EXP1_05_PIN
466
-      //#define BTN_ENC              EXP1_08_PIN
467
-      //#define SD_DETECT_PIN        EXP2_01_PIN
465
+      //#define BEEPER_PIN           EXP1_06_PIN
466
+      //#define BTN_ENC              EXP1_03_PIN
467
+      //#define SD_DETECT_PIN        EXP2_10_PIN
468
 
468
 
469
       //#ifndef KILL_PIN
469
       //#ifndef KILL_PIN
470
-      //  #define KILL_PIN           EXP1_10_PIN
470
+      //  #define KILL_PIN           EXP1_01_PIN
471
       //#endif
471
       //#endif
472
 
472
 
473
       #if ENABLED(MKS_MINI_12864)
473
       #if ENABLED(MKS_MINI_12864)
527
     #elif ENABLED(MINIPANEL)
527
     #elif ENABLED(MINIPANEL)
528
 
528
 
529
       // TO TEST
529
       // TO TEST
530
-      //#define BEEPER_PIN           EXP2_06_PIN
530
+      //#define BEEPER_PIN           EXP2_05_PIN
531
       // not connected to a pin
531
       // not connected to a pin
532
       //#define LCD_BACKLIGHT_PIN             57  // backlight LED on A11/D? (Mega/Due:65 - AGCM4:57)
532
       //#define LCD_BACKLIGHT_PIN             57  // backlight LED on A11/D? (Mega/Due:65 - AGCM4:57)
533
 
533
 
534
-      //#define DOGLCD_A0            EXP2_04_PIN
534
+      //#define DOGLCD_A0            EXP2_07_PIN
535
       //#define DOGLCD_CS                     58  // Mega/Due:66 - AGCM4:58
535
       //#define DOGLCD_CS                     58  // Mega/Due:66 - AGCM4:58
536
 
536
 
537
       // GLCD features
537
       // GLCD features
540
       //#define LCD_SCREEN_ROT_180
540
       //#define LCD_SCREEN_ROT_180
541
       //#define LCD_SCREEN_ROT_270
541
       //#define LCD_SCREEN_ROT_270
542
 
542
 
543
-      //#define BTN_EN1              EXP1_09_PIN
543
+      //#define BTN_EN1              EXP1_02_PIN
544
       //#define BTN_EN2                       55  // Mega/Due:63 - AGCM4:55
544
       //#define BTN_EN2                       55  // Mega/Due:63 - AGCM4:55
545
       //#define BTN_ENC                       72  // Mega/Due:59 - AGCM4:72
545
       //#define BTN_ENC                       72  // Mega/Due:59 - AGCM4:72
546
 
546
 
547
-      //#define SD_DETECT_PIN        EXP2_01_PIN
547
+      //#define SD_DETECT_PIN        EXP2_10_PIN
548
       //#define KILL_PIN                      56  // Mega/Due:64 - AGCM4:56
548
       //#define KILL_PIN                      56  // Mega/Due:64 - AGCM4:56
549
 
549
 
550
     #elif ENABLED(ZONESTAR_LCD)
550
     #elif ENABLED(ZONESTAR_LCD)
564
       // Buttons are directly attached to AUX-2
564
       // Buttons are directly attached to AUX-2
565
       #if IS_RRW_KEYPAD
565
       #if IS_RRW_KEYPAD
566
         // TO TEST
566
         // TO TEST
567
-        //#define SHIFT_OUT_PIN      EXP1_09_PIN
568
-        //#define SHIFT_CLK_PIN      EXP2_04_PIN
569
-        //#define SHIFT_LD_PIN       EXP2_06_PIN
567
+        //#define SHIFT_OUT_PIN      EXP1_02_PIN
568
+        //#define SHIFT_CLK_PIN      EXP2_07_PIN
569
+        //#define SHIFT_LD_PIN       EXP2_05_PIN
570
         //#define BTN_EN1                     56  // Mega/Due:64 - AGCM4:56
570
         //#define BTN_EN1                     56  // Mega/Due:64 - AGCM4:56
571
         //#define BTN_EN2                     72  // Mega/Due:59 - AGCM4:72
571
         //#define BTN_EN2                     72  // Mega/Due:59 - AGCM4:72
572
         //#define BTN_ENC                     55  // Mega/Due:63 - AGCM4:55
572
         //#define BTN_ENC                     55  // Mega/Due:63 - AGCM4:55
574
         // TO TEST
574
         // TO TEST
575
         //#define BTN_EN1                     72  // AUX2 PIN 3 (Mega/Due:59 - AGCM4:72)
575
         //#define BTN_EN1                     72  // AUX2 PIN 3 (Mega/Due:59 - AGCM4:72)
576
         //#define BTN_EN2                     55  // AUX2 PIN 4 (Mega/Due:63 - AGCM4:55)
576
         //#define BTN_EN2                     55  // AUX2 PIN 4 (Mega/Due:63 - AGCM4:55)
577
-        //#define BTN_ENC            EXP2_01_PIN  // AUX3 PIN 7
577
+        //#define BTN_ENC            EXP2_10_PIN  // AUX3 PIN 7
578
       #else
578
       #else
579
         // TO TEST
579
         // TO TEST
580
-        //#define BTN_EN1            EXP1_05_PIN
581
-        //#define BTN_EN2            EXP1_08_PIN
580
+        //#define BTN_EN1            EXP1_06_PIN
581
+        //#define BTN_EN2            EXP1_03_PIN
582
         //#define BTN_ENC                     31
582
         //#define BTN_ENC                     31
583
       #endif
583
       #endif
584
 
584
 
585
       #if ENABLED(G3D_PANEL)
585
       #if ENABLED(G3D_PANEL)
586
         // TO TEST
586
         // TO TEST
587
-        //#define SD_DETECT_PIN      EXP2_01_PIN
588
-        //#define KILL_PIN           EXP1_10_PIN
587
+        //#define SD_DETECT_PIN      EXP2_10_PIN
588
+        //#define KILL_PIN           EXP1_01_PIN
589
       #endif
589
       #endif
590
 
590
 
591
     #endif
591
     #endif
616
   #undef SD_DETECT_PIN
616
   #undef SD_DETECT_PIN
617
   #define SD_DETECT_PIN                       95
617
   #define SD_DETECT_PIN                       95
618
 #else
618
 #else
619
-  #define SDSS                       EXP2_07_PIN
619
+  #define SDSS                       EXP2_04_PIN
620
 #endif
620
 #endif
621
 
621
 
622
 #if HAS_TMC_UART
622
 #if HAS_TMC_UART

+ 5
- 5
Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h 查看文件

132
 /**
132
 /**
133
  *    EXP1 Connector                      EXP1 as CR10 STOCKDISPLAY
133
  *    EXP1 Connector                      EXP1 as CR10 STOCKDISPLAY
134
  *        ------                                      ------
134
  *        ------                                      ------
135
- *   PA4 |10  9 | PC0                     BEEPER_PIN |10  9 | BTN_ENC
136
- *   PD3 | 8  7 | RESET                      BTN_EN1 | 8  7 | RESET
137
- *   PD2   6  5 | PA1                        BTN_EN2   6  5 | LCD_PINS_D4     (ST9720 CLK)
138
- *   PA3 | 4  3 | PC1        (ST9720 CS) LCD_PINS_RS | 4  3 | LCD_PINS_ENABLE (ST9720 DAT)
139
- *   GND | 2  1 | 5V                             GND | 2  1 | 5V
135
+ *   PA4 | 1  2 | PC0                     BEEPER_PIN | 1  2 | BTN_ENC
136
+ *   PD3 | 3  4 | RESET                      BTN_EN1 | 3  4 | RESET
137
+ *   PD2   5  6 | PA1                        BTN_EN2   5  6 | LCD_PINS_D4     (ST9720 CLK)
138
+ *   PA3 | 7  8 | PC1        (ST9720 CS) LCD_PINS_RS | 7  8 | LCD_PINS_ENABLE (ST9720 DAT)
139
+ *   GND | 9 10 | 5V                             GND | 9 10 | 5V
140
  *        ------                                      ------
140
  *        ------                                      ------
141
  */
141
  */

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

164
 
164
 
165
 /**             EXP1
165
 /**             EXP1
166
  *             ------
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)
167
+ * (MOSI) D5  | 1  2 | D7       (SCK)
168
+ * (CS)   D11 | 3  4 | D10      (DC/D4)
169
+ * (EN2)  D12   5  6 | D4 or D3 (EN/RS)
170
+ * (ENC)  D29 | 7  8 | D2       (EN1)
171
+ *      (GND) | 9 10 | (5V)
172
  *             ------
172
  *             ------
173
  */
173
  */
174
-#define EXP1_03_PIN                            2
175
-#define EXP1_04_PIN                           29
174
+#define EXP1_08_PIN                            2
175
+#define EXP1_07_PIN                           29
176
 #ifndef IS_ZMIB_V2
176
 #ifndef IS_ZMIB_V2
177
-  #define EXP1_05_PIN                          4  // ZMIB V1
177
+  #define EXP1_06_PIN                          4  // ZMIB V1
178
 #else
178
 #else
179
-  #define EXP1_05_PIN                          3  // ZMIB V2
179
+  #define EXP1_06_PIN                          3  // ZMIB V2
180
 #endif
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
181
+#define EXP1_05_PIN                           12
182
+#define EXP1_04_PIN                           10
183
+#define EXP1_03_PIN                           11
184
+#define EXP1_02_PIN                            7
185
+#define EXP1_01_PIN                            5
186
 
186
 
187
 #if ENABLED(ZONESTAR_12864LCD)
187
 #if ENABLED(ZONESTAR_12864LCD)
188
   //
188
   //
190
   //
190
   //
191
   #define LCDSCREEN_NAME "ZONESTAR_12864LCD"
191
   #define LCDSCREEN_NAME "ZONESTAR_12864LCD"
192
   #define FORCE_SOFT_SPI
192
   #define FORCE_SOFT_SPI
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)
193
+  //#define LCD_SDSS                 EXP1_03_PIN
194
+  #define LCD_PINS_RS                EXP1_03_PIN  // ST7920_CS_PIN  (LCD module pin 4)
195
+  #define LCD_PINS_ENABLE            EXP1_06_PIN  // ST7920_DAT_PIN (LCD module pin 5)
196
+  #define LCD_PINS_D4                EXP1_04_PIN  // ST7920_CLK_PIN (LCD module pin 6)
197
 
197
 
198
   #define BOARD_ST7920_DELAY_1       DELAY_2_NOP
198
   #define BOARD_ST7920_DELAY_1       DELAY_2_NOP
199
   #define BOARD_ST7920_DELAY_2       DELAY_2_NOP
199
   #define BOARD_ST7920_DELAY_2       DELAY_2_NOP
205
   //
205
   //
206
   #define LCDSCREEN_NAME "ZONESTAR 12864OLED"
206
   #define LCDSCREEN_NAME "ZONESTAR 12864OLED"
207
   #define FORCE_SOFT_SPI
207
   #define FORCE_SOFT_SPI
208
-  #define LCD_PINS_RS                EXP1_05_PIN
209
-  #define LCD_PINS_DC                EXP1_07_PIN
210
-  #define DOGLCD_CS                  EXP1_08_PIN
208
+  #define LCD_PINS_RS                EXP1_06_PIN
209
+  #define LCD_PINS_DC                EXP1_04_PIN
210
+  #define DOGLCD_CS                  EXP1_03_PIN
211
 
211
 
212
   #if ENABLED(OLED_HW_IIC)
212
   #if ENABLED(OLED_HW_IIC)
213
     #error "Oops! can't choose HW IIC for ZMIB board!!"
213
     #error "Oops! can't choose HW IIC for ZMIB board!!"
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                    EXP1_03_PIN
228
-  #define BTN_EN2                    EXP1_06_PIN
229
-  #define BTN_ENC                    EXP1_04_PIN
227
+  #define BTN_EN1                    EXP1_08_PIN
228
+  #define BTN_EN2                    EXP1_05_PIN
229
+  #define BTN_ENC                    EXP1_07_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

+ 15
- 15
Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h 查看文件

157
 
157
 
158
 /**
158
 /**
159
  *                 ------
159
  *                 ------
160
- * (BEEPER)  PA15 |10  9 | PB6 (BTN_ENC)
161
- * (BTN_EN1) PA9  | 8  7 | RESET
162
- * (BTN_EN2) PA10   6  5 | PB9 (LCD_D4)
163
- * (LCD_RS)  PB8  | 4  3 | PB7 (LCD_EN)
164
- *            GND | 2  1 | 5V
160
+ * (BEEPER)  PA15 | 1  2 | PB6 (BTN_ENC)
161
+ * (BTN_EN1) PA9  | 3  4 | RESET
162
+ * (BTN_EN2) PA10   5  6 | PB9 (LCD_D4)
163
+ * (LCD_RS)  PB8  | 7  8 | PB7 (LCD_EN)
164
+ *            GND | 9 10 | 5V
165
  *                 ------
165
  *                 ------
166
  *                  EXP1
166
  *                  EXP1
167
  */
167
  */
198
 
198
 
199
     /** Creality Ender-2 display pinout
199
     /** Creality Ender-2 display pinout
200
      *                   ------
200
      *                   ------
201
-     *   (SCK)     PA15 |10  9 | PB6 (BTN_ENC)
202
-     *   (BTN_EN1) PA9  | 8  7 | RESET
203
-     *   (BTN_EN2) PA10   6  5 | PB9 (LCD_A0)
204
-     *   (LCD_RS)  PB8  | 4  3 | PB7 (MOSI)
205
-     *              GND | 2  1 | 5V
201
+     *   (SCK)     PA15 | 1  2 | PB6 (BTN_ENC)
202
+     *   (BTN_EN1) PA9  | 3  4 | RESET
203
+     *   (BTN_EN2) PA10   5  6 | PB9 (LCD_A0)
204
+     *   (LCD_RS)  PB8  | 7  8 | PB7 (MOSI)
205
+     *              GND | 9 10 | 5V
206
      *                   ------
206
      *                   ------
207
      *                    EXP1
207
      *                    EXP1
208
      */
208
      */
234
    *
234
    *
235
    *                   Board                                   Display
235
    *                   Board                                   Display
236
    *                   ------                                  ------
236
    *                   ------                                  ------
237
-   * (SD_DET)    PA15 |10  9 | PB6 (BEEPER)                5V |10  9 | GND
238
-   * (MOD_RESET) PA9  | 8  7 | RESET                  (RESET) | 8  7 | (SD_DET)
239
-   * (SD_CS)     PA10   6  5 | PB9                    (MOSI)    6  5 | (LCD_CS)
240
-   * (LCD_CS)    PB8  | 4  3 | PB7                    (SD_CS) | 4  3 | (MOD_RESET)
241
-   *              GND | 2  1 | 5V                     (SCK)   | 2  1 | (MISO)
237
+   * (SD_DET)    PA15 | 1  2 | PB6 (BEEPER)                5V | 1  2 | GND
238
+   * (MOD_RESET) PA9  | 3  4 | RESET                  (RESET) | 3  4 | (SD_DET)
239
+   * (SD_CS)     PA10   5  6 | PB9                    (MOSI)    5  6 | (LCD_CS)
240
+   * (LCD_CS)    PB8  | 7  8 | PB7                    (SD_CS) | 7  8 | (MOD_RESET)
241
+   *              GND | 9 10 | 5V                     (SCK)   | 9 10 | (MISO)
242
    *                   ------                                  ------
242
    *                   ------                                  ------
243
    *                    EXP1                                    EXP1
243
    *                    EXP1                                    EXP1
244
    *
244
    *

+ 30
- 30
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h 查看文件

120
 /**
120
 /**
121
  *        SKR Mini E3 V1.0, V1.2                      SKR Mini E3 V2.0
121
  *        SKR Mini E3 V1.0, V1.2                      SKR Mini E3 V2.0
122
  *                ------                                    ------
122
  *                ------                                    ------
123
- * (BEEPER)  PB5  |10  9 | PB6 (BTN_ENC)    (BEEPER)  PB5  |10  9 | PA15 (BTN_ENC)
124
- * (BTN_EN1) PA9  | 8  7 | RESET            (BTN_EN1) PA9  | 8  7 | RESET
125
- * (BTN_EN2) PA10   6  5 | PB9  (LCD_D4)    (BTN_EN2) PA10   6  5 | PB9  (LCD_D4)
126
- * (LCD_RS)  PB8  | 4  3 | PB7  (LCD_EN)    (LCD_RS)  PB8  | 4  3 | PB15 (LCD_EN)
127
- *            GND | 2  1 | 5V                          GND | 2  1 | 5V
123
+ * (BEEPER)  PB5  | 1  2 | PB6 (BTN_ENC)    (BEEPER)  PB5  | 1  2 | PA15 (BTN_ENC)
124
+ * (BTN_EN1) PA9  | 3  4 | RESET            (BTN_EN1) PA9  | 3  4 | RESET
125
+ * (BTN_EN2) PA10   5  6 | PB9  (LCD_D4)    (BTN_EN2) PA10   5  6 | PB9  (LCD_D4)
126
+ * (LCD_RS)  PB8  | 7  8 | PB7  (LCD_EN)    (LCD_RS)  PB8  | 7  8 | PB15 (LCD_EN)
127
+ *            GND | 9 10 | 5V                          GND | 9 10 | 5V
128
  *                ------                                    ------
128
  *                ------                                    ------
129
  *                 EXP1                                      EXP1
129
  *                 EXP1                                      EXP1
130
  */
130
  */
139
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
139
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
140
   /**
140
   /**
141
    *        ------                ------                ------
141
    *        ------                ------                ------
142
-   * (ENT) |10  9 | (BEEP)       |10  9 |              |10  9 |
143
-   *  (RX) | 8  7 |         (RX) | 8  7 | (TX)      RX | 8  7 | TX
144
-   *  (TX)   6  5 |        (ENT)   6  5 | (BEEP)   ENT | 6  5 | BEEP
145
-   *   (B) | 4  3 | (A)      (B) | 4  3 | (A)        B | 4  3 | A
146
-   *   GND | 2  1 | (VCC)    GND | 2  1 | VCC      GND | 2  1 | VCC
142
+   * (ENT) | 1  2 | (BEEP)       | 1  2 |              | 1  2 |
143
+   *  (RX) | 3  4 |         (RX) | 3  4 | (TX)      RX | 3  4 | TX
144
+   *  (TX)   5  6 |        (ENT)   5  6 | (BEEP)   ENT | 5  6 | BEEP
145
+   *   (B) | 7  8 | (A)      (B) | 7  8 | (A)        B | 7  8 | A
146
+   *   GND | 9 10 | (VCC)    GND | 9 10 | VCC      GND | 9 10 | VCC
147
    *        ------                ------                ------
147
    *        ------                ------                ------
148
    *         EXP1                  DWIN               DWIN (plug)
148
    *         EXP1                  DWIN               DWIN (plug)
149
    *
149
    *
214
        *
214
        *
215
        *                   Board                        Display
215
        *                   Board                        Display
216
        *                   ------                        ------
216
        *                   ------                        ------
217
-       * (SD_DET)    PB5  |10  9 | PB6 (BEEPER)      5V |10  9 | GND
218
-       * (MOD_RESET) PA9  | 8  7 | RESET             -- | 8  7 | (SD_DET)
219
-       * (SD_CS)     PA10   6  5 | PB9          (MOSI)  | 6  5 | --
220
-       * (LCD_CS)    PB8  | 4  3 | PB7          (SD_CS) | 4  3 | (LCD_CS)
221
-       *              GND | 2  1 | 5V           (SCK)   | 2  1 | (MISO)
217
+       * (SD_DET)    PB5  | 1  2 | PB6 (BEEPER)      5V | 1  2 | GND
218
+       * (MOD_RESET) PA9  | 3  4 | RESET             -- | 3  4 | (SD_DET)
219
+       * (SD_CS)     PA10   5  6 | PB9          (MOSI)  | 5  6 | --
220
+       * (LCD_CS)    PB8  | 7  8 | PB7          (SD_CS) | 7  8 | (LCD_CS)
221
+       *              GND | 9 10 | 5V           (SCK)   | 9 10 | (MISO)
222
        *                   ------                        ------
222
        *                   ------                        ------
223
        *                    EXP1                          EXP1
223
        *                    EXP1                          EXP1
224
        *
224
        *
253
      *
253
      *
254
      *       Board                      Display
254
      *       Board                      Display
255
      *       ------                     ------
255
      *       ------                     ------
256
-     * PB5  |10  9 | PA15       (BEEP) |10  9 | BTN_ENC
257
-     * PA9  | 8  7 | RESET      LCD_CS | 8  7 | LCD A0
258
-     * PA10 | 6  5 | PB9       LCD_RST | 6  5 | RED
259
-     * PB8  | 4  3 | PB15      (GREEN) | 4  3 | (BLUE)
260
-     * GND  | 2  1 | 5V            GND | 2  1 | 5V
256
+     * PB5  | 1  2 | PA15       (BEEP) | 1  2 | BTN_ENC
257
+     * PA9  | 3  4 | RESET      LCD_CS | 3  4 | LCD A0
258
+     * PA10 | 5  6 | PB9       LCD_RST | 5  6 | RED
259
+     * PB8  | 7  8 | PB15      (GREEN) | 7  8 | (BLUE)
260
+     * GND  | 9 10 | 5V            GND | 9 10 | 5V
261
      *       ------                     ------
261
      *       ------                     ------
262
      *        EXP1                       EXP1
262
      *        EXP1                       EXP1
263
      *
263
      *
264
      *            ---                   ------
264
      *            ---                   ------
265
-     *       RST | 1 |          (MISO) |10  9 | SCK
266
-     * (RX2) PA2 | 2 |         BTN_EN1 | 8  7 | (SS)
267
-     * (TX2) PA3 | 3 |         BTN_EN2 | 6  5 | MOSI
268
-     *       GND | 4 |            (CD) | 4  3 | (RST)
269
-     *        5V | 5 |           (GND) | 2  1 | (KILL)
265
+     *       RST | 1 |          (MISO) | 1  2 | SCK
266
+     * (RX2) PA2 | 2 |         BTN_EN1 | 3  4 | (SS)
267
+     * (TX2) PA3 | 3 |         BTN_EN2 | 5  6 | MOSI
268
+     *       GND | 4 |            (CD) | 7  8 | (RST)
269
+     *        5V | 5 |           (GND) | 9 10 | (KILL)
270
      *            ---                   ------
270
      *            ---                   ------
271
      *            TFT                    EXP2
271
      *            TFT                    EXP2
272
      *
272
      *
325
    *
325
    *
326
    *                   Board                            Display
326
    *                   Board                            Display
327
    *                   ------                           ------
327
    *                   ------                           ------
328
-   * (SD_DET)    PB5  |10  9 | PB6 (BEEPER)         5V |10  9 | GND
329
-   * (MOD_RESET) PA9  | 8  7 | RESET           (RESET) | 8  7 | (SD_DET)
330
-   * (SD_CS)     PA10   6  5 | PB9             (MOSI)  | 6  5 | (LCD_CS)
331
-   * (LCD_CS)    PB8  | 4  3 | PB7             (SD_CS) | 4  3 | (MOD_RESET)
332
-   *              GND | 2  1 | 5V              (SCK)   | 2  1 | (MISO)
328
+   * (SD_DET)    PB5  | 1  2 | PB6 (BEEPER)         5V | 1  2 | GND
329
+   * (MOD_RESET) PA9  | 3  4 | RESET           (RESET) | 3  4 | (SD_DET)
330
+   * (SD_CS)     PA10   5  6 | PB9             (MOSI)  | 5  6 | (LCD_CS)
331
+   * (LCD_CS)    PB8  | 7  8 | PB7             (SD_CS) | 7  8 | (MOD_RESET)
332
+   *              GND | 9 10 | 5V              (SCK)   | 9 10 | (MISO)
333
    *                   ------                           ------
333
    *                   ------                           ------
334
    *                    EXP1                             EXP1
334
    *                    EXP1                             EXP1
335
    *
335
    *

+ 56
- 56
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h 查看文件

111
 #define TEMP_0_PIN                          PA0   // Analog Input
111
 #define TEMP_0_PIN                          PA0   // Analog Input
112
 
112
 
113
 /**                ------                                    ------
113
 /**                ------                                    ------
114
- *  (BEEPER) PC10 |10  9 | PC11 (BTN_ENC)        (MISO) PB4 |10  9 | PB3   (SCK)
115
- *  (LCD_EN) PB6  | 8  7 | PC12  (LCD_RS)     (BTN_EN1) PD2 | 8  7 | PA15  (SD_SS)
116
- *  (LCD_D4) PC13   6  5 | PB7   (LCD_D5)     (BTN_EN2) PB8   6  5 | PB5   (MOSI)
117
- *  (LCD_D6) PC15 | 4  3 | PC14  (LCD_D7)   (SD_DETECT) PB9 | 4  3 | RESET
118
- *            GND | 2  1 | 5V                           GND | 2  1 | --
114
+ *  (BEEPER) PC10 | 1  2 | PC11 (BTN_ENC)        (MISO) PB4 | 1  2 | PB3   (SCK)
115
+ *  (LCD_EN) PB6  | 3  4 | PC12  (LCD_RS)     (BTN_EN1) PD2 | 3  4 | PA15  (SD_SS)
116
+ *  (LCD_D4) PC13   5  6 | PB7   (LCD_D5)     (BTN_EN2) PB8   5  6 | PB5   (MOSI)
117
+ *  (LCD_D6) PC15 | 7  8 | PC14  (LCD_D7)   (SD_DETECT) PB9 | 7  8 | RESET
118
+ *            GND | 9 10 | 5V                           GND | 9 10 | --
119
  *                 ------                                    ------
119
  *                 ------                                    ------
120
  *                  EXP1                                      EXP2
120
  *                  EXP1                                      EXP2
121
  */
121
  */
122
-#define EXP1_03_PIN                         PC14
123
-#define EXP1_04_PIN                         PC15
124
-#define EXP1_05_PIN                         PB7
125
-#define EXP1_06_PIN                         PC13
126
-#define EXP1_07_PIN                         PC12
127
-#define EXP1_08_PIN                         PB6
128
-#define EXP1_09_PIN                         PC11
129
-#define EXP1_10_PIN                         PC10
130
-
131
-#define EXP2_03_PIN                         -1    // RESET
132
-#define EXP2_04_PIN                         PB9
133
-#define EXP2_05_PIN                         PB5
134
-#define EXP2_06_PIN                         PB8
135
-#define EXP2_07_PIN                         PA15
136
-#define EXP2_08_PIN                         PD2
137
-#define EXP2_09_PIN                         PB3
138
-#define EXP2_10_PIN                         PB4
122
+#define EXP1_08_PIN                         PC14
123
+#define EXP1_07_PIN                         PC15
124
+#define EXP1_06_PIN                         PB7
125
+#define EXP1_05_PIN                         PC13
126
+#define EXP1_04_PIN                         PC12
127
+#define EXP1_03_PIN                         PB6
128
+#define EXP1_02_PIN                         PC11
129
+#define EXP1_01_PIN                         PC10
130
+
131
+#define EXP2_08_PIN                         -1    // RESET
132
+#define EXP2_07_PIN                         PB9
133
+#define EXP2_06_PIN                         PB5
134
+#define EXP2_05_PIN                         PB8
135
+#define EXP2_04_PIN                         PA15
136
+#define EXP2_03_PIN                         PD2
137
+#define EXP2_02_PIN                         PB3
138
+#define EXP2_01_PIN                         PB4
139
 
139
 
140
 //
140
 //
141
 // LCD / Controller
141
 // LCD / Controller
142
 //
142
 //
143
 #if HAS_WIRED_LCD
143
 #if HAS_WIRED_LCD
144
-  #define BEEPER_PIN                 EXP1_10_PIN
145
-  #define BTN_ENC                    EXP1_09_PIN
144
+  #define BEEPER_PIN                 EXP1_01_PIN
145
+  #define BTN_ENC                    EXP1_02_PIN
146
 
146
 
147
   #if ENABLED(CR10_STOCKDISPLAY)
147
   #if ENABLED(CR10_STOCKDISPLAY)
148
-    #define LCD_PINS_RS              EXP1_04_PIN
148
+    #define LCD_PINS_RS              EXP1_07_PIN
149
 
149
 
150
-    #define BTN_EN1                  EXP1_08_PIN
151
-    #define BTN_EN2                  EXP1_06_PIN
150
+    #define BTN_EN1                  EXP1_03_PIN
151
+    #define BTN_EN2                  EXP1_05_PIN
152
 
152
 
153
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
154
-    #define LCD_PINS_D4              EXP1_05_PIN
153
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
154
+    #define LCD_PINS_D4              EXP1_06_PIN
155
 
155
 
156
   #elif IS_TFTGLCD_PANEL
156
   #elif IS_TFTGLCD_PANEL
157
 
157
 
159
     #undef BTN_ENC
159
     #undef BTN_ENC
160
 
160
 
161
     #if ENABLED(TFTGLCD_PANEL_SPI)
161
     #if ENABLED(TFTGLCD_PANEL_SPI)
162
-      #define TFTGLCD_CS             EXP2_08_PIN
162
+      #define TFTGLCD_CS             EXP2_03_PIN
163
     #endif
163
     #endif
164
 
164
 
165
-    #define SD_DETECT_PIN            EXP2_04_PIN
165
+    #define SD_DETECT_PIN            EXP2_07_PIN
166
 
166
 
167
   #else
167
   #else
168
 
168
 
169
-    #define LCD_PINS_RS              EXP1_07_PIN
169
+    #define LCD_PINS_RS              EXP1_04_PIN
170
 
170
 
171
-    #define BTN_EN1                  EXP2_08_PIN
172
-    #define BTN_EN2                  EXP2_06_PIN
171
+    #define BTN_EN1                  EXP2_03_PIN
172
+    #define BTN_EN2                  EXP2_05_PIN
173
 
173
 
174
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
174
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
175
 
175
 
176
     #if ENABLED(FYSETC_MINI_12864)
176
     #if ENABLED(FYSETC_MINI_12864)
177
 
177
 
178
       #define LCD_BACKLIGHT_PIN             -1
178
       #define LCD_BACKLIGHT_PIN             -1
179
-      #define LCD_RESET_PIN          EXP1_06_PIN
180
-      #define DOGLCD_A0              EXP1_07_PIN
181
-      #define DOGLCD_CS              EXP1_08_PIN
182
-      #define DOGLCD_SCK             EXP2_09_PIN
183
-      #define DOGLCD_MOSI            EXP2_05_PIN
179
+      #define LCD_RESET_PIN          EXP1_05_PIN
180
+      #define DOGLCD_A0              EXP1_04_PIN
181
+      #define DOGLCD_CS              EXP1_03_PIN
182
+      #define DOGLCD_SCK             EXP2_02_PIN
183
+      #define DOGLCD_MOSI            EXP2_06_PIN
184
 
184
 
185
       #define FORCE_SOFT_SPI                      // SPI MODE3
185
       #define FORCE_SOFT_SPI                      // SPI MODE3
186
 
186
 
187
-      #define LED_PIN                EXP1_05_PIN   // red pwm
188
-      //#define LED_PIN              EXP1_04_PIN  // green
189
-      //#define LED_PIN              EXP1_03_PIN  // blue
187
+      #define LED_PIN                EXP1_06_PIN   // red pwm
188
+      //#define LED_PIN              EXP1_07_PIN  // green
189
+      //#define LED_PIN              EXP1_08_PIN  // blue
190
 
190
 
191
       //#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
191
       //#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
192
       //  #ifndef RGB_LED_R_PIN
192
       //  #ifndef RGB_LED_R_PIN
193
-      //    #define RGB_LED_R_PIN    EXP1_05_PIN
193
+      //    #define RGB_LED_R_PIN    EXP1_06_PIN
194
       //  #endif
194
       //  #endif
195
       //  #ifndef RGB_LED_G_PIN
195
       //  #ifndef RGB_LED_G_PIN
196
-      //    #define RGB_LED_G_PIN    EXP1_04_PIN
196
+      //    #define RGB_LED_G_PIN    EXP1_07_PIN
197
       //  #endif
197
       //  #endif
198
       //  #ifndef RGB_LED_B_PIN
198
       //  #ifndef RGB_LED_B_PIN
199
-      //    #define RGB_LED_B_PIN    EXP1_03_PIN
199
+      //    #define RGB_LED_B_PIN    EXP1_08_PIN
200
       //  #endif
200
       //  #endif
201
       //#elif ENABLED(FYSETC_MINI_12864_2_1)
201
       //#elif ENABLED(FYSETC_MINI_12864_2_1)
202
-      //  #define NEOPIXEL_PIN       EXP1_05_PIN
202
+      //  #define NEOPIXEL_PIN       EXP1_06_PIN
203
       //#endif
203
       //#endif
204
 
204
 
205
     #else                                         // !FYSETC_MINI_12864
205
     #else                                         // !FYSETC_MINI_12864
206
 
206
 
207
-      #define LCD_PINS_D4            EXP1_06_PIN
207
+      #define LCD_PINS_D4            EXP1_05_PIN
208
       #if IS_ULTIPANEL
208
       #if IS_ULTIPANEL
209
-        #define LCD_PINS_D5          EXP1_05_PIN
210
-        #define LCD_PINS_D6          EXP1_04_PIN
211
-        #define LCD_PINS_D7          EXP1_03_PIN
209
+        #define LCD_PINS_D5          EXP1_06_PIN
210
+        #define LCD_PINS_D6          EXP1_07_PIN
211
+        #define LCD_PINS_D7          EXP1_08_PIN
212
 
212
 
213
         #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
213
         #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
214
           #define BTN_ENC_EN         LCD_PINS_D7  // Detect the presence of the encoder
214
           #define BTN_ENC_EN         LCD_PINS_D7  // Detect the presence of the encoder
241
 
241
 
242
 #if SD_CONNECTION_IS(LCD)
242
 #if SD_CONNECTION_IS(LCD)
243
   #define SPI_DEVICE                           3
243
   #define SPI_DEVICE                           3
244
-  #define SD_DETECT_PIN              EXP2_04_PIN
245
-  #define SD_SCK_PIN                 EXP2_09_PIN
246
-  #define SD_MISO_PIN                EXP2_10_PIN
247
-  #define SD_MOSI_PIN                EXP2_05_PIN
248
-  #define SD_SS_PIN                  EXP2_07_PIN
244
+  #define SD_DETECT_PIN              EXP2_07_PIN
245
+  #define SD_SCK_PIN                 EXP2_02_PIN
246
+  #define SD_MISO_PIN                EXP2_01_PIN
247
+  #define SD_MOSI_PIN                EXP2_06_PIN
248
+  #define SD_SS_PIN                  EXP2_04_PIN
249
 #elif SD_CONNECTION_IS(ONBOARD)
249
 #elif SD_CONNECTION_IS(ONBOARD)
250
   #define SD_DETECT_PIN                     PA3
250
   #define SD_DETECT_PIN                     PA3
251
   #define SD_SCK_PIN                        PA5
251
   #define SD_SCK_PIN                        PA5

+ 21
- 21
Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h 查看文件

123
 
123
 
124
 /**
124
 /**
125
  *       ------
125
  *       ------
126
- *  PB5 |10  9 | PB6
127
- *  PA2 | 8  7 | RESET
128
- *  PA3   6  5 | PB8
129
- *  PB7 | 4  3 | PA4
130
- *  GND | 2  1 | VCC5
126
+ *  PB5 | 1  2 | PB6
127
+ *  PA2 | 3  4 | RESET
128
+ *  PA3   5  6 | PB8
129
+ *  PB7 | 7  8 | PA4
130
+ *  GND | 9 10 | VCC5
131
  *       ------
131
  *       ------
132
  *        EXP1
132
  *        EXP1
133
  */
133
  */
134
-#define EXP1_03_PIN                         PA4
135
-#define EXP1_04_PIN                         PB7
136
-#define EXP1_05_PIN                         PB8
137
-#define EXP1_06_PIN                         PA3
138
-#define EXP1_07_PIN                         -1   // RESET
139
-#define EXP1_08_PIN                         PA2
140
-#define EXP1_09_PIN                         PB6
141
-#define EXP1_10_PIN                         PB5
134
+#define EXP1_08_PIN                         PA4
135
+#define EXP1_07_PIN                         PB7
136
+#define EXP1_06_PIN                         PB8
137
+#define EXP1_05_PIN                         PA3
138
+#define EXP1_04_PIN                         -1   // RESET
139
+#define EXP1_03_PIN                         PA2
140
+#define EXP1_02_PIN                         PB6
141
+#define EXP1_01_PIN                         PB5
142
 
142
 
143
 //
143
 //
144
 // LCD / Controller
144
 // LCD / Controller
145
 //
145
 //
146
 #if ENABLED(CR10_STOCKDISPLAY)
146
 #if ENABLED(CR10_STOCKDISPLAY)
147
-  #define BEEPER_PIN                 EXP1_10_PIN
148
-  #define BTN_EN1                    EXP1_08_PIN
149
-  #define BTN_EN2                    EXP1_06_PIN
150
-  #define BTN_ENC                    EXP1_09_PIN
151
-
152
-  #define LCD_PINS_RS                EXP1_04_PIN  // CS -- SOFT SPI for ENDER3 LCD
153
-  #define LCD_PINS_D4                EXP1_05_PIN  // SCLK
154
-  #define LCD_PINS_ENABLE            EXP1_03_PIN  // DATA MOSI
147
+  #define BEEPER_PIN                 EXP1_01_PIN
148
+  #define BTN_EN1                    EXP1_03_PIN
149
+  #define BTN_EN2                    EXP1_05_PIN
150
+  #define BTN_ENC                    EXP1_02_PIN
151
+
152
+  #define LCD_PINS_RS                EXP1_07_PIN  // CS -- SOFT SPI for ENDER3 LCD
153
+  #define LCD_PINS_D4                EXP1_06_PIN  // SCLK
154
+  #define LCD_PINS_ENABLE            EXP1_08_PIN  // DATA MOSI
155
 #endif
155
 #endif
156
 
156
 
157
 // Alter timing for graphical display
157
 // Alter timing for graphical display

+ 10
- 10
Marlin/src/pins/stm32f1/pins_CREALITY_V4.h 查看文件

168
     /**
168
     /**
169
      *    RET6 12864 LCD
169
      *    RET6 12864 LCD
170
      *        ------
170
      *        ------
171
-     *  PC6  |10  9 | PB2
172
-     *  PB10 | 8  7 | PE8
173
-     *  PB14   6  5 | PB13
174
-     *  PB12 | 4  3 | PB15
175
-     *   GND | 2  1 | 5V
171
+     *  PC6  | 1  2 | PB2
172
+     *  PB10 | 3  4 | PE8
173
+     *  PB14   5  6 | PB13
174
+     *  PB12 | 7  8 | PB15
175
+     *   GND | 9 10 | 5V
176
      *        ------
176
      *        ------
177
      *         EXP1
177
      *         EXP1
178
      */
178
      */
194
     /**
194
     /**
195
      *    VET6 12864 LCD
195
      *    VET6 12864 LCD
196
      *        ------
196
      *        ------
197
-     *  ?    |10  9 | PC5
198
-     *  PB10 | 8  7 | ?
199
-     *  PA6    6  5 | PA5
200
-     *  PA4  | 4  3 | PA7
201
-     *   GND | 2  1 | 5V
197
+     *  ?    | 1  2 | PC5
198
+     *  PB10 | 3  4 | ?
199
+     *  PA6    5  6 | PA5
200
+     *  PA4  | 7  8 | PA7
201
+     *   GND | 9 10 | 5V
202
      *        ------
202
      *        ------
203
      *         EXP1
203
      *         EXP1
204
      */
204
      */

+ 33
- 33
Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h 查看文件

150
     /**
150
     /**
151
      *    RET6 12864 LCD
151
      *    RET6 12864 LCD
152
      *        ------
152
      *        ------
153
-     *  PC6  |10  9 | PB2
154
-     *  PB10 | 8  7 | PE8
155
-     *  PB14   6  5 | PB13
156
-     *  PB12 | 4  3 | PB15
157
-     *   GND | 2  1 | 5V
153
+     *  PC6  | 1  2 | PB2
154
+     *  PB10 | 3  4 | PE8
155
+     *  PB14   5  6 | PB13
156
+     *  PB12 | 7  8 | PB15
157
+     *   GND | 9 10 | 5V
158
      *        ------
158
      *        ------
159
      *         EXP1
159
      *         EXP1
160
      */
160
      */
161
-    #define EXP1_03_PIN                     PB15
162
-    #define EXP1_04_PIN                     PB12
163
-    #define EXP1_05_PIN                     PB13
164
-    #define EXP1_06_PIN                     PB14
165
-    #define EXP1_07_PIN                     PE8
166
-    #define EXP1_08_PIN                     PB10
167
-    #define EXP1_09_PIN                     PB2
168
-    #define EXP1_10_PIN                     PC6
161
+    #define EXP1_08_PIN                     PB15
162
+    #define EXP1_07_PIN                     PB12
163
+    #define EXP1_06_PIN                     PB13
164
+    #define EXP1_05_PIN                     PB14
165
+    #define EXP1_04_PIN                     PE8
166
+    #define EXP1_03_PIN                     PB10
167
+    #define EXP1_02_PIN                     PB2
168
+    #define EXP1_01_PIN                     PC6
169
 
169
 
170
-    #define BEEPER_PIN               EXP1_10_PIN
170
+    #define BEEPER_PIN               EXP1_01_PIN
171
 
171
 
172
   #elif ENABLED(VET6_12864_LCD)
172
   #elif ENABLED(VET6_12864_LCD)
173
 
173
 
174
     /**
174
     /**
175
      *    VET6 12864 LCD
175
      *    VET6 12864 LCD
176
      *        ------
176
      *        ------
177
-     *  ?    |10  9 | PC5
178
-     *  PB10 | 8  7 | ?
179
-     *  PA6    6  5 | PA5
180
-     *  PA4  | 4  3 | PA7
181
-     *   GND | 2  1 | 5V
177
+     *  ?    | 1  2 | PC5
178
+     *  PB10 | 3  4 | ?
179
+     *  PA6    5  6 | PA5
180
+     *  PA4  | 7  8 | PA7
181
+     *   GND | 9 10 | 5V
182
      *        ------
182
      *        ------
183
      *         EXP1
183
      *         EXP1
184
      */
184
      */
185
-    #define EXP1_03_PIN                     PA7
186
-    #define EXP1_04_PIN                     PA4
187
-    #define EXP1_05_PIN                     PA5
188
-    #define EXP1_06_PIN                     PA6
189
-    #define EXP1_07_PIN                     -1
190
-    #define EXP1_08_PIN                     PB10
191
-    #define EXP1_09_PIN                     PC5
192
-    #define EXP1_10_PIN                     -1
185
+    #define EXP1_08_PIN                     PA7
186
+    #define EXP1_07_PIN                     PA4
187
+    #define EXP1_06_PIN                     PA5
188
+    #define EXP1_05_PIN                     PA6
189
+    #define EXP1_04_PIN                     -1
190
+    #define EXP1_03_PIN                     PB10
191
+    #define EXP1_02_PIN                     PC5
192
+    #define EXP1_01_PIN                     -1
193
 
193
 
194
   #else
194
   #else
195
     #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
195
     #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
196
   #endif
196
   #endif
197
 
197
 
198
-  #define LCD_PINS_RS                EXP1_04_PIN
199
-  #define LCD_PINS_ENABLE            EXP1_03_PIN
200
-  #define LCD_PINS_D4                EXP1_05_PIN
198
+  #define LCD_PINS_RS                EXP1_07_PIN
199
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
200
+  #define LCD_PINS_D4                EXP1_06_PIN
201
 
201
 
202
-  #define BTN_ENC                    EXP1_09_PIN
203
-  #define BTN_EN1                    EXP1_08_PIN
204
-  #define BTN_EN2                    EXP1_06_PIN
202
+  #define BTN_ENC                    EXP1_02_PIN
203
+  #define BTN_EN1                    EXP1_03_PIN
204
+  #define BTN_EN2                    EXP1_05_PIN
205
 
205
 
206
 #elif HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
206
 #elif HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
207
 
207
 

+ 40
- 40
Marlin/src/pins/stm32f1/pins_FLY_MINI.h 查看文件

85
 
85
 
86
 #if ENABLED(TMC_USE_SW_SPI)
86
 #if ENABLED(TMC_USE_SW_SPI)
87
   #ifndef TMC_SW_MOSI
87
   #ifndef TMC_SW_MOSI
88
-    #define TMC_SW_MOSI              EXP2_05_PIN
88
+    #define TMC_SW_MOSI              EXP2_06_PIN
89
   #endif
89
   #endif
90
   #ifndef TMC_SW_MISO
90
   #ifndef TMC_SW_MISO
91
-    #define TMC_SW_MISO              EXP2_10_PIN
91
+    #define TMC_SW_MISO              EXP2_01_PIN
92
   #endif
92
   #endif
93
   #ifndef TMC_SW_SCK
93
   #ifndef TMC_SW_SCK
94
-    #define TMC_SW_SCK               EXP2_09_PIN
94
+    #define TMC_SW_SCK               EXP2_02_PIN
95
   #endif
95
   #endif
96
 #endif
96
 #endif
97
 
97
 
123
 #define TEMP_0_PIN                          PC1   // Analog Input
123
 #define TEMP_0_PIN                          PC1   // Analog Input
124
 
124
 
125
 /**               ------                                        ------
125
 /**               ------                                        ------
126
- * (BEEPER) PC14 |10  9 | PC13 (BTN_ENC)      (MISO)      PB14 |10  9 | PB13 (SD_SCK)
127
- * (LCD_EN) PB9  | 8  7 | PB8  (LCD_RS)       (BTN_EN1)   PB3  | 8  7 | PB12 (SD_CS2)
128
- * (LCD_D4) PB7    6  5 | PB6  (LCD_D5)       (BTN_EN2)   PD2    6  5 | PB15 (SD_MOSI)
129
- * (LCD_D6) PB5  | 4  3 | PB4  (LCD_D7)       (SD_DETECT) PB11 | 4  3 | RESET
130
- *           GND | 2  1 | 5V                               GND | 2  1 | --
126
+ * (BEEPER) PC14 | 1  2 | PC13 (BTN_ENC)      (MISO)      PB14 | 1  2 | PB13 (SD_SCK)
127
+ * (LCD_EN) PB9  | 3  4 | PB8  (LCD_RS)       (BTN_EN1)   PB3  | 3  4 | PB12 (SD_CS2)
128
+ * (LCD_D4) PB7    5  6 | PB6  (LCD_D5)       (BTN_EN2)   PD2    5  6 | PB15 (SD_MOSI)
129
+ * (LCD_D6) PB5  | 7  8 | PB4  (LCD_D7)       (SD_DETECT) PB11 | 7  8 | RESET
130
+ *           GND | 9 10 | 5V                               GND | 9 10 | --
131
  *                ------                                        ------
131
  *                ------                                        ------
132
  *                 EXP1                                          EXP2
132
  *                 EXP1                                          EXP2
133
  */
133
  */
134
-#define EXP1_03_PIN                        PB4
135
-#define EXP1_04_PIN                        PB5
136
-#define EXP1_05_PIN                        PB6
137
-#define EXP1_06_PIN                        PB7
138
-#define EXP1_07_PIN                        PB8
139
-#define EXP1_08_PIN                        PB9
140
-#define EXP1_09_PIN                        PC13
141
-#define EXP1_10_PIN                        PC14
142
-
143
-#define EXP2_03_PIN                        -1     // RESET
144
-#define EXP2_04_PIN                        PB11
145
-#define EXP2_05_PIN                        PB15
146
-#define EXP2_06_PIN                        PD2
147
-#define EXP2_07_PIN                        PB12
148
-#define EXP2_08_PIN                        PB3
149
-#define EXP2_09_PIN                        PB13
150
-#define EXP2_10_PIN                        PB14
134
+#define EXP1_08_PIN                        PB4
135
+#define EXP1_07_PIN                        PB5
136
+#define EXP1_06_PIN                        PB6
137
+#define EXP1_05_PIN                        PB7
138
+#define EXP1_04_PIN                        PB8
139
+#define EXP1_03_PIN                        PB9
140
+#define EXP1_02_PIN                        PC13
141
+#define EXP1_01_PIN                        PC14
142
+
143
+#define EXP2_08_PIN                        -1     // RESET
144
+#define EXP2_07_PIN                        PB11
145
+#define EXP2_06_PIN                        PB15
146
+#define EXP2_05_PIN                        PD2
147
+#define EXP2_04_PIN                        PB12
148
+#define EXP2_03_PIN                        PB3
149
+#define EXP2_02_PIN                        PB13
150
+#define EXP2_01_PIN                        PB14
151
 
151
 
152
 //
152
 //
153
 // LCD / Controller
153
 // LCD / Controller
155
 #if HAS_WIRED_LCD
155
 #if HAS_WIRED_LCD
156
 
156
 
157
   #define SPI_DEVICE                           2
157
   #define SPI_DEVICE                           2
158
-  #define SD_SS_PIN                  EXP2_07_PIN
159
-  #define SD_SCK_PIN                 EXP2_09_PIN
160
-  #define SD_MISO_PIN                EXP2_10_PIN
161
-  #define SD_MOSI_PIN                EXP2_05_PIN
158
+  #define SD_SS_PIN                  EXP2_04_PIN
159
+  #define SD_SCK_PIN                 EXP2_02_PIN
160
+  #define SD_MISO_PIN                EXP2_01_PIN
161
+  #define SD_MOSI_PIN                EXP2_06_PIN
162
 
162
 
163
   #define SDSS                         SD_SS_PIN
163
   #define SDSS                         SD_SS_PIN
164
-  #define SD_DETECT_PIN              EXP2_04_PIN
164
+  #define SD_DETECT_PIN              EXP2_07_PIN
165
 
165
 
166
-  #define BEEPER_PIN                 EXP1_10_PIN
166
+  #define BEEPER_PIN                 EXP1_01_PIN
167
 
167
 
168
-  #define LCD_PINS_RS                EXP1_07_PIN
169
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
170
-  #define LCD_PINS_D4                EXP1_06_PIN
171
-  #define LCD_PINS_D5                EXP1_05_PIN
172
-  #define LCD_PINS_D6                EXP1_04_PIN
173
-  #define LCD_PINS_D7                EXP1_03_PIN
168
+  #define LCD_PINS_RS                EXP1_04_PIN
169
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
170
+  #define LCD_PINS_D4                EXP1_05_PIN
171
+  #define LCD_PINS_D5                EXP1_06_PIN
172
+  #define LCD_PINS_D6                EXP1_07_PIN
173
+  #define LCD_PINS_D7                EXP1_08_PIN
174
 
174
 
175
-  #define BTN_EN1                    EXP2_06_PIN
176
-  #define BTN_EN2                    EXP2_08_PIN
177
-  #define BTN_ENC                    EXP1_09_PIN
175
+  #define BTN_EN1                    EXP2_05_PIN
176
+  #define BTN_EN2                    EXP2_03_PIN
177
+  #define BTN_ENC                    EXP1_02_PIN
178
 
178
 
179
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
179
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
180
     #define BTN_ENC_EN               LCD_PINS_D7  // Detect the presence of the encoder
180
     #define BTN_ENC_EN               LCD_PINS_D7  // Detect the presence of the encoder

+ 30
- 30
Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h 查看文件

133
 /**
133
 /**
134
  * EXP1 pinout for the LCD according to FYSETC's Cheetah board schematic
134
  * EXP1 pinout for the LCD according to FYSETC's Cheetah board schematic
135
  *                 ------
135
  *                 ------
136
- * (BEEPER)  PC9  |10  9 | PC12 (BTN_ENC)
137
- * (BTN_EN2) PC11 | 8  7 | PB14 (LCD_RS / MISO)
138
- * (BTN_EN1) PC10   6  5 | PB13 (SCK)
139
- * (LCD_EN)  PB12 | 4  3 | PB15 (MOSI)
140
- *            GND | 2  1 | 5V
136
+ * (BEEPER)  PC9  | 1  2 | PC12 (BTN_ENC)
137
+ * (BTN_EN2) PC11 | 3  4 | PB14 (LCD_RS / MISO)
138
+ * (BTN_EN1) PC10   5  6 | PB13 (SCK)
139
+ * (LCD_EN)  PB12 | 7  8 | PB15 (MOSI)
140
+ *            GND | 9 10 | 5V
141
  *                 ------
141
  *                 ------
142
  *                  EXP1
142
  *                  EXP1
143
  *
143
  *
146
  *  - Functionally the pins are assigned in the same order as on the Ender-3 board.
146
  *  - Functionally the pins are assigned in the same order as on the Ender-3 board.
147
  *  - Pin 4 on the Cheetah board is assigned to an I/O, it is assigned to RESET on the Ender-3 board.
147
  *  - Pin 4 on the Cheetah board is assigned to an I/O, it is assigned to RESET on the Ender-3 board.
148
  */
148
  */
149
-#define EXP1_03_PIN                         PB15
150
-#define EXP1_04_PIN                         PB12
151
-#define EXP1_05_PIN                         PB13
152
-#define EXP1_06_PIN                         PC10
153
-#define EXP1_07_PIN                         PB14
154
-#define EXP1_08_PIN                         PC11
155
-#define EXP1_09_PIN                         PC12
156
-#define EXP1_10_PIN                         PC9
149
+#define EXP1_08_PIN                         PB15
150
+#define EXP1_07_PIN                         PB12
151
+#define EXP1_06_PIN                         PB13
152
+#define EXP1_05_PIN                         PC10
153
+#define EXP1_04_PIN                         PB14
154
+#define EXP1_03_PIN                         PC11
155
+#define EXP1_02_PIN                         PC12
156
+#define EXP1_01_PIN                         PC9
157
 
157
 
158
 #if HAS_WIRED_LCD
158
 #if HAS_WIRED_LCD
159
-  #define BEEPER_PIN                 EXP1_10_PIN
159
+  #define BEEPER_PIN                 EXP1_01_PIN
160
 
160
 
161
   #if HAS_MARLINUI_U8GLIB
161
   #if HAS_MARLINUI_U8GLIB
162
-    #define DOGLCD_A0                EXP1_07_PIN
163
-    #define DOGLCD_CS                EXP1_04_PIN
164
-    #define DOGLCD_SCK               EXP1_05_PIN
165
-    #define DOGLCD_MOSI              EXP1_03_PIN
162
+    #define DOGLCD_A0                EXP1_04_PIN
163
+    #define DOGLCD_CS                EXP1_07_PIN
164
+    #define DOGLCD_SCK               EXP1_06_PIN
165
+    #define DOGLCD_MOSI              EXP1_08_PIN
166
 
166
 
167
     #if EITHER(FYSETC_MINI_12864, U8GLIB_ST7920)
167
     #if EITHER(FYSETC_MINI_12864, U8GLIB_ST7920)
168
       #define FORCE_SOFT_SPI
168
       #define FORCE_SOFT_SPI
170
     //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
170
     //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
171
   #endif
171
   #endif
172
 
172
 
173
-  #define LCD_PINS_RS                EXP1_04_PIN  // CS -- SOFT SPI for ENDER3 LCD
174
-  #define LCD_PINS_D4                EXP1_05_PIN  // SCLK
175
-  #define LCD_PINS_ENABLE            EXP1_03_PIN  // DATA MOSI
173
+  #define LCD_PINS_RS                EXP1_07_PIN  // CS -- SOFT SPI for ENDER3 LCD
174
+  #define LCD_PINS_D4                EXP1_06_PIN  // SCLK
175
+  #define LCD_PINS_ENABLE            EXP1_08_PIN  // DATA MOSI
176
 
176
 
177
   //#define LCD_CONTRAST_INIT                190
177
   //#define LCD_CONTRAST_INIT                190
178
 
178
 
179
   #if IS_NEWPANEL
179
   #if IS_NEWPANEL
180
-    #define BTN_EN1                  EXP1_06_PIN
181
-    #define BTN_EN2                  EXP1_08_PIN
182
-    #define BTN_ENC                  EXP1_09_PIN
180
+    #define BTN_EN1                  EXP1_05_PIN
181
+    #define BTN_EN2                  EXP1_03_PIN
182
+    #define BTN_ENC                  EXP1_02_PIN
183
   #endif
183
   #endif
184
 #endif
184
 #endif
185
 
185
 
186
 #if ENABLED(TOUCH_UI_FTDI_EVE)
186
 #if ENABLED(TOUCH_UI_FTDI_EVE)
187
-  #define BEEPER_PIN                 EXP1_10_PIN
188
-  #define CLCD_MOD_RESET             EXP1_08_PIN
189
-  #define CLCD_SPI_CS                EXP1_04_PIN
187
+  #define BEEPER_PIN                 EXP1_01_PIN
188
+  #define CLCD_MOD_RESET             EXP1_03_PIN
189
+  #define CLCD_SPI_CS                EXP1_07_PIN
190
 
190
 
191
   //#define CLCD_USE_SOFT_SPI                     // the Cheetah can use hardware-SPI so we do not really need this
191
   //#define CLCD_USE_SOFT_SPI                     // the Cheetah can use hardware-SPI so we do not really need this
192
 
192
 
193
   #if ENABLED(CLCD_USE_SOFT_SPI)
193
   #if ENABLED(CLCD_USE_SOFT_SPI)
194
-    #define CLCD_SOFT_SPI_MOSI       EXP1_03_PIN
195
-    #define CLCD_SOFT_SPI_MISO       EXP1_07_PIN
196
-    #define CLCD_SOFT_SPI_SCLK       EXP1_05_PIN
194
+    #define CLCD_SOFT_SPI_MOSI       EXP1_08_PIN
195
+    #define CLCD_SOFT_SPI_MISO       EXP1_04_PIN
196
+    #define CLCD_SOFT_SPI_SCLK       EXP1_06_PIN
197
   #else
197
   #else
198
     #define CLCD_SPI_BUS                       2
198
     #define CLCD_SPI_BUS                       2
199
   #endif
199
   #endif

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

207
 
207
 
208
 /**
208
 /**
209
  *        ------                  ------
209
  *        ------                  ------
210
- *  PC5  |10  9 | PE13       PA6 |10  9 | PA5
211
- *  PD13 | 8  7 | PC6        PE8 | 8  7 | PE10
212
- *  PE14 | 6  5   PE15      PE11 | 6  5   PA7
213
- *  PD11 | 4  3 | PD10      PE12 | 4  3 | RESET
214
- *   GND | 2  1 | 5V         GND | 2  1 | 3.3V
210
+ *  PC5  | 1  2 | PE13       PA6 | 1  2 | PA5
211
+ *  PD13 | 3  4 | PC6        PE8 | 3  4 | PE10
212
+ *  PE14 | 5  6   PE15      PE11 | 5  6   PA7
213
+ *  PD11 | 7  8 | PD10      PE12 | 7  8 | RESET
214
+ *   GND | 9 10 | 5V         GND | 9 10 | 3.3V
215
  *        ------                  ------
215
  *        ------                  ------
216
  *         EXP1                    EXP2
216
  *         EXP1                    EXP2
217
  */
217
  */
218
-#define EXP1_03_PIN                         PD10
219
-#define EXP1_04_PIN                         PD11
220
-#define EXP1_05_PIN                         PE15
221
-#define EXP1_06_PIN                         PE14
222
-#define EXP1_07_PIN                         PC6
223
-#define EXP1_08_PIN                         PD13
224
-#define EXP1_09_PIN                         PE13
225
-#define EXP1_10_PIN                         PC5
226
-
227
-#define EXP2_03_PIN                         -1
228
-#define EXP2_04_PIN                         PE12
229
-#define EXP2_05_PIN                         PA7
230
-#define EXP2_06_PIN                         PE11
231
-#define EXP2_07_PIN                         PE10
232
-#define EXP2_08_PIN                         PE8
233
-#define EXP2_09_PIN                         PA5
234
-#define EXP2_10_PIN                         PA6
218
+#define EXP1_08_PIN                         PD10
219
+#define EXP1_07_PIN                         PD11
220
+#define EXP1_06_PIN                         PE15
221
+#define EXP1_05_PIN                         PE14
222
+#define EXP1_04_PIN                         PC6
223
+#define EXP1_03_PIN                         PD13
224
+#define EXP1_02_PIN                         PE13
225
+#define EXP1_01_PIN                         PC5
226
+
227
+#define EXP2_08_PIN                         -1
228
+#define EXP2_07_PIN                         PE12
229
+#define EXP2_06_PIN                         PA7
230
+#define EXP2_05_PIN                         PE11
231
+#define EXP2_04_PIN                         PE10
232
+#define EXP2_03_PIN                         PE8
233
+#define EXP2_02_PIN                         PA5
234
+#define EXP2_01_PIN                         PA6
235
 
235
 
236
 //
236
 //
237
 // SD Card
237
 // SD Card
247
   #define ONBOARD_SD_CS_PIN                 PC11
247
   #define ONBOARD_SD_CS_PIN                 PC11
248
 #elif SD_CONNECTION_IS(LCD)
248
 #elif SD_CONNECTION_IS(LCD)
249
   #define ENABLE_SPI1
249
   #define ENABLE_SPI1
250
-  #define SDSS                       EXP2_07_PIN
251
-  #define SD_SCK_PIN                 EXP2_09_PIN
252
-  #define SD_MISO_PIN                EXP2_10_PIN
253
-  #define SD_MOSI_PIN                EXP2_05_PIN
254
-  #define SD_DETECT_PIN              EXP2_04_PIN
250
+  #define SDSS                       EXP2_04_PIN
251
+  #define SD_SCK_PIN                 EXP2_02_PIN
252
+  #define SD_MISO_PIN                EXP2_01_PIN
253
+  #define SD_MOSI_PIN                EXP2_06_PIN
254
+  #define SD_DETECT_PIN              EXP2_07_PIN
255
 #endif
255
 #endif
256
 
256
 
257
 //
257
 //
268
 
268
 
269
   // Shared SPI TFT
269
   // Shared SPI TFT
270
 
270
 
271
-  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
271
+  #define LCD_BACKLIGHT_PIN          EXP1_03_PIN
272
 
272
 
273
-  #define TOUCH_CS_PIN               EXP1_06_PIN  // SPI1_NSS
274
-  #define TOUCH_SCK_PIN              EXP2_09_PIN  // SPI1_SCK
275
-  #define TOUCH_MISO_PIN             EXP2_10_PIN  // SPI1_MISO
276
-  #define TOUCH_MOSI_PIN             EXP2_05_PIN  // SPI1_MOSI
273
+  #define TOUCH_CS_PIN               EXP1_05_PIN  // SPI1_NSS
274
+  #define TOUCH_SCK_PIN              EXP2_02_PIN  // SPI1_SCK
275
+  #define TOUCH_MISO_PIN             EXP2_01_PIN  // SPI1_MISO
276
+  #define TOUCH_MOSI_PIN             EXP2_06_PIN  // SPI1_MOSI
277
 
277
 
278
-  #define BTN_EN1                    EXP2_08_PIN
279
-  #define BTN_EN2                    EXP2_06_PIN
280
-  #define BTN_ENC                    EXP1_09_PIN
278
+  #define BTN_EN1                    EXP2_03_PIN
279
+  #define BTN_EN2                    EXP2_05_PIN
280
+  #define BTN_ENC                    EXP1_02_PIN
281
 
281
 
282
-  #define TFT_CS_PIN                 EXP1_04_PIN
283
-  #define TFT_SCK_PIN                EXP2_09_PIN
284
-  #define TFT_MISO_PIN               EXP2_10_PIN
285
-  #define TFT_MOSI_PIN               EXP2_05_PIN
286
-  #define TFT_DC_PIN                 EXP1_03_PIN
282
+  #define TFT_CS_PIN                 EXP1_07_PIN
283
+  #define TFT_SCK_PIN                EXP2_02_PIN
284
+  #define TFT_MISO_PIN               EXP2_01_PIN
285
+  #define TFT_MOSI_PIN               EXP2_06_PIN
286
+  #define TFT_DC_PIN                 EXP1_08_PIN
287
   #define TFT_A0_PIN                  TFT_DC_PIN
287
   #define TFT_A0_PIN                  TFT_DC_PIN
288
 
288
 
289
-  #define TFT_RESET_PIN              EXP1_07_PIN
289
+  #define TFT_RESET_PIN              EXP1_04_PIN
290
   #define TFT_BACKLIGHT_PIN    LCD_BACKLIGHT_PIN
290
   #define TFT_BACKLIGHT_PIN    LCD_BACKLIGHT_PIN
291
 
291
 
292
   #define TOUCH_BUTTONS_HW_SPI
292
   #define TOUCH_BUTTONS_HW_SPI
298
 
298
 
299
 #if ENABLED(TFT_CLASSIC_UI)
299
 #if ENABLED(TFT_CLASSIC_UI)
300
   // Emulated DOGM SPI
300
   // Emulated DOGM SPI
301
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
302
-  #define LCD_PINS_RS                EXP1_07_PIN
303
-  #define BTN_ENC                    EXP1_09_PIN
304
-  #define BTN_EN1                    EXP2_08_PIN
305
-  #define BTN_EN2                    EXP2_06_PIN
301
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
302
+  #define LCD_PINS_RS                EXP1_04_PIN
303
+  #define BTN_ENC                    EXP1_02_PIN
304
+  #define BTN_EN1                    EXP2_03_PIN
305
+  #define BTN_EN2                    EXP2_05_PIN
306
 #elif ENABLED(TFT_COLOR_UI)
306
 #elif ENABLED(TFT_COLOR_UI)
307
   #define TFT_BUFFER_SIZE                  14400
307
   #define TFT_BUFFER_SIZE                  14400
308
 #endif
308
 #endif
309
 
309
 
310
 #if HAS_WIRED_LCD && !HAS_SPI_TFT
310
 #if HAS_WIRED_LCD && !HAS_SPI_TFT
311
-  #define BEEPER_PIN                 EXP1_10_PIN
312
-  #define BTN_ENC                    EXP1_09_PIN
313
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
314
-  #define LCD_PINS_RS                EXP1_07_PIN
315
-  #define BTN_EN1                    EXP2_08_PIN
316
-  #define BTN_EN2                    EXP2_06_PIN
311
+  #define BEEPER_PIN                 EXP1_01_PIN
312
+  #define BTN_ENC                    EXP1_02_PIN
313
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
314
+  #define LCD_PINS_RS                EXP1_04_PIN
315
+  #define BTN_EN1                    EXP2_03_PIN
316
+  #define BTN_EN2                    EXP2_05_PIN
317
   #define LCD_BACKLIGHT_PIN                 -1
317
   #define LCD_BACKLIGHT_PIN                 -1
318
 
318
 
319
   #if ENABLED(MKS_MINI_12864)
319
   #if ENABLED(MKS_MINI_12864)
323
 
323
 
324
     #define LCD_BACKLIGHT_PIN               -1
324
     #define LCD_BACKLIGHT_PIN               -1
325
     #define LCD_RESET_PIN                   -1
325
     #define LCD_RESET_PIN                   -1
326
-    #define DOGLCD_A0                EXP1_04_PIN
327
-    #define DOGLCD_CS                EXP1_05_PIN
328
-    #define DOGLCD_SCK               EXP2_09_PIN
329
-    #define DOGLCD_MOSI              EXP2_05_PIN
326
+    #define DOGLCD_A0                EXP1_07_PIN
327
+    #define DOGLCD_CS                EXP1_06_PIN
328
+    #define DOGLCD_SCK               EXP2_02_PIN
329
+    #define DOGLCD_MOSI              EXP2_06_PIN
330
 
330
 
331
   #elif IS_TFTGLCD_PANEL
331
   #elif IS_TFTGLCD_PANEL
332
 
332
 
333
     #if ENABLED(TFTGLCD_PANEL_SPI)
333
     #if ENABLED(TFTGLCD_PANEL_SPI)
334
-      #define PIN_SPI_SCK            EXP2_09_PIN
335
-      #define PIN_TFT_MISO           EXP2_10_PIN
336
-      #define PIN_TFT_MOSI           EXP2_05_PIN
337
-      #define TFTGLCD_CS             EXP2_08_PIN
334
+      #define PIN_SPI_SCK            EXP2_02_PIN
335
+      #define PIN_TFT_MISO           EXP2_01_PIN
336
+      #define PIN_TFT_MOSI           EXP2_06_PIN
337
+      #define TFTGLCD_CS             EXP2_03_PIN
338
     #endif
338
     #endif
339
 
339
 
340
     #ifndef BEEPER_PIN
340
     #ifndef BEEPER_PIN
342
     #endif
342
     #endif
343
 
343
 
344
   #elif ENABLED(FYSETC_MINI_12864_2_1)
344
   #elif ENABLED(FYSETC_MINI_12864_2_1)
345
-    #define LCD_PINS_DC              EXP1_07_PIN
346
-    #define DOGLCD_CS                EXP1_08_PIN
345
+    #define LCD_PINS_DC              EXP1_04_PIN
346
+    #define DOGLCD_CS                EXP1_03_PIN
347
     #define DOGLCD_A0                  DOGLCD_A0
347
     #define DOGLCD_A0                  DOGLCD_A0
348
     #define LCD_BACKLIGHT_PIN               -1
348
     #define LCD_BACKLIGHT_PIN               -1
349
-    #define LCD_RESET_PIN            EXP1_06_PIN
350
-    #define NEOPIXEL_PIN             EXP1_05_PIN
351
-    #define DOGLCD_MOSI              EXP2_05_PIN
352
-    #define DOGLCD_SCK               EXP2_09_PIN
349
+    #define LCD_RESET_PIN            EXP1_05_PIN
350
+    #define NEOPIXEL_PIN             EXP1_06_PIN
351
+    #define DOGLCD_MOSI              EXP2_06_PIN
352
+    #define DOGLCD_SCK               EXP2_02_PIN
353
     #if SD_CONNECTION_IS(ONBOARD)
353
     #if SD_CONNECTION_IS(ONBOARD)
354
       #define FORCE_SOFT_SPI
354
       #define FORCE_SOFT_SPI
355
     #endif
355
     #endif
357
 
357
 
358
   #else                                           // !MKS_MINI_12864
358
   #else                                           // !MKS_MINI_12864
359
 
359
 
360
-    #define LCD_PINS_D4              EXP1_06_PIN
360
+    #define LCD_PINS_D4              EXP1_05_PIN
361
     #if IS_ULTIPANEL
361
     #if IS_ULTIPANEL
362
-      #define LCD_PINS_D5            EXP1_05_PIN
363
-      #define LCD_PINS_D6            EXP1_04_PIN
364
-      #define LCD_PINS_D7            EXP1_03_PIN
362
+      #define LCD_PINS_D5            EXP1_06_PIN
363
+      #define LCD_PINS_D6            EXP1_07_PIN
364
+      #define LCD_PINS_D7            EXP1_08_PIN
365
 
365
 
366
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
366
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
367
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
367
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
387
 #endif
387
 #endif
388
 
388
 
389
 #ifndef BEEPER_PIN
389
 #ifndef BEEPER_PIN
390
-  #define BEEPER_PIN                 EXP1_10_PIN
390
+  #define BEEPER_PIN                 EXP1_01_PIN
391
 #endif
391
 #endif
392
 
392
 
393
 #if ENABLED(SPEAKER) && BEEPER_PIN == PC5
393
 #if ENABLED(SPEAKER) && BEEPER_PIN == PC5

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

141
 
141
 
142
 /**
142
 /**
143
  *                ------                                    ------                                  ------
143
  *                ------                                    ------                                  ------
144
- *  (BEEPER) PC1 |10  9 | PC3 (BTN_ENC)        (MISO) PB14 |10  9 | PB13 (SD_SCK)    (BEEPER) PC1  |10  9 | PC3 (BTN_ENC)
145
- *  (LCD_EN) PA4 | 8  7 | PA5 (LCD_RS)      (BTN_EN1) PB11 | 8  7 | PA15 (SD_SS)    (BTN_EN1) PB11 | 8  7 | RESET
146
- *  (LCD_D4) PA6   6  5 | PA7 (LCD_D5)      (BTN_EN2)  PB0   6  5 | PB15 (SD_MOSI)  (BTN_EN2) PB0    6  5 | PA6  (LCD_D4)
147
- *  (LCD_D6) PC4 | 4  3 | PC5 (LCD_D7)    (SD_DETECT) PC10 | 4  3 | RESET            (LCD_RS) PA5  | 4  3 | PA4  (LCD_EN)
148
- *           GND | 2  1 | 5V                           GND | 2  1 | --                         GND | 2  1 | 5V
144
+ *  (BEEPER) PC1 | 1  2 | PC3 (BTN_ENC)        (MISO) PB14 | 1  2 | PB13 (SD_SCK)    (BEEPER) PC1  | 1  2 | PC3 (BTN_ENC)
145
+ *  (LCD_EN) PA4 | 3  4 | PA5 (LCD_RS)      (BTN_EN1) PB11 | 3  4 | PA15 (SD_SS)    (BTN_EN1) PB11 | 3  4 | RESET
146
+ *  (LCD_D4) PA6   5  6 | PA7 (LCD_D5)      (BTN_EN2)  PB0   5  6 | PB15 (SD_MOSI)  (BTN_EN2) PB0    5  6 | PA6  (LCD_D4)
147
+ *  (LCD_D6) PC4 | 7  8 | PC5 (LCD_D7)    (SD_DETECT) PC10 | 7  8 | RESET            (LCD_RS) PA5  | 7  8 | PA4  (LCD_EN)
148
+ *           GND | 9 10 | 5V                           GND | 9 10 | --                         GND | 9 10 | 5V
149
  *                ------                                    ------                                  ------
149
  *                ------                                    ------                                  ------
150
  *                 EXP1                                      EXP2                                "Ender-3 EXP1"
150
  *                 EXP1                                      EXP2                                "Ender-3 EXP1"
151
  */
151
  */
152
-#define EXP1_03_PIN                         PC5
153
-#define EXP1_04_PIN                         PC4
154
-#define EXP1_05_PIN                         PA7
155
-#define EXP1_06_PIN                         PA6
156
-#define EXP1_07_PIN                         PA5
157
-#define EXP1_08_PIN                         PA4
158
-#define EXP1_09_PIN                         PC3
159
-#define EXP1_10_PIN                         PC1
160
-
161
-#define EXP2_03_PIN                         -1   // RESET
162
-#define EXP2_04_PIN                         PC10
163
-#define EXP2_05_PIN                         PB15
164
-#define EXP2_06_PIN                         PB0
165
-#define EXP2_07_PIN                         PA15
166
-#define EXP2_08_PIN                         PB11
167
-#define EXP2_09_PIN                         PB13
168
-#define EXP2_10_PIN                         PB14
152
+#define EXP1_08_PIN                         PC5
153
+#define EXP1_07_PIN                         PC4
154
+#define EXP1_06_PIN                         PA7
155
+#define EXP1_05_PIN                         PA6
156
+#define EXP1_04_PIN                         PA5
157
+#define EXP1_03_PIN                         PA4
158
+#define EXP1_02_PIN                         PC3
159
+#define EXP1_01_PIN                         PC1
160
+
161
+#define EXP2_08_PIN                         -1   // RESET
162
+#define EXP2_07_PIN                         PC10
163
+#define EXP2_06_PIN                         PB15
164
+#define EXP2_05_PIN                         PB0
165
+#define EXP2_04_PIN                         PA15
166
+#define EXP2_03_PIN                         PB11
167
+#define EXP2_02_PIN                         PB13
168
+#define EXP2_01_PIN                         PB14
169
 
169
 
170
 // "Ender-3 EXP1"
170
 // "Ender-3 EXP1"
171
-#define E3_EXP1_03_PIN                      PA4
172
-#define E3_EXP1_04_PIN                      PA5
173
-#define E3_EXP1_05_PIN                      PA6
174
-#define E3_EXP1_06_PIN                      PB0
175
-#define E3_EXP1_07_PIN                      -1   // RESET
176
-#define E3_EXP1_08_PIN                      PB11
177
-#define E3_EXP1_09_PIN                      PC3
178
-#define E3_EXP1_10_PIN                      PC1
171
+#define EXP3_08_PIN                         PA4
172
+#define EXP3_07_PIN                         PA5
173
+#define EXP3_06_PIN                         PA6
174
+#define EXP3_05_PIN                         PB0
175
+#define EXP3_04_PIN                         -1   // RESET
176
+#define EXP3_03_PIN                         PB11
177
+#define EXP3_02_PIN                         PC3
178
+#define EXP3_01_PIN                         PC1
179
 
179
 
180
 #if HAS_WIRED_LCD
180
 #if HAS_WIRED_LCD
181
 
181
 
182
-  #define BEEPER_PIN                 EXP1_10_PIN
183
-  #define BTN_ENC                    EXP1_09_PIN
184
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
185
-  #define LCD_PINS_RS                EXP1_07_PIN
186
-  #define BTN_EN1                    EXP2_08_PIN
187
-  #define BTN_EN2                    EXP2_06_PIN
182
+  #define BEEPER_PIN                 EXP1_01_PIN
183
+  #define BTN_ENC                    EXP1_02_PIN
184
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
185
+  #define LCD_PINS_RS                EXP1_04_PIN
186
+  #define BTN_EN1                    EXP2_03_PIN
187
+  #define BTN_EN2                    EXP2_05_PIN
188
 
188
 
189
   // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
189
   // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
190
   #if ENABLED(MKS_MINI_12864)
190
   #if ENABLED(MKS_MINI_12864)
191
 
191
 
192
     #define LCD_BACKLIGHT_PIN               -1
192
     #define LCD_BACKLIGHT_PIN               -1
193
     #define LCD_RESET_PIN                   -1
193
     #define LCD_RESET_PIN                   -1
194
-    #define DOGLCD_A0                EXP1_04_PIN
195
-    #define DOGLCD_CS                EXP1_05_PIN
196
-    #define DOGLCD_SCK               EXP2_09_PIN
197
-    #define DOGLCD_MOSI              EXP2_05_PIN
194
+    #define DOGLCD_A0                EXP1_07_PIN
195
+    #define DOGLCD_CS                EXP1_06_PIN
196
+    #define DOGLCD_SCK               EXP2_02_PIN
197
+    #define DOGLCD_MOSI              EXP2_06_PIN
198
 
198
 
199
   #elif ENABLED(FYSETC_MINI_12864_2_1)
199
   #elif ENABLED(FYSETC_MINI_12864_2_1)
200
 
200
 
201
-    #define LCD_PINS_DC              EXP1_07_PIN
202
-    #define DOGLCD_CS                EXP1_08_PIN
201
+    #define LCD_PINS_DC              EXP1_04_PIN
202
+    #define DOGLCD_CS                EXP1_03_PIN
203
     #define DOGLCD_A0                LCD_PINS_DC
203
     #define DOGLCD_A0                LCD_PINS_DC
204
     #define LCD_BACKLIGHT_PIN               -1
204
     #define LCD_BACKLIGHT_PIN               -1
205
-    #define LCD_RESET_PIN            EXP1_06_PIN
206
-    #define NEOPIXEL_PIN             EXP1_05_PIN
207
-    #define DOGLCD_MOSI              EXP2_05_PIN
208
-    #define DOGLCD_SCK               EXP2_09_PIN
205
+    #define LCD_RESET_PIN            EXP1_05_PIN
206
+    #define NEOPIXEL_PIN             EXP1_06_PIN
207
+    #define DOGLCD_MOSI              EXP2_06_PIN
208
+    #define DOGLCD_SCK               EXP2_02_PIN
209
     #define FORCE_SOFT_SPI
209
     #define FORCE_SOFT_SPI
210
     #define SOFTWARE_SPI
210
     #define SOFTWARE_SPI
211
     //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
211
     //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
212
 
212
 
213
   #else
213
   #else
214
 
214
 
215
-    #define LCD_PINS_D4              EXP1_06_PIN
215
+    #define LCD_PINS_D4              EXP1_05_PIN
216
     #if IS_ULTIPANEL
216
     #if IS_ULTIPANEL
217
-      #define LCD_PINS_D5            EXP1_05_PIN
218
-      #define LCD_PINS_D6            EXP1_04_PIN
219
-      #define LCD_PINS_D7            EXP1_03_PIN
217
+      #define LCD_PINS_D5            EXP1_06_PIN
218
+      #define LCD_PINS_D6            EXP1_07_PIN
219
+      #define LCD_PINS_D7            EXP1_08_PIN
220
 
220
 
221
       #if !defined(BTN_ENC_EN) && ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
221
       #if !defined(BTN_ENC_EN) && ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
222
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
222
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
254
 #define ONBOARD_SPI_DEVICE                     2
254
 #define ONBOARD_SPI_DEVICE                     2
255
 #define SDSS                           SD_SS_PIN
255
 #define SDSS                           SD_SS_PIN
256
 #define ONBOARD_SD_CS_PIN              SD_SS_PIN
256
 #define ONBOARD_SD_CS_PIN              SD_SS_PIN
257
-#define SD_DETECT_PIN                       PC10  // EXP2_04_PIN
257
+#define SD_DETECT_PIN                       PC10  // EXP2_07_PIN
258
 #define NO_SD_HOST_DRIVE
258
 #define NO_SD_HOST_DRIVE
259
 
259
 
260
 // TODO: This is the only way to set SPI for SD on STM32 (for now)
260
 // TODO: This is the only way to set SPI for SD on STM32 (for now)
261
 #define ENABLE_SPI2
261
 #define ENABLE_SPI2
262
-#define SD_SCK_PIN                   EXP2_09_PIN
263
-#define SD_MISO_PIN                  EXP2_10_PIN
264
-#define SD_MOSI_PIN                  EXP2_05_PIN
265
-#define SD_SS_PIN                    EXP2_07_PIN
262
+#define SD_SCK_PIN                   EXP2_02_PIN
263
+#define SD_MISO_PIN                  EXP2_01_PIN
264
+#define SD_MOSI_PIN                  EXP2_06_PIN
265
+#define SD_SS_PIN                    EXP2_04_PIN

+ 32
- 32
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h 查看文件

80
 #define FIL_RUNOUT_PIN                      PB8   // MT_DET
80
 #define FIL_RUNOUT_PIN                      PB8   // MT_DET
81
 
81
 
82
 /**                ------
82
 /**                ------
83
- *   (BEEPER) PD2 |10  9 | PB3  (BTN_ENC)
84
- *  (BTN_EN1) PB5 | 8  7 | PA11 (RESET?)
85
- *  (BTN_EN2) PB4   6  5 | PC1  (LCD_D4)
86
- *   (LCD_RS) PC3 | 4  3 | PC2  (LCD_EN)
87
- *            GND | 2  1 | 5V
83
+ *   (BEEPER) PD2 | 1  2 | PB3  (BTN_ENC)
84
+ *  (BTN_EN1) PB5 | 3  4 | PA11 (RESET?)
85
+ *  (BTN_EN2) PB4   5  6 | PC1  (LCD_D4)
86
+ *   (LCD_RS) PC3 | 7  8 | PC2  (LCD_EN)
87
+ *            GND | 9 10 | 5V
88
  *                 ------
88
  *                 ------
89
  *               "E3" EXP1
89
  *               "E3" EXP1
90
  */
90
  */
91
-#define E3_EXP1_01_PIN                      -1    // 5V
92
-#define E3_EXP1_02_PIN                      -1    // GND
93
-#define E3_EXP1_03_PIN                      PC2
94
-#define E3_EXP1_04_PIN                      PC3
95
-#define E3_EXP1_05_PIN                      PC1
96
-#define E3_EXP1_06_PIN                      PB4
97
-#define E3_EXP1_07_PIN                      PA11  // RESET?
98
-#define E3_EXP1_08_PIN                      PB5
99
-#define E3_EXP1_09_PIN                      PB3
100
-#define E3_EXP1_10_PIN                      PD2
91
+#define EXP3_10_PIN                         -1    // 5V
92
+#define EXP3_09_PIN                         -1    // GND
93
+#define EXP3_08_PIN                         PC2
94
+#define EXP3_07_PIN                         PC3
95
+#define EXP3_06_PIN                         PC1
96
+#define EXP3_05_PIN                         PB4
97
+#define EXP3_04_PIN                         PA11  // RESET?
98
+#define EXP3_03_PIN                         PB5
99
+#define EXP3_02_PIN                         PB3
100
+#define EXP3_01_PIN                         PD2
101
 
101
 
102
 //
102
 //
103
 // LCD Pins
103
 // LCD Pins
104
 //
104
 //
105
 #if HAS_WIRED_LCD
105
 #if HAS_WIRED_LCD
106
-  #define BEEPER_PIN              E3_EXP1_10_PIN
107
-  #define BTN_ENC                 E3_EXP1_09_PIN
108
-  #define LCD_PINS_RS             E3_EXP1_04_PIN
106
+  #define BEEPER_PIN                 EXP3_01_PIN
107
+  #define BTN_ENC                    EXP3_02_PIN
108
+  #define LCD_PINS_RS                EXP3_07_PIN
109
 
109
 
110
-  #define BTN_EN1                 E3_EXP1_08_PIN
111
-  #define BTN_EN2                 E3_EXP1_06_PIN
110
+  #define BTN_EN1                    EXP3_03_PIN
111
+  #define BTN_EN2                    EXP3_05_PIN
112
 
112
 
113
-  #define LCD_PINS_ENABLE         E3_EXP1_03_PIN
113
+  #define LCD_PINS_ENABLE            EXP3_08_PIN
114
 
114
 
115
   #if ENABLED(MKS_MINI_12864)
115
   #if ENABLED(MKS_MINI_12864)
116
 
116
 
117
     #define LCD_BACKLIGHT_PIN               -1
117
     #define LCD_BACKLIGHT_PIN               -1
118
     #define LCD_RESET_PIN                   -1
118
     #define LCD_RESET_PIN                   -1
119
-    #define DOGLCD_A0             E3_EXP1_05_PIN
120
-    #define DOGLCD_CS             E3_EXP1_03_PIN
119
+    #define DOGLCD_A0                EXP3_06_PIN
120
+    #define DOGLCD_CS                EXP3_08_PIN
121
     #define DOGLCD_SCK                      PB13
121
     #define DOGLCD_SCK                      PB13
122
     #define DOGLCD_MOSI                     PB15
122
     #define DOGLCD_MOSI                     PB15
123
 
123
 
124
   #else                                           // !MKS_MINI_12864
124
   #else                                           // !MKS_MINI_12864
125
 
125
 
126
-    #define LCD_PINS_D4           E3_EXP1_05_PIN
126
+    #define LCD_PINS_D4              EXP3_06_PIN
127
     #if IS_ULTIPANEL
127
     #if IS_ULTIPANEL
128
       #define LCD_PINS_D5                   -1
128
       #define LCD_PINS_D5                   -1
129
       #define LCD_PINS_D6                   -1
129
       #define LCD_PINS_D6                   -1
164
 
164
 
165
 // EXP1 replace LCD with keys for EasyThreeD ET4000+ Mainboard
165
 // EXP1 replace LCD with keys for EasyThreeD ET4000+ Mainboard
166
 #if ENABLED(EASYTHREED_UI)
166
 #if ENABLED(EASYTHREED_UI)
167
-  #define BTN_HOME                E3_EXP1_04_PIN  // INPUT_PULLUP (unused)
168
-  #define BTN_FEED                E3_EXP1_09_PIN  // Run E Forward
169
-  #define BTN_RETRACT             E3_EXP1_08_PIN  // Run E Backward
170
-  #define BTN_PRINT               E3_EXP1_07_PIN  // Start File Print
171
-  #define BTN_HOME_GND            E3_EXP1_03_PIN  // OUTPUT (LOW)
172
-  #define BTN_FEED_GND            E3_EXP1_06_PIN  // OUTPUT (LOW)
173
-  #define BTN_RETRACT_GND         E3_EXP1_05_PIN  // OUTPUT (LOW)
174
-  #define EASYTHREED_LED_PIN      E3_EXP1_10_PIN  // Indicator LED
167
+  #define BTN_HOME                   EXP3_07_PIN  // INPUT_PULLUP (unused)
168
+  #define BTN_FEED                   EXP3_02_PIN  // Run E Forward
169
+  #define BTN_RETRACT                EXP3_03_PIN  // Run E Backward
170
+  #define BTN_PRINT                  EXP3_04_PIN  // Start File Print
171
+  #define BTN_HOME_GND               EXP3_08_PIN  // OUTPUT (LOW)
172
+  #define BTN_FEED_GND               EXP3_05_PIN  // OUTPUT (LOW)
173
+  #define BTN_RETRACT_GND            EXP3_06_PIN  // OUTPUT (LOW)
174
+  #define EASYTHREED_LED_PIN         EXP3_01_PIN  // Indicator LED
175
 #endif
175
 #endif

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

72
 //   2 +5V
72
 //   2 +5V
73
 //   1 GND
73
 //   1 GND
74
 
74
 
75
-#define EXP1_03_PIN                         PB11
76
-#define EXP1_04_PIN                         PB10
77
-#define EXP1_05_PIN                         PB2
78
-#define EXP1_06_PIN                         PC5
79
-#define EXP1_07_PIN                         PA10
80
-#define EXP1_08_PIN                         PA9
81
-#define EXP1_09_PIN                         PB0
82
-#define EXP1_10_PIN                         PB1
75
+#define EXP1_08_PIN                         PB11
76
+#define EXP1_07_PIN                         PB10
77
+#define EXP1_06_PIN                         PB2
78
+#define EXP1_05_PIN                         PC5
79
+#define EXP1_04_PIN                         PA10
80
+#define EXP1_03_PIN                         PA9
81
+#define EXP1_02_PIN                         PB0
82
+#define EXP1_01_PIN                         PB1
83
 
83
 
84
 // AUX1 connector
84
 // AUX1 connector
85
 //  1 +5V
85
 //  1 +5V
193
   //   1 GND
193
   //   1 GND
194
 
194
 
195
   #define LCDSCREEN_NAME "ZONESTAR LCD12864"
195
   #define LCDSCREEN_NAME "ZONESTAR LCD12864"
196
-  #define LCD_PINS_RS                EXP1_08_PIN
197
-  #define LCD_PINS_ENABLE            EXP1_05_PIN
198
-  #define LCD_PINS_D4                EXP1_07_PIN
199
-  //#define KILL_PIN                 EXP1_10_PIN
200
-  #define BEEPER_PIN                 EXP1_09_PIN
201
-  #define BTN_EN1                    EXP1_03_PIN
202
-  #define BTN_EN2                    EXP1_06_PIN
203
-  #define BTN_ENC                    EXP1_04_PIN
196
+  #define LCD_PINS_RS                EXP1_03_PIN
197
+  #define LCD_PINS_ENABLE            EXP1_06_PIN
198
+  #define LCD_PINS_D4                EXP1_04_PIN
199
+  //#define KILL_PIN                 EXP1_01_PIN
200
+  #define BEEPER_PIN                 EXP1_02_PIN
201
+  #define BTN_EN1                    EXP1_08_PIN
202
+  #define BTN_EN2                    EXP1_05_PIN
203
+  #define BTN_ENC                    EXP1_07_PIN
204
   #define BOARD_ST7920_DELAY_1               125
204
   #define BOARD_ST7920_DELAY_1               125
205
   #define BOARD_ST7920_DELAY_2               200
205
   #define BOARD_ST7920_DELAY_2               200
206
   #define BOARD_ST7920_DELAY_3               125
206
   #define BOARD_ST7920_DELAY_3               125
221
 
221
 
222
   #define FORCE_SOFT_SPI
222
   #define FORCE_SOFT_SPI
223
   #define LCDSCREEN_NAME "ZONESTAR 12864OLED"
223
   #define LCDSCREEN_NAME "ZONESTAR 12864OLED"
224
-  #define LCD_PINS_RS                EXP1_05_PIN  // = LCD_RESET_PIN
225
-  #define LCD_PINS_DC                EXP1_07_PIN  // DC
226
-  #define DOGLCD_CS                  EXP1_08_PIN  // CS
224
+  #define LCD_PINS_RS                EXP1_06_PIN  // = LCD_RESET_PIN
225
+  #define LCD_PINS_DC                EXP1_04_PIN  // DC
226
+  #define DOGLCD_CS                  EXP1_03_PIN  // CS
227
   #define DOGLCD_A0                  LCD_PINS_DC
227
   #define DOGLCD_A0                  LCD_PINS_DC
228
-  #define DOGLCD_MOSI                EXP1_10_PIN  // SDA
229
-  #define DOGLCD_SCK                 EXP1_09_PIN  // SCK
228
+  #define DOGLCD_MOSI                EXP1_01_PIN  // SDA
229
+  #define DOGLCD_SCK                 EXP1_02_PIN  // SCK
230
   // Encoder
230
   // Encoder
231
-  #define BTN_EN1                    EXP1_03_PIN
232
-  #define BTN_EN2                    EXP1_06_PIN
233
-  #define BTN_ENC                    EXP1_04_PIN
231
+  #define BTN_EN1                    EXP1_08_PIN
232
+  #define BTN_EN2                    EXP1_05_PIN
233
+  #define BTN_ENC                    EXP1_07_PIN
234
 
234
 
235
 #endif
235
 #endif

+ 57
- 57
Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h 查看文件

89
 //   2 +5V                    +5V
89
 //   2 +5V                    +5V
90
 //   1 GND                    GND
90
 //   1 GND                    GND
91
 
91
 
92
-#define EXP1_03_PIN                         PE14
93
-#define EXP1_04_PIN                         PE15
94
-#define EXP1_05_PIN                         PE9
95
-#define EXP1_06_PIN                         PE8
96
-#define EXP1_07_PIN                         PE10
97
-#define EXP1_08_PIN                         PE12
98
-#define EXP1_09_PIN                         PE11
99
-#define EXP1_10_PIN                         PE13
92
+#define EXP1_08_PIN                         PE14
93
+#define EXP1_07_PIN                         PE15
94
+#define EXP1_06_PIN                         PE9
95
+#define EXP1_05_PIN                         PE8
96
+#define EXP1_04_PIN                         PE10
97
+#define EXP1_03_PIN                         PE12
98
+#define EXP1_02_PIN                         PE11
99
+#define EXP1_01_PIN                         PE13
100
 
100
 
101
 // EXP2 connector
101
 // EXP2 connector
102
 //     MARK     I/O     ZONESTAR_LCD12864   REPRAPDISCOUNT_LCD12864
102
 //     MARK     I/O     ZONESTAR_LCD12864   REPRAPDISCOUNT_LCD12864
111
 //   2 +5V                    +5V
111
 //   2 +5V                    +5V
112
 //   1 GND                    GND
112
 //   1 GND                    GND
113
 
113
 
114
-#define EXP2_03_PIN                         PB3
115
-#define EXP2_04_PIN                         PB5
116
-#define EXP2_05_PIN                         PB4
117
-#define EXP2_06_PIN                         PA15
118
-#define EXP2_07_PIN                         PA10
119
-#define EXP2_08_PIN                         PA9
114
+#define EXP2_08_PIN                         PB3
115
+#define EXP2_07_PIN                         PB5
116
+#define EXP2_06_PIN                         PB4
117
+#define EXP2_05_PIN                         PA15
118
+#define EXP2_04_PIN                         PA10
119
+#define EXP2_03_PIN                         PA9
120
 
120
 
121
 // AUX1 connector
121
 // AUX1 connector
122
 //  1 +5V
122
 //  1 +5V
279
 //
279
 //
280
 #if ENABLED(ZONESTAR_12864LCD)
280
 #if ENABLED(ZONESTAR_12864LCD)
281
   #define LCDSCREEN_NAME "ZONESTAR LCD12864"
281
   #define LCDSCREEN_NAME "ZONESTAR LCD12864"
282
-  #define LCD_PINS_RS                EXP1_08_PIN  // 7 CS make sure for zonestar zm3e4!
283
-  #define LCD_PINS_ENABLE            EXP1_05_PIN  // 6 DATA make sure for zonestar zm3e4!
284
-  #define LCD_PINS_D4                EXP1_07_PIN  // 8 SCK make sure for zonestar zm3e4!
285
-  #define BEEPER_PIN                 EXP1_09_PIN
286
-  #define KILL_PIN                          -1    // EXP1_10_PIN
287
-  #define BTN_EN1                    EXP1_06_PIN
288
-  #define BTN_EN2                    EXP1_03_PIN
289
-  #define BTN_ENC                    EXP1_04_PIN
282
+  #define LCD_PINS_RS                EXP1_03_PIN  // 7 CS make sure for zonestar zm3e4!
283
+  #define LCD_PINS_ENABLE            EXP1_06_PIN  // 6 DATA make sure for zonestar zm3e4!
284
+  #define LCD_PINS_D4                EXP1_04_PIN  // 8 SCK make sure for zonestar zm3e4!
285
+  #define BEEPER_PIN                 EXP1_02_PIN
286
+  #define KILL_PIN                          -1    // EXP1_01_PIN
287
+  #define BTN_EN1                    EXP1_05_PIN
288
+  #define BTN_EN2                    EXP1_08_PIN
289
+  #define BTN_ENC                    EXP1_07_PIN
290
 #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
290
 #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
291
   #define LCDSCREEN_NAME "REPRAPDISCOUNT LCD12864"
291
   #define LCDSCREEN_NAME "REPRAPDISCOUNT LCD12864"
292
-  #define LCD_PINS_RS                EXP1_08_PIN  // 7 CS make sure for zonestar zm3e4!
293
-  #define LCD_PINS_ENABLE            EXP1_07_PIN  // 6 DATA make sure for zonestar zm3e4!
294
-  #define LCD_PINS_D4                EXP1_05_PIN  // 8 SCK make sure for zonestar zm3e4!
295
-  #define BEEPER_PIN                 EXP1_09_PIN
296
-  #define KILL_PIN                   EXP2_04_PIN
297
-  #define BTN_EN1                    EXP2_05_PIN
298
-  #define BTN_EN2                    EXP2_07_PIN
299
-  #define BTN_ENC                    EXP1_10_PIN
292
+  #define LCD_PINS_RS                EXP1_03_PIN  // 7 CS make sure for zonestar zm3e4!
293
+  #define LCD_PINS_ENABLE            EXP1_04_PIN  // 6 DATA make sure for zonestar zm3e4!
294
+  #define LCD_PINS_D4                EXP1_06_PIN  // 8 SCK make sure for zonestar zm3e4!
295
+  #define BEEPER_PIN                 EXP1_02_PIN
296
+  #define KILL_PIN                   EXP2_07_PIN
297
+  #define BTN_EN1                    EXP2_06_PIN
298
+  #define BTN_EN2                    EXP2_04_PIN
299
+  #define BTN_ENC                    EXP1_01_PIN
300
 #elif ENABLED(ZONESTAR_DWIN_LCD)
300
 #elif ENABLED(ZONESTAR_DWIN_LCD)
301
   // Connect to EXP2 connector
301
   // Connect to EXP2 connector
302
   #define LCDSCREEN_NAME "ZONESTAR DWIN LCD"
302
   #define LCDSCREEN_NAME "ZONESTAR DWIN LCD"
303
-  #define BEEPER_PIN                 EXP2_06_PIN
303
+  #define BEEPER_PIN                 EXP2_05_PIN
304
   #define KILL_PIN                          PC0
304
   #define KILL_PIN                          PC0
305
-  #define BTN_EN1                    EXP2_03_PIN
306
-  #define BTN_EN2                    EXP2_04_PIN
307
-  #define BTN_ENC                    EXP2_05_PIN
305
+  #define BTN_EN1                    EXP2_08_PIN
306
+  #define BTN_EN2                    EXP2_07_PIN
307
+  #define BTN_ENC                    EXP2_06_PIN
308
 #endif
308
 #endif
309
 
309
 
310
 #if ENABLED(ZONESTAR_LCD2004_KNOB)
310
 #if ENABLED(ZONESTAR_LCD2004_KNOB)
311
   #define LCDSCREEN_NAME "LCD2004 KNOB"
311
   #define LCDSCREEN_NAME "LCD2004 KNOB"
312
-  #define LCD_PINS_RS                EXP1_08_PIN
313
-  #define LCD_PINS_ENABLE            EXP1_07_PIN
314
-  #define LCD_PINS_D4                EXP1_05_PIN
315
-  #define LCD_PINS_D5                EXP1_06_PIN
316
-  #define LCD_PINS_D6                EXP1_03_PIN
317
-  #define LCD_PINS_D7                EXP1_04_PIN
318
-  #define BTN_EN1                    EXP2_07_PIN
319
-  #define BTN_EN2                    EXP2_05_PIN
320
-  #define BTN_ENC                    EXP1_10_PIN
321
-  #define BEEPER_PIN                 EXP1_09_PIN
322
-  #define KILL_PIN                   EXP2_04_PIN
312
+  #define LCD_PINS_RS                EXP1_03_PIN
313
+  #define LCD_PINS_ENABLE            EXP1_04_PIN
314
+  #define LCD_PINS_D4                EXP1_06_PIN
315
+  #define LCD_PINS_D5                EXP1_05_PIN
316
+  #define LCD_PINS_D6                EXP1_08_PIN
317
+  #define LCD_PINS_D7                EXP1_07_PIN
318
+  #define BTN_EN1                    EXP2_04_PIN
319
+  #define BTN_EN2                    EXP2_06_PIN
320
+  #define BTN_ENC                    EXP1_01_PIN
321
+  #define BEEPER_PIN                 EXP1_02_PIN
322
+  #define KILL_PIN                   EXP2_07_PIN
323
 #elif ENABLED(ZONESTAR_LCD2004_ADCKEY)
323
 #elif ENABLED(ZONESTAR_LCD2004_ADCKEY)
324
   #define LCDSCREEN_NAME "LCD2004 5KEY"
324
   #define LCDSCREEN_NAME "LCD2004 5KEY"
325
-  #define LCD_PINS_RS                EXP1_08_PIN
326
-  #define LCD_PINS_ENABLE            EXP1_07_PIN
327
-  #define LCD_PINS_D4                EXP1_05_PIN
328
-  #define LCD_PINS_D5                EXP1_06_PIN
329
-  #define LCD_PINS_D6                EXP1_03_PIN
330
-  #define LCD_PINS_D7                EXP1_04_PIN
325
+  #define LCD_PINS_RS                EXP1_03_PIN
326
+  #define LCD_PINS_ENABLE            EXP1_04_PIN
327
+  #define LCD_PINS_D4                EXP1_06_PIN
328
+  #define LCD_PINS_D5                EXP1_05_PIN
329
+  #define LCD_PINS_D6                EXP1_08_PIN
330
+  #define LCD_PINS_D7                EXP1_07_PIN
331
   #define ADC_KEYPAD_PIN                    PC0   // PIN6 of AUX1
331
   #define ADC_KEYPAD_PIN                    PC0   // PIN6 of AUX1
332
 #endif
332
 #endif
333
 
333
 
341
 // Remap SERVO0 PIN for BLTouch
341
 // Remap SERVO0 PIN for BLTouch
342
 #if ENABLED(BLTOUCH_ON_EXP1)
342
 #if ENABLED(BLTOUCH_ON_EXP1)
343
   // BLTouch connected to EXP1
343
   // BLTouch connected to EXP1
344
-  #define BLTOUCH_PROBE_PIN          EXP1_06_PIN
345
-  #define BLTOUCH_GND_PIN            EXP1_04_PIN
344
+  #define BLTOUCH_PROBE_PIN          EXP1_05_PIN
345
+  #define BLTOUCH_GND_PIN            EXP1_07_PIN
346
   #undef SERVO0_PIN
346
   #undef SERVO0_PIN
347
-  #define SERVO0_PIN                 EXP1_03_PIN
347
+  #define SERVO0_PIN                 EXP1_08_PIN
348
 #elif ENABLED(BLTOUCH_ON_EXP2)
348
 #elif ENABLED(BLTOUCH_ON_EXP2)
349
   // BLTouch connected to EXP2
349
   // BLTouch connected to EXP2
350
-  #define BLTOUCH_PROBE_PIN          EXP2_03_PIN
351
-  #define BLTOUCH_GND_PIN            EXP2_04_PIN
350
+  #define BLTOUCH_PROBE_PIN          EXP2_08_PIN
351
+  #define BLTOUCH_GND_PIN            EXP2_07_PIN
352
   #undef SERVO0_PIN
352
   #undef SERVO0_PIN
353
-  #define SERVO0_PIN                 EXP2_06_PIN
353
+  #define SERVO0_PIN                 EXP2_05_PIN
354
 #else
354
 #else
355
   #define BLTOUCH_PROBE_PIN                 PB13
355
   #define BLTOUCH_PROBE_PIN                 PB13
356
 #endif
356
 #endif

+ 43
- 43
Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h 查看文件

90
 //   2 +5V
90
 //   2 +5V
91
 //   1 GND
91
 //   1 GND
92
 
92
 
93
-#define EXP1_03_PIN                         PE14
94
-#define EXP1_04_PIN                         PE15
95
-#define EXP1_05_PIN                         PE9
96
-#define EXP1_06_PIN                         PE8
97
-#define EXP1_07_PIN                         PE10
98
-#define EXP1_08_PIN                         PE12
99
-#define EXP1_09_PIN                         PE11
100
-#define EXP1_10_PIN                         PE13
93
+#define EXP1_08_PIN                         PE14
94
+#define EXP1_07_PIN                         PE15
95
+#define EXP1_06_PIN                         PE9
96
+#define EXP1_05_PIN                         PE8
97
+#define EXP1_04_PIN                         PE10
98
+#define EXP1_03_PIN                         PE12
99
+#define EXP1_02_PIN                         PE11
100
+#define EXP1_01_PIN                         PE13
101
 
101
 
102
 // EXP2 connector
102
 // EXP2 connector
103
 //     MARK     I/O     ZONESTAR_LCD12864   REPRAPDISCOUNT_LCD12864
103
 //     MARK     I/O     ZONESTAR_LCD12864   REPRAPDISCOUNT_LCD12864
112
 //   2 +5V
112
 //   2 +5V
113
 //   1 GND
113
 //   1 GND
114
 
114
 
115
-#define EXP2_03_PIN                         PB3
116
-#define EXP2_04_PIN                         PB5
117
-#define EXP2_05_PIN                         PB4
118
-#define EXP2_06_PIN                         PA15
119
-#define EXP2_07_PIN                         PA10
120
-#define EXP2_08_PIN                         PA9
121
-#define EXP2_09_PIN                         PE7
122
-#define EXP2_10_PIN                         PC0
115
+#define EXP2_08_PIN                         PB3
116
+#define EXP2_07_PIN                         PB5
117
+#define EXP2_06_PIN                         PB4
118
+#define EXP2_05_PIN                         PA15
119
+#define EXP2_04_PIN                         PA10
120
+#define EXP2_03_PIN                         PA9
121
+#define EXP2_02_PIN                         PE7
122
+#define EXP2_01_PIN                         PC0
123
 
123
 
124
 // AUX1 connector
124
 // AUX1 connector
125
 //  1 +5V
125
 //  1 +5V
276
 
276
 
277
 #if ENABLED(ZONESTAR_12864LCD)
277
 #if ENABLED(ZONESTAR_12864LCD)
278
   #define LCDSCREEN_NAME "ZONESTAR LCD12864"
278
   #define LCDSCREEN_NAME "ZONESTAR LCD12864"
279
-  #define LCD_PINS_RS                EXP1_08_PIN  // 7 CS make sure for zonestar zm3e4!
280
-  #define LCD_PINS_ENABLE            EXP1_05_PIN  // 6 DATA make sure for zonestar zm3e4!
281
-  #define LCD_PINS_D4                EXP1_07_PIN  // 8 SCK make sure for zonestar zm3e4!
282
-  #define BEEPER_PIN                 EXP1_09_PIN
283
-  #define KILL_PIN                          -1    // EXP1_10_PIN
284
-  #define BTN_EN1                    EXP1_06_PIN
285
-  #define BTN_EN2                    EXP1_03_PIN
286
-  #define BTN_ENC                    EXP1_04_PIN
279
+  #define LCD_PINS_RS                EXP1_03_PIN  // 7 CS make sure for zonestar zm3e4!
280
+  #define LCD_PINS_ENABLE            EXP1_06_PIN  // 6 DATA make sure for zonestar zm3e4!
281
+  #define LCD_PINS_D4                EXP1_04_PIN  // 8 SCK make sure for zonestar zm3e4!
282
+  #define BEEPER_PIN                 EXP1_02_PIN
283
+  #define KILL_PIN                          -1    // EXP1_01_PIN
284
+  #define BTN_EN1                    EXP1_05_PIN
285
+  #define BTN_EN2                    EXP1_08_PIN
286
+  #define BTN_ENC                    EXP1_07_PIN
287
 #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
287
 #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
288
   #define LCDSCREEN_NAME "REPRAPDISCOUNT LCD12864"
288
   #define LCDSCREEN_NAME "REPRAPDISCOUNT LCD12864"
289
-  #define LCD_PINS_RS                EXP2_08_PIN  // 7 CS make sure for zonestar zm3e4!
290
-  #define LCD_PINS_ENABLE            EXP2_05_PIN  // 6 DATA make sure for zonestar zm3e4!
291
-  #define LCD_PINS_D4                EXP2_07_PIN  // 8 SCK make sure for zonestar zm3e4!
292
-  #define BEEPER_PIN                 EXP2_10_PIN
293
-  #define KILL_PIN                   EXP2_09_PIN
294
-  #define BTN_EN1                    EXP2_03_PIN
295
-  #define BTN_EN2                    EXP2_06_PIN
296
-  #define BTN_ENC                    EXP2_04_PIN
289
+  #define LCD_PINS_RS                EXP2_03_PIN  // 7 CS make sure for zonestar zm3e4!
290
+  #define LCD_PINS_ENABLE            EXP2_06_PIN  // 6 DATA make sure for zonestar zm3e4!
291
+  #define LCD_PINS_D4                EXP2_04_PIN  // 8 SCK make sure for zonestar zm3e4!
292
+  #define BEEPER_PIN                 EXP2_01_PIN
293
+  #define KILL_PIN                   EXP2_02_PIN
294
+  #define BTN_EN1                    EXP2_08_PIN
295
+  #define BTN_EN2                    EXP2_05_PIN
296
+  #define BTN_ENC                    EXP2_07_PIN
297
 #elif ENABLED(ZONESTAR_DWIN_LCD)
297
 #elif ENABLED(ZONESTAR_DWIN_LCD)
298
   // Connect to EXP2 connector
298
   // Connect to EXP2 connector
299
   #define LCDSCREEN_NAME "ZONESTAR DWIN LCD"
299
   #define LCDSCREEN_NAME "ZONESTAR DWIN LCD"
300
-  #define BEEPER_PIN                 EXP2_06_PIN  // PE11
301
-  #define KILL_PIN                          -1    // EXP1_10_PIN
302
-  #define BTN_EN2                    EXP2_04_PIN  // PE8
303
-  #define BTN_EN1                    EXP2_03_PIN  // PE14
304
-  #define BTN_ENC                    EXP2_05_PIN  // PE15
300
+  #define BEEPER_PIN                 EXP2_05_PIN  // PE11
301
+  #define KILL_PIN                          -1    // EXP1_01_PIN
302
+  #define BTN_EN2                    EXP2_07_PIN  // PE8
303
+  #define BTN_EN1                    EXP2_08_PIN  // PE14
304
+  #define BTN_ENC                    EXP2_06_PIN  // PE15
305
 #endif
305
 #endif
306
 
306
 
307
 // Alter timing for graphical display
307
 // Alter timing for graphical display
314
 // Remap SERVO0 PIN for BLTouch
314
 // Remap SERVO0 PIN for BLTouch
315
 #if ENABLED(BLTOUCH_ON_EXP1)
315
 #if ENABLED(BLTOUCH_ON_EXP1)
316
   // BLTouch connected to EXP1
316
   // BLTouch connected to EXP1
317
-  #define BLTOUCH_PROBE_PIN          EXP1_06_PIN
318
-  #define BLTOUCH_GND_PIN            EXP1_04_PIN
317
+  #define BLTOUCH_PROBE_PIN          EXP1_05_PIN
318
+  #define BLTOUCH_GND_PIN            EXP1_07_PIN
319
   #undef SERVO0_PIN
319
   #undef SERVO0_PIN
320
-  #define SERVO0_PIN                 EXP1_03_PIN
320
+  #define SERVO0_PIN                 EXP1_08_PIN
321
 #elif ENABLED(BLTOUCH_ON_EXP2)
321
 #elif ENABLED(BLTOUCH_ON_EXP2)
322
   // BLTouch connected to EXP2
322
   // BLTouch connected to EXP2
323
-  #define BLTOUCH_PROBE_PIN          EXP2_03_PIN
324
-  #define BLTOUCH_GND_PIN            EXP2_04_PIN
323
+  #define BLTOUCH_PROBE_PIN          EXP2_08_PIN
324
+  #define BLTOUCH_GND_PIN            EXP2_07_PIN
325
   #undef SERVO0_PIN
325
   #undef SERVO0_PIN
326
-  #define SERVO0_PIN                 EXP2_06_PIN
326
+  #define SERVO0_PIN                 EXP2_05_PIN
327
 #else
327
 #else
328
   #define BLTOUCH_PROBE_PIN                 PB13  // Z1_MAX
328
   #define BLTOUCH_PROBE_PIN                 PB13  // Z1_MAX
329
 #endif
329
 #endif

+ 58
- 58
Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h 查看文件

199
 /**
199
 /**
200
  * ---------------------------------BTT002 V1.0---------------------------------
200
  * ---------------------------------BTT002 V1.0---------------------------------
201
  *                ------                                    ------              |
201
  *                ------                                    ------              |
202
- * (BEEPER) PE7  |10  9 | PB1  (BTN_ENC)     (MISO)    PA6 |10  9 | PA5 (SCK)   |
203
- * (LCD_EN) PE9  | 8  7 | PE8  (LCD_RS)      (BTN_EN1) PC5 | 8  7 | PA4 (SD_SS) |
204
- * (LCD_D4) PE10   6  5 | PE11 (LCD_D5)      (BTN_EN2) PB0   6  5 | PA7 (MOSI)  |
205
- * (LCD_D6) PE12 | 4  3 | PE13 (LCD_D7)      (SD_DET)  PC4 | 4  3 | RESET       |
206
- *           GND | 2  1 | 5V                           GND | 2  1 | PA3         |
202
+ * (BEEPER) PE7  | 1  2 | PB1  (BTN_ENC)     (MISO)    PA6 | 1  2 | PA5 (SCK)   |
203
+ * (LCD_EN) PE9  | 3  4 | PE8  (LCD_RS)      (BTN_EN1) PC5 | 3  4 | PA4 (SD_SS) |
204
+ * (LCD_D4) PE10   5  6 | PE11 (LCD_D5)      (BTN_EN2) PB0   5  6 | PA7 (MOSI)  |
205
+ * (LCD_D6) PE12 | 7  8 | PE13 (LCD_D7)      (SD_DET)  PC4 | 7  8 | RESET       |
206
+ *           GND | 9 10 | 5V                           GND | 9 10 | PA3         |
207
  *                ------                                    ------              |
207
  *                ------                                    ------              |
208
  *                 EXP1                                      EXP2               |
208
  *                 EXP1                                      EXP2               |
209
  * ------------------------------------------------------------------------------
209
  * ------------------------------------------------------------------------------
210
  */
210
  */
211
-#define EXP1_03_PIN                         PE13
212
-#define EXP1_04_PIN                         PE12
213
-#define EXP1_05_PIN                         PE11
214
-#define EXP1_06_PIN                         PE10
215
-#define EXP1_07_PIN                         PE8
216
-#define EXP1_08_PIN                         PE9
217
-#define EXP1_09_PIN                         PB1
218
-#define EXP1_10_PIN                         PE7
219
-
220
-#define EXP2_01_PIN                         PA3
221
-#define EXP2_03_PIN                         -1
222
-#define EXP2_04_PIN                         PC4
223
-#define EXP2_05_PIN                         PA7
224
-#define EXP2_06_PIN                         PB0
225
-#define EXP2_07_PIN                         PA4
226
-#define EXP2_08_PIN                         PC5
227
-#define EXP2_09_PIN                         PA5
228
-#define EXP2_10_PIN                         PA6
211
+#define EXP1_08_PIN                         PE13
212
+#define EXP1_07_PIN                         PE12
213
+#define EXP1_06_PIN                         PE11
214
+#define EXP1_05_PIN                         PE10
215
+#define EXP1_04_PIN                         PE8
216
+#define EXP1_03_PIN                         PE9
217
+#define EXP1_02_PIN                         PB1
218
+#define EXP1_01_PIN                         PE7
219
+
220
+#define EXP2_10_PIN                         PA3
221
+#define EXP2_08_PIN                         -1
222
+#define EXP2_07_PIN                         PC4
223
+#define EXP2_06_PIN                         PA7
224
+#define EXP2_05_PIN                         PB0
225
+#define EXP2_04_PIN                         PA4
226
+#define EXP2_03_PIN                         PC5
227
+#define EXP2_02_PIN                         PA5
228
+#define EXP2_01_PIN                         PA6
229
 
229
 
230
 // HAL SPI1 pins
230
 // HAL SPI1 pins
231
-#define SD_SCK_PIN                   EXP2_09_PIN  // SPI1 SCLK
232
-#define SD_SS_PIN                    EXP2_07_PIN  // SPI1 SSEL
233
-#define SD_MISO_PIN                  EXP2_10_PIN  // SPI1 MISO
234
-#define SD_MOSI_PIN                  EXP2_05_PIN  // SPI1 MOSI
231
+#define SD_SCK_PIN                   EXP2_02_PIN  // SPI1 SCLK
232
+#define SD_SS_PIN                    EXP2_04_PIN  // SPI1 SSEL
233
+#define SD_MISO_PIN                  EXP2_01_PIN  // SPI1 MISO
234
+#define SD_MOSI_PIN                  EXP2_06_PIN  // SPI1 MOSI
235
 
235
 
236
-#define SDSS                         EXP2_07_PIN
236
+#define SDSS                         EXP2_04_PIN
237
 
237
 
238
 //
238
 //
239
 // LCDs and Controllers
239
 // LCDs and Controllers
240
 //
240
 //
241
 #if HAS_WIRED_LCD
241
 #if HAS_WIRED_LCD
242
-  #define BEEPER_PIN                 EXP1_10_PIN
243
-  #define BTN_ENC                    EXP1_09_PIN
242
+  #define BEEPER_PIN                 EXP1_01_PIN
243
+  #define BTN_ENC                    EXP1_02_PIN
244
 
244
 
245
-  #define SD_DETECT_PIN              EXP2_04_PIN
245
+  #define SD_DETECT_PIN              EXP2_07_PIN
246
 
246
 
247
   #if ENABLED(CR10_STOCKDISPLAY)
247
   #if ENABLED(CR10_STOCKDISPLAY)
248
-    #define LCD_PINS_RS              EXP1_04_PIN
248
+    #define LCD_PINS_RS              EXP1_07_PIN
249
 
249
 
250
-    #define BTN_EN1                  EXP1_08_PIN
251
-    #define BTN_EN2                  EXP1_06_PIN
250
+    #define BTN_EN1                  EXP1_03_PIN
251
+    #define BTN_EN2                  EXP1_05_PIN
252
 
252
 
253
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
254
-    #define LCD_PINS_D4              EXP1_05_PIN
253
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
254
+    #define LCD_PINS_D4              EXP1_06_PIN
255
 
255
 
256
   #elif ENABLED(MKS_MINI_12864)
256
   #elif ENABLED(MKS_MINI_12864)
257
 
257
 
258
-    #define DOGLCD_A0                EXP1_04_PIN
259
-    #define DOGLCD_CS                EXP1_05_PIN
260
-    #define BTN_EN1                  EXP2_08_PIN
261
-    #define BTN_EN2                  EXP2_06_PIN
258
+    #define DOGLCD_A0                EXP1_07_PIN
259
+    #define DOGLCD_CS                EXP1_06_PIN
260
+    #define BTN_EN1                  EXP2_03_PIN
261
+    #define BTN_EN2                  EXP2_05_PIN
262
 
262
 
263
   #else
263
   #else
264
 
264
 
265
-    #define LCD_PINS_RS              EXP1_07_PIN
265
+    #define LCD_PINS_RS              EXP1_04_PIN
266
 
266
 
267
-    #define BTN_EN1                  EXP2_08_PIN
268
-    #define BTN_EN2                  EXP2_06_PIN
267
+    #define BTN_EN1                  EXP2_03_PIN
268
+    #define BTN_EN2                  EXP2_05_PIN
269
 
269
 
270
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
271
-    #define LCD_PINS_D4              EXP1_06_PIN
270
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
271
+    #define LCD_PINS_D4              EXP1_05_PIN
272
 
272
 
273
     #if ENABLED(FYSETC_MINI_12864)
273
     #if ENABLED(FYSETC_MINI_12864)
274
-      #define DOGLCD_CS              EXP1_08_PIN
275
-      #define DOGLCD_A0              EXP1_07_PIN
276
-      #define DOGLCD_MOSI            EXP2_05_PIN
277
-      #define DOGLCD_MISO            EXP2_10_PIN
278
-      #define DOGLCD_SCK             EXP2_09_PIN
274
+      #define DOGLCD_CS              EXP1_03_PIN
275
+      #define DOGLCD_A0              EXP1_04_PIN
276
+      #define DOGLCD_MOSI            EXP2_06_PIN
277
+      #define DOGLCD_MISO            EXP2_01_PIN
278
+      #define DOGLCD_SCK             EXP2_02_PIN
279
 
279
 
280
       #define LCD_BACKLIGHT_PIN             -1
280
       #define LCD_BACKLIGHT_PIN             -1
281
 
281
 
282
       #define FORCE_SOFT_SPI
282
       #define FORCE_SOFT_SPI
283
 
283
 
284
-      #define LCD_RESET_PIN          EXP1_06_PIN  // Must be high or open for LCD to operate normally.
284
+      #define LCD_RESET_PIN          EXP1_05_PIN  // Must be high or open for LCD to operate normally.
285
 
285
 
286
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
286
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
287
         #ifndef RGB_LED_R_PIN
287
         #ifndef RGB_LED_R_PIN
288
-          #define RGB_LED_R_PIN      EXP1_05_PIN
288
+          #define RGB_LED_R_PIN      EXP1_06_PIN
289
         #endif
289
         #endif
290
         #ifndef RGB_LED_G_PIN
290
         #ifndef RGB_LED_G_PIN
291
-          #define RGB_LED_G_PIN      EXP1_04_PIN
291
+          #define RGB_LED_G_PIN      EXP1_07_PIN
292
         #endif
292
         #endif
293
         #ifndef RGB_LED_B_PIN
293
         #ifndef RGB_LED_B_PIN
294
-          #define RGB_LED_B_PIN      EXP1_03_PIN
294
+          #define RGB_LED_B_PIN      EXP1_08_PIN
295
         #endif
295
         #endif
296
       #elif ENABLED(FYSETC_MINI_12864_2_1)
296
       #elif ENABLED(FYSETC_MINI_12864_2_1)
297
-        #define NEOPIXEL_PIN         EXP1_05_PIN
297
+        #define NEOPIXEL_PIN         EXP1_06_PIN
298
       #endif
298
       #endif
299
     #endif // !FYSETC_MINI_12864
299
     #endif // !FYSETC_MINI_12864
300
 
300
 
301
     #if IS_ULTIPANEL
301
     #if IS_ULTIPANEL
302
-      #define LCD_PINS_D5            EXP1_05_PIN
303
-      #define LCD_PINS_D6            EXP1_04_PIN
304
-      #define LCD_PINS_D7            EXP1_03_PIN
302
+      #define LCD_PINS_D5            EXP1_06_PIN
303
+      #define LCD_PINS_D6            EXP1_07_PIN
304
+      #define LCD_PINS_D7            EXP1_08_PIN
305
 
305
 
306
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
306
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
307
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
307
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder

+ 20
- 20
Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h 查看文件

186
 /**
186
 /**
187
  *              BTT E3 RRF
187
  *              BTT E3 RRF
188
  *                ------
188
  *                ------
189
- * (BEEPER)  PE8 |10  9 | PE9  (BTN_ENC)
190
- * (BTN_EN1) PE7 | 8  7 | RESET
191
- * (BTN_EN2) PB2   6  5 | PE10 (LCD_D4)
192
- * (LCD_RS)  PB1 | 4  3 | PE11 (LCD_EN)
193
- *           GND | 2  1 | 5V
189
+ * (BEEPER)  PE8 | 1  2 | PE9  (BTN_ENC)
190
+ * (BTN_EN1) PE7 | 3  4 | RESET
191
+ * (BTN_EN2) PB2   5  6 | PE10 (LCD_D4)
192
+ * (LCD_RS)  PB1 | 7  8 | PE11 (LCD_EN)
193
+ *           GND | 9 10 | 5V
194
  *                ------
194
  *                ------
195
  *                 EXP1
195
  *                 EXP1
196
  */
196
  */
219
       *
219
       *
220
       *               BTT E3 RRF                                   Display Ribbon
220
       *               BTT E3 RRF                                   Display Ribbon
221
       *                ------                                         ------
221
       *                ------                                         ------
222
-      * (BEEPER)  PE8 |10  9 | PE9  (BTN_ENC)                    GND |10  9 | 5V
223
-      * (BTN_EN1) PE7 | 8  7 | RESET                          BEEPER | 8  7 | ESTOP    (RESET)
224
-      * (BTN_EN2) PB2   6  5 | PE10 (LCD_D4)       (BTN_ENC) ENC_BTN | 6  5 | LCD_SCLK (LCD_D4)
225
-      * (LCD_RS)  PB1 | 4  3 | PE11 (LCD_EN)       (BTN_EN2) ENC_A   | 4  3 | LCD_DATA (LCD_EN)
226
-      *           GND | 2  1 | 5V                  (BTN_EN1) ENC_B   | 2  1 | LCD_CS   (LCD_RS)
222
+      * (BEEPER)  PE8 | 1  2 | PE9  (BTN_ENC)                    GND | 1  2 | 5V
223
+      * (BTN_EN1) PE7 | 3  4 | RESET                          BEEPER | 3  4 | ESTOP    (RESET)
224
+      * (BTN_EN2) PB2   5  6 | PE10 (LCD_D4)       (BTN_ENC) ENC_BTN | 5  6 | LCD_SCLK (LCD_D4)
225
+      * (LCD_RS)  PB1 | 7  8 | PE11 (LCD_EN)       (BTN_EN2) ENC_A   | 7  8 | LCD_DATA (LCD_EN)
226
+      *           GND | 9 10 | 5V                  (BTN_EN1) ENC_B   | 9 10 | LCD_CS   (LCD_RS)
227
       *                ------                                         ------
227
       *                ------                                         ------
228
       *                 EXP1                                          Ribbon
228
       *                 EXP1                                          Ribbon
229
       *
229
       *
286
        *
286
        *
287
        *                  Board                       Display
287
        *                  Board                       Display
288
        *                  ------                       ------
288
        *                  ------                       ------
289
-       * (SD_DET)    PE8 |10  9 | PE9 (BEEPER)     5V |10  9 | GND
290
-       * (MOD_RESET) PE7 | 8  7 | RESET            -- | 8  7 | (SD_DET)
291
-       * (SD_CS)     PB2   6  5 | PE10        (MOSI)    6  5 | --
292
-       * (LCD_CS)    PB1 | 4  3 | PE11        (SD_CS) | 4  3 | (LCD_CS)
293
-       *             GND | 2  1 | 5V          (SCK)   | 2  1 | (MISO)
289
+       * (SD_DET)    PE8 | 1  2 | PE9 (BEEPER)     5V | 1  2 | GND
290
+       * (MOD_RESET) PE7 | 3  4 | RESET            -- | 3  4 | (SD_DET)
291
+       * (SD_CS)     PB2   5  6 | PE10        (MOSI)    5  6 | --
292
+       * (LCD_CS)    PB1 | 7  8 | PE11        (SD_CS) | 7  8 | (LCD_CS)
293
+       *             GND | 9 10 | 5V          (SCK)   | 9 10 | (MISO)
294
        *                  ------                       ------
294
        *                  ------                       ------
295
        *                   EXP1                         EXP1
295
        *                   EXP1                         EXP1
296
        *
296
        *
341
    *
341
    *
342
    *                  Board                          Display
342
    *                  Board                          Display
343
    *                  ------                          ------
343
    *                  ------                          ------
344
-   * (SD_DET)    PE8 |10  9 | PE9 (BEEPER)        5V |10  9 | GND
345
-   * (MOD_RESET) PE7 | 8  7 | RESET            RESET | 8  7 | (SD_DET)
346
-   * (SD_CS)     PB2   6  5 | PE10           (MOSI)  | 6  5 | (LCD_CS)
347
-   * (LCD_CS)    PB1 | 4  3 | PE11           (SD_CS) | 4  3 | (MOD_RESET)
348
-   *             GND | 2  1 | 5V             (SCK)   | 2  1 | (MISO)
344
+   * (SD_DET)    PE8 | 1  2 | PE9 (BEEPER)        5V | 1  2 | GND
345
+   * (MOD_RESET) PE7 | 3  4 | RESET            RESET | 3  4 | (SD_DET)
346
+   * (SD_CS)     PB2   5  6 | PE10           (MOSI)  | 5  6 | (LCD_CS)
347
+   * (LCD_CS)    PB1 | 7  8 | PE11           (SD_CS) | 7  8 | (MOD_RESET)
348
+   *             GND | 9 10 | 5V             (SCK)   | 9 10 | (MISO)
349
    *                  ------                          ------
349
    *                  ------                          ------
350
    *                   EXP1                            EXP1
350
    *                   EXP1                            EXP1
351
    *
351
    *

+ 63
- 63
Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h 查看文件

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

+ 83
- 83
Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h 查看文件

322
 #endif
322
 #endif
323
 
323
 
324
 /**               ------                                      ------
324
 /**               ------                                      ------
325
- * (BEEPER) PE8  |10  9 | PE7  (BTN_ENC)         (MISO) PA6  |10  9 | PA5  (SCK)
326
- * (LCD_EN) PE9  | 8  7 | PE10 (LCD_RS)       (BTN_EN1) PB2  | 8  7 | PA4  (SD_SS)
327
- * (LCD_D4) PE12   6  5 | PE13 (LCD_D5)       (BTN_EN2) PB1    6  5 | PA7  (MOSI)
328
- * (LCD_D6) PE14 | 4  3 | PE15 (LCD_D7)     (SD_DETECT) PC15 | 4  3 | RESET
329
- *           GND | 2  1 | 5V                             GND | 2  1 | --
325
+ * (BEEPER) PE8  | 1  2 | PE7  (BTN_ENC)         (MISO) PA6  | 1  2 | PA5  (SCK)
326
+ * (LCD_EN) PE9  | 3  4 | PE10 (LCD_RS)       (BTN_EN1) PB2  | 3  4 | PA4  (SD_SS)
327
+ * (LCD_D4) PE12   5  6 | PE13 (LCD_D5)       (BTN_EN2) PB1    5  6 | PA7  (MOSI)
328
+ * (LCD_D6) PE14 | 7  8 | PE15 (LCD_D7)     (SD_DETECT) PC15 | 7  8 | RESET
329
+ *           GND | 9 10 | 5V                             GND | 9 10 | --
330
  *                ------                                      ------
330
  *                ------                                      ------
331
  *                 EXP1                                        EXP2
331
  *                 EXP1                                        EXP2
332
  */
332
  */
333
-#define EXP1_03_PIN                         PE15
334
-#define EXP1_04_PIN                         PE14
335
-#define EXP1_05_PIN                         PE13
336
-#define EXP1_06_PIN                         PE12
337
-#define EXP1_07_PIN                         PE10
338
-#define EXP1_08_PIN                         PE9
339
-#define EXP1_09_PIN                         PE7
340
-#define EXP1_10_PIN                         PE8
341
-
342
-#define EXP2_03_PIN                         -1
343
-#define EXP2_04_PIN                         PC15
344
-#define EXP2_05_PIN                         PA7
345
-#define EXP2_06_PIN                         PB2
346
-#define EXP2_07_PIN                         PA4
347
-#define EXP2_08_PIN                         PB1
348
-#define EXP2_09_PIN                         PA5
349
-#define EXP2_10_PIN                         PA6
333
+#define EXP1_08_PIN                         PE15
334
+#define EXP1_07_PIN                         PE14
335
+#define EXP1_06_PIN                         PE13
336
+#define EXP1_05_PIN                         PE12
337
+#define EXP1_04_PIN                         PE10
338
+#define EXP1_03_PIN                         PE9
339
+#define EXP1_02_PIN                         PE7
340
+#define EXP1_01_PIN                         PE8
341
+
342
+#define EXP2_08_PIN                         -1
343
+#define EXP2_07_PIN                         PC15
344
+#define EXP2_06_PIN                         PA7
345
+#define EXP2_05_PIN                         PB2
346
+#define EXP2_04_PIN                         PA4
347
+#define EXP2_03_PIN                         PB1
348
+#define EXP2_02_PIN                         PA5
349
+#define EXP2_01_PIN                         PA6
350
 
350
 
351
 //
351
 //
352
 // Onboard SD card
352
 // Onboard SD card
376
 #if ENABLED(BTT_MOTOR_EXPANSION)
376
 #if ENABLED(BTT_MOTOR_EXPANSION)
377
   /**
377
   /**
378
    *         ------                  ------
378
    *         ------                  ------
379
-   * M3DIAG |10  9 | M3RX     M3STP |10  9 | M3DIR
380
-   * M2DIAG | 8  7 | M2RX     M2STP | 8  7 | M2DIR
381
-   * M1DIAG   6  5 | M1RX     M1DIR   6  5 | M1STP
382
-   *   M3EN | 4  3 | M2EN      M1EN | 4  3 | --
383
-   *    GND | 2  1 | --         GND | 2  1 | --
379
+   * M3DIAG | 1  2 | M3RX     M3STP | 1  2 | M3DIR
380
+   * M2DIAG | 3  4 | M2RX     M2STP | 3  4 | M2DIR
381
+   * M1DIAG   5  6 | M1RX     M1DIR   5  6 | M1STP
382
+   *   M3EN | 7  8 | M2EN      M1EN | 7  8 | --
383
+   *    GND | 9 10 | --         GND | 9 10 | --
384
    *        ------                   ------
384
    *        ------                   ------
385
    *         EXP1                     EXP2
385
    *         EXP1                     EXP2
386
    */
386
    */
387
 
387
 
388
   // M1 on Driver Expansion Module
388
   // M1 on Driver Expansion Module
389
-  #define E4_STEP_PIN                EXP2_05_PIN
390
-  #define E4_DIR_PIN                 EXP2_06_PIN
391
-  #define E4_ENABLE_PIN              EXP2_04_PIN
392
-  #define E4_DIAG_PIN                EXP1_06_PIN
393
-  #define E4_CS_PIN                  EXP1_05_PIN
389
+  #define E4_STEP_PIN                EXP2_06_PIN
390
+  #define E4_DIR_PIN                 EXP2_05_PIN
391
+  #define E4_ENABLE_PIN              EXP2_07_PIN
392
+  #define E4_DIAG_PIN                EXP1_05_PIN
393
+  #define E4_CS_PIN                  EXP1_06_PIN
394
   #if HAS_TMC_UART
394
   #if HAS_TMC_UART
395
-    #define E4_SERIAL_TX_PIN         EXP1_05_PIN
395
+    #define E4_SERIAL_TX_PIN         EXP1_06_PIN
396
     #define E4_SERIAL_RX_PIN    E4_SERIAL_TX_PIN
396
     #define E4_SERIAL_RX_PIN    E4_SERIAL_TX_PIN
397
   #endif
397
   #endif
398
 
398
 
399
   // M2 on Driver Expansion Module
399
   // M2 on Driver Expansion Module
400
-  #define E5_STEP_PIN                EXP2_08_PIN
401
-  #define E5_DIR_PIN                 EXP2_07_PIN
402
-  #define E5_ENABLE_PIN              EXP1_03_PIN
403
-  #define E5_DIAG_PIN                EXP1_08_PIN
404
-  #define E5_CS_PIN                  EXP1_07_PIN
400
+  #define E5_STEP_PIN                EXP2_03_PIN
401
+  #define E5_DIR_PIN                 EXP2_04_PIN
402
+  #define E5_ENABLE_PIN              EXP1_08_PIN
403
+  #define E5_DIAG_PIN                EXP1_03_PIN
404
+  #define E5_CS_PIN                  EXP1_04_PIN
405
   #if HAS_TMC_UART
405
   #if HAS_TMC_UART
406
-    #define E5_SERIAL_TX_PIN         EXP1_07_PIN
406
+    #define E5_SERIAL_TX_PIN         EXP1_04_PIN
407
     #define E5_SERIAL_RX_PIN    E5_SERIAL_TX_PIN
407
     #define E5_SERIAL_RX_PIN    E5_SERIAL_TX_PIN
408
   #endif
408
   #endif
409
 
409
 
410
   // M3 on Driver Expansion Module
410
   // M3 on Driver Expansion Module
411
-  #define E6_STEP_PIN                EXP2_10_PIN
412
-  #define E6_DIR_PIN                 EXP2_09_PIN
413
-  #define E6_ENABLE_PIN              EXP1_04_PIN
414
-  #define E6_DIAG_PIN                EXP1_10_PIN
415
-  #define E6_CS_PIN                  EXP1_09_PIN
411
+  #define E6_STEP_PIN                EXP2_01_PIN
412
+  #define E6_DIR_PIN                 EXP2_02_PIN
413
+  #define E6_ENABLE_PIN              EXP1_07_PIN
414
+  #define E6_DIAG_PIN                EXP1_01_PIN
415
+  #define E6_CS_PIN                  EXP1_02_PIN
416
   #if HAS_TMC_UART
416
   #if HAS_TMC_UART
417
-    #define E6_SERIAL_TX_PIN         EXP1_09_PIN
417
+    #define E6_SERIAL_TX_PIN         EXP1_02_PIN
418
     #define E6_SERIAL_RX_PIN    E6_SERIAL_TX_PIN
418
     #define E6_SERIAL_RX_PIN    E6_SERIAL_TX_PIN
419
   #endif
419
   #endif
420
 
420
 
426
 #if IS_TFTGLCD_PANEL
426
 #if IS_TFTGLCD_PANEL
427
 
427
 
428
   #if ENABLED(TFTGLCD_PANEL_SPI)
428
   #if ENABLED(TFTGLCD_PANEL_SPI)
429
-    #define TFTGLCD_CS               EXP2_08_PIN
429
+    #define TFTGLCD_CS               EXP2_03_PIN
430
   #endif
430
   #endif
431
 
431
 
432
 #elif HAS_WIRED_LCD
432
 #elif HAS_WIRED_LCD
433
 
433
 
434
-  #define BEEPER_PIN                 EXP1_10_PIN
435
-  #define BTN_ENC                    EXP1_09_PIN
434
+  #define BEEPER_PIN                 EXP1_01_PIN
435
+  #define BTN_ENC                    EXP1_02_PIN
436
 
436
 
437
   #if ENABLED(CR10_STOCKDISPLAY)
437
   #if ENABLED(CR10_STOCKDISPLAY)
438
 
438
 
439
-    #define LCD_PINS_RS              EXP1_04_PIN
439
+    #define LCD_PINS_RS              EXP1_07_PIN
440
 
440
 
441
-    #define BTN_EN1                  EXP1_08_PIN
442
-    #define BTN_EN2                  EXP1_06_PIN
441
+    #define BTN_EN1                  EXP1_03_PIN
442
+    #define BTN_EN2                  EXP1_05_PIN
443
 
443
 
444
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
445
-    #define LCD_PINS_D4              EXP1_05_PIN
444
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
445
+    #define LCD_PINS_D4              EXP1_06_PIN
446
 
446
 
447
   #else
447
   #else
448
 
448
 
449
-    #define LCD_PINS_RS              EXP1_07_PIN
449
+    #define LCD_PINS_RS              EXP1_04_PIN
450
 
450
 
451
-    #define BTN_EN1                  EXP2_08_PIN
452
-    #define BTN_EN2                  EXP2_06_PIN
451
+    #define BTN_EN1                  EXP2_03_PIN
452
+    #define BTN_EN2                  EXP2_05_PIN
453
 
453
 
454
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
455
-    #define LCD_PINS_D4              EXP1_06_PIN
454
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
455
+    #define LCD_PINS_D4              EXP1_05_PIN
456
 
456
 
457
     #if ENABLED(FYSETC_MINI_12864)
457
     #if ENABLED(FYSETC_MINI_12864)
458
-      #define DOGLCD_CS              EXP1_08_PIN
459
-      #define DOGLCD_A0              EXP1_07_PIN
458
+      #define DOGLCD_CS              EXP1_03_PIN
459
+      #define DOGLCD_A0              EXP1_04_PIN
460
       //#define LCD_BACKLIGHT_PIN           -1
460
       //#define LCD_BACKLIGHT_PIN           -1
461
-      #define LCD_RESET_PIN          EXP1_06_PIN  // Must be high or open for LCD to operate normally.
461
+      #define LCD_RESET_PIN          EXP1_05_PIN  // Must be high or open for LCD to operate normally.
462
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
462
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
463
         #ifndef RGB_LED_R_PIN
463
         #ifndef RGB_LED_R_PIN
464
-          #define RGB_LED_R_PIN      EXP1_05_PIN
464
+          #define RGB_LED_R_PIN      EXP1_06_PIN
465
         #endif
465
         #endif
466
         #ifndef RGB_LED_G_PIN
466
         #ifndef RGB_LED_G_PIN
467
-          #define RGB_LED_G_PIN      EXP1_04_PIN
467
+          #define RGB_LED_G_PIN      EXP1_07_PIN
468
         #endif
468
         #endif
469
         #ifndef RGB_LED_B_PIN
469
         #ifndef RGB_LED_B_PIN
470
-          #define RGB_LED_B_PIN      EXP1_03_PIN
470
+          #define RGB_LED_B_PIN      EXP1_08_PIN
471
         #endif
471
         #endif
472
       #elif ENABLED(FYSETC_MINI_12864_2_1)
472
       #elif ENABLED(FYSETC_MINI_12864_2_1)
473
-        #define NEOPIXEL_PIN         EXP1_05_PIN
473
+        #define NEOPIXEL_PIN         EXP1_06_PIN
474
       #endif
474
       #endif
475
     #endif // !FYSETC_MINI_12864
475
     #endif // !FYSETC_MINI_12864
476
 
476
 
477
     #if IS_ULTIPANEL
477
     #if IS_ULTIPANEL
478
-      #define LCD_PINS_D5            EXP1_05_PIN
479
-      #define LCD_PINS_D6            EXP1_04_PIN
480
-      #define LCD_PINS_D7            EXP1_03_PIN
478
+      #define LCD_PINS_D5            EXP1_06_PIN
479
+      #define LCD_PINS_D6            EXP1_07_PIN
480
+      #define LCD_PINS_D7            EXP1_08_PIN
481
 
481
 
482
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
482
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
483
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
483
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
496
 #endif
496
 #endif
497
 
497
 
498
 #if HAS_SPI_TFT
498
 #if HAS_SPI_TFT
499
-  #define TFT_CS_PIN                 EXP2_07_PIN
500
-  #define TFT_A0_PIN                 EXP2_04_PIN
501
-  #define TFT_SCK_PIN                EXP2_09_PIN
502
-  #define TFT_MISO_PIN               EXP2_10_PIN
503
-  #define TFT_MOSI_PIN               EXP2_05_PIN
504
-
505
-  #define TOUCH_INT_PIN              EXP1_04_PIN
506
-  #define TOUCH_MISO_PIN             EXP1_05_PIN
507
-  #define TOUCH_MOSI_PIN             EXP1_08_PIN
508
-  #define TOUCH_SCK_PIN              EXP1_06_PIN
509
-  #define TOUCH_CS_PIN               EXP1_07_PIN
510
-
511
-  #define BTN_EN1                    EXP2_08_PIN
512
-  #define BTN_EN2                    EXP2_06_PIN
513
-  #define BTN_ENC                    EXP1_09_PIN
499
+  #define TFT_CS_PIN                 EXP2_04_PIN
500
+  #define TFT_A0_PIN                 EXP2_07_PIN
501
+  #define TFT_SCK_PIN                EXP2_02_PIN
502
+  #define TFT_MISO_PIN               EXP2_01_PIN
503
+  #define TFT_MOSI_PIN               EXP2_06_PIN
504
+
505
+  #define TOUCH_INT_PIN              EXP1_07_PIN
506
+  #define TOUCH_MISO_PIN             EXP1_06_PIN
507
+  #define TOUCH_MOSI_PIN             EXP1_03_PIN
508
+  #define TOUCH_SCK_PIN              EXP1_05_PIN
509
+  #define TOUCH_CS_PIN               EXP1_04_PIN
510
+
511
+  #define BTN_EN1                    EXP2_03_PIN
512
+  #define BTN_EN2                    EXP2_05_PIN
513
+  #define BTN_ENC                    EXP1_02_PIN
514
 #endif
514
 #endif
515
 
515
 
516
 //
516
 //

+ 90
- 90
Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h 查看文件

313
 #endif
313
 #endif
314
 
314
 
315
 /**               ------                                      ------
315
 /**               ------                                      ------
316
- * (BEEPER) PG4  |10  9 | PA8  (BTN_ENC)         (MISO) PB14 |10  9 | PB13 (SCK)
317
- * (LCD_EN) PD11 | 8  7 | PD10 (LCD_RS)       (BTN_EN1) PG10 | 8  7 | PB12 (SD_SS)
318
- * (LCD_D4) PG2    6  5 | PG3  (LCD_D5)       (BTN_EN2) PF11   6  5 | PB15 (MOSI)
319
- * (LCD_D6) PG6  | 4  3 | PG7  (LCD_D7)     (SD_DETECT) PF12 | 4  3 | RESET
320
- *           GND | 2  1 | 5V                             GND | 2  1 | --
316
+ * (BEEPER) PG4  | 1  2 | PA8  (BTN_ENC)         (MISO) PB14 | 1  2 | PB13 (SCK)
317
+ * (LCD_EN) PD11 | 3  4 | PD10 (LCD_RS)       (BTN_EN1) PG10 | 3  4 | PB12 (SD_SS)
318
+ * (LCD_D4) PG2    5  6 | PG3  (LCD_D5)       (BTN_EN2) PF11   5  6 | PB15 (MOSI)
319
+ * (LCD_D6) PG6  | 7  8 | PG7  (LCD_D7)     (SD_DETECT) PF12 | 7  8 | RESET
320
+ *           GND | 9 10 | 5V                             GND | 9 10 | --
321
  *                ------                                      ------
321
  *                ------                                      ------
322
  *                 EXP1                                        EXP2
322
  *                 EXP1                                        EXP2
323
  */
323
  */
324
-#define EXP1_03_PIN                         PG7
325
-#define EXP1_04_PIN                         PG6
326
-#define EXP1_05_PIN                         PG3
327
-#define EXP1_06_PIN                         PG2
328
-#define EXP1_07_PIN                         PD10
329
-#define EXP1_08_PIN                         PD11
330
-#define EXP1_09_PIN                         PA8
331
-#define EXP1_10_PIN                         PG4
332
-
333
-#define EXP2_03_PIN                         -1
334
-#define EXP2_04_PIN                         PF12
335
-#define EXP2_05_PIN                         PB15
336
-#define EXP2_06_PIN                         PF11
337
-#define EXP2_07_PIN                         PB12
338
-#define EXP2_08_PIN                         PG10
339
-#define EXP2_09_PIN                         PB13
340
-#define EXP2_10_PIN                         PB14
324
+#define EXP1_08_PIN                         PG7
325
+#define EXP1_07_PIN                         PG6
326
+#define EXP1_06_PIN                         PG3
327
+#define EXP1_05_PIN                         PG2
328
+#define EXP1_04_PIN                         PD10
329
+#define EXP1_03_PIN                         PD11
330
+#define EXP1_02_PIN                         PA8
331
+#define EXP1_01_PIN                         PG4
332
+
333
+#define EXP2_08_PIN                         -1
334
+#define EXP2_07_PIN                         PF12
335
+#define EXP2_06_PIN                         PB15
336
+#define EXP2_05_PIN                         PF11
337
+#define EXP2_04_PIN                         PB12
338
+#define EXP2_03_PIN                         PG10
339
+#define EXP2_02_PIN                         PB13
340
+#define EXP2_01_PIN                         PB14
341
 
341
 
342
 //
342
 //
343
 // Onboard SD card
343
 // Onboard SD card
345
 //
345
 //
346
 #if SD_CONNECTION_IS(LCD)
346
 #if SD_CONNECTION_IS(LCD)
347
 
347
 
348
-  #define SD_DETECT_PIN              EXP2_04_PIN
349
-  #define SDSS                       EXP2_07_PIN
348
+  #define SD_DETECT_PIN              EXP2_07_PIN
349
+  #define SDSS                       EXP2_04_PIN
350
 
350
 
351
 #elif SD_CONNECTION_IS(ONBOARD)
351
 #elif SD_CONNECTION_IS(ONBOARD)
352
 
352
 
379
    */
379
    */
380
 
380
 
381
   // M1 on Driver Expansion Module
381
   // M1 on Driver Expansion Module
382
-  #define E3_STEP_PIN                EXP2_05_PIN
383
-  #define E3_DIR_PIN                 EXP2_06_PIN
384
-  #define E3_ENABLE_PIN              EXP2_04_PIN
382
+  #define E3_STEP_PIN                EXP2_06_PIN
383
+  #define E3_DIR_PIN                 EXP2_05_PIN
384
+  #define E3_ENABLE_PIN              EXP2_07_PIN
385
   #if !EXP_MOT_USE_EXP2_ONLY
385
   #if !EXP_MOT_USE_EXP2_ONLY
386
-    #define E3_DIAG_PIN              EXP1_06_PIN
387
-    #define E3_CS_PIN                EXP1_05_PIN
386
+    #define E3_DIAG_PIN              EXP1_05_PIN
387
+    #define E3_CS_PIN                EXP1_06_PIN
388
     #if HAS_TMC_UART
388
     #if HAS_TMC_UART
389
-      #define E3_SERIAL_TX_PIN       EXP1_05_PIN
390
-      #define E3_SERIAL_RX_PIN       EXP1_05_PIN
389
+      #define E3_SERIAL_TX_PIN       EXP1_06_PIN
390
+      #define E3_SERIAL_RX_PIN       EXP1_06_PIN
391
     #endif
391
     #endif
392
   #endif
392
   #endif
393
 
393
 
394
   // M2 on Driver Expansion Module
394
   // M2 on Driver Expansion Module
395
-  #define E4_STEP_PIN                EXP2_08_PIN
396
-  #define E4_DIR_PIN                 EXP2_07_PIN
395
+  #define E4_STEP_PIN                EXP2_03_PIN
396
+  #define E4_DIR_PIN                 EXP2_04_PIN
397
   #if !EXP_MOT_USE_EXP2_ONLY
397
   #if !EXP_MOT_USE_EXP2_ONLY
398
-    #define E4_ENABLE_PIN            EXP1_03_PIN
399
-    #define E4_DIAG_PIN              EXP1_08_PIN
400
-    #define E4_CS_PIN                EXP1_07_PIN
398
+    #define E4_ENABLE_PIN            EXP1_08_PIN
399
+    #define E4_DIAG_PIN              EXP1_03_PIN
400
+    #define E4_CS_PIN                EXP1_04_PIN
401
     #if HAS_TMC_UART
401
     #if HAS_TMC_UART
402
-      #define E4_SERIAL_TX_PIN       EXP1_07_PIN
403
-      #define E4_SERIAL_RX_PIN       EXP1_07_PIN
402
+      #define E4_SERIAL_TX_PIN       EXP1_04_PIN
403
+      #define E4_SERIAL_RX_PIN       EXP1_04_PIN
404
     #endif
404
     #endif
405
   #else
405
   #else
406
-    #define E4_ENABLE_PIN            EXP2_04_PIN
406
+    #define E4_ENABLE_PIN            EXP2_07_PIN
407
   #endif
407
   #endif
408
 
408
 
409
   // M3 on Driver Expansion Module
409
   // M3 on Driver Expansion Module
410
-  #define E5_STEP_PIN                EXP2_10_PIN
411
-  #define E5_DIR_PIN                 EXP2_09_PIN
410
+  #define E5_STEP_PIN                EXP2_01_PIN
411
+  #define E5_DIR_PIN                 EXP2_02_PIN
412
   #if !EXP_MOT_USE_EXP2_ONLY
412
   #if !EXP_MOT_USE_EXP2_ONLY
413
-    #define E5_ENABLE_PIN            EXP1_04_PIN
414
-    #define E5_DIAG_PIN              EXP1_10_PIN
415
-    #define E5_CS_PIN                EXP1_09_PIN
413
+    #define E5_ENABLE_PIN            EXP1_07_PIN
414
+    #define E5_DIAG_PIN              EXP1_01_PIN
415
+    #define E5_CS_PIN                EXP1_02_PIN
416
     #if HAS_TMC_UART
416
     #if HAS_TMC_UART
417
-      #define E5_SERIAL_TX_PIN       EXP1_09_PIN
418
-      #define E5_SERIAL_RX_PIN       EXP1_09_PIN
417
+      #define E5_SERIAL_TX_PIN       EXP1_02_PIN
418
+      #define E5_SERIAL_RX_PIN       EXP1_02_PIN
419
     #endif
419
     #endif
420
   #else
420
   #else
421
-    #define E5_ENABLE_PIN            EXP2_04_PIN
421
+    #define E5_ENABLE_PIN            EXP2_07_PIN
422
   #endif
422
   #endif
423
 
423
 
424
 #endif // BTT_MOTOR_EXPANSION
424
 #endif // BTT_MOTOR_EXPANSION
429
 #if IS_TFTGLCD_PANEL
429
 #if IS_TFTGLCD_PANEL
430
 
430
 
431
   #if ENABLED(TFTGLCD_PANEL_SPI)
431
   #if ENABLED(TFTGLCD_PANEL_SPI)
432
-    #define TFTGLCD_CS               EXP2_08_PIN
432
+    #define TFTGLCD_CS               EXP2_03_PIN
433
   #endif
433
   #endif
434
 
434
 
435
 #elif HAS_WIRED_LCD
435
 #elif HAS_WIRED_LCD
436
 
436
 
437
-  #define BEEPER_PIN                 EXP1_10_PIN
438
-  #define BTN_ENC                    EXP1_09_PIN
437
+  #define BEEPER_PIN                 EXP1_01_PIN
438
+  #define BTN_ENC                    EXP1_02_PIN
439
 
439
 
440
   #if ENABLED(CR10_STOCKDISPLAY)
440
   #if ENABLED(CR10_STOCKDISPLAY)
441
 
441
 
442
-    #define LCD_PINS_RS              EXP1_04_PIN
442
+    #define LCD_PINS_RS              EXP1_07_PIN
443
 
443
 
444
-    #define BTN_EN1                  EXP1_08_PIN
445
-    #define BTN_EN2                  EXP1_06_PIN
444
+    #define BTN_EN1                  EXP1_03_PIN
445
+    #define BTN_EN2                  EXP1_05_PIN
446
 
446
 
447
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
448
-    #define LCD_PINS_D4              EXP1_05_PIN
447
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
448
+    #define LCD_PINS_D4              EXP1_06_PIN
449
 
449
 
450
   #elif ENABLED(MKS_MINI_12864)
450
   #elif ENABLED(MKS_MINI_12864)
451
 
451
 
452
-    #define DOGLCD_A0                EXP1_04_PIN
453
-    #define DOGLCD_CS                EXP1_05_PIN
454
-    #define BTN_EN1                  EXP2_08_PIN
455
-    #define BTN_EN2                  EXP2_06_PIN
452
+    #define DOGLCD_A0                EXP1_07_PIN
453
+    #define DOGLCD_CS                EXP1_06_PIN
454
+    #define BTN_EN1                  EXP2_03_PIN
455
+    #define BTN_EN2                  EXP2_05_PIN
456
 
456
 
457
   #elif ENABLED(WYH_L12864)
457
   #elif ENABLED(WYH_L12864)
458
 
458
 
470
      *
470
      *
471
      *                  BEFORE                     AFTER
471
      *                  BEFORE                     AFTER
472
      *                  ------                     ------
472
      *                  ------                     ------
473
-     *              -- |10  9 | MOSI           -- |10  9 | MOSI
474
-     *         BTN_ENC | 8  7 | SCK       BTN_ENC | 8  7 | SCK
475
-     *         BTN_EN1 | 6  5   SID       BTN_EN1 | 6  5   SID
476
-     *         BTN_EN2 | 4  3 | CS        BTN_EN2 | 4  3 | CS
477
-     *              5V | 2  1 | GND           GND | 2  1 | 5V
473
+     *              -- | 1  2 | MOSI           -- | 1  2 | MOSI
474
+     *         BTN_ENC | 3  4 | SCK       BTN_ENC | 3  4 | SCK
475
+     *         BTN_EN1 | 5  6   SID       BTN_EN1 | 5  6   SID
476
+     *         BTN_EN2 | 7  8 | CS        BTN_EN2 | 7  8 | CS
477
+     *              5V | 9 10 | GND           GND | 9 10 | 5V
478
      *                  ------                     ------
478
      *                  ------                     ------
479
      *                   LCD                        LCD
479
      *                   LCD                        LCD
480
      */
480
      */
481
     #undef BEEPER_PIN
481
     #undef BEEPER_PIN
482
     #undef BTN_ENC
482
     #undef BTN_ENC
483
-    #define BTN_EN1                  EXP1_06_PIN
484
-    #define BTN_EN2                  EXP1_04_PIN
485
-    #define BTN_ENC                  EXP1_08_PIN
486
-    #define DOGLCD_CS                EXP1_03_PIN
487
-    #define DOGLCD_A0                EXP1_05_PIN
488
-    #define DOGLCD_SCK               EXP1_07_PIN
489
-    #define DOGLCD_MOSI              EXP1_09_PIN
483
+    #define BTN_EN1                  EXP1_05_PIN
484
+    #define BTN_EN2                  EXP1_07_PIN
485
+    #define BTN_ENC                  EXP1_03_PIN
486
+    #define DOGLCD_CS                EXP1_08_PIN
487
+    #define DOGLCD_A0                EXP1_06_PIN
488
+    #define DOGLCD_SCK               EXP1_04_PIN
489
+    #define DOGLCD_MOSI              EXP1_02_PIN
490
     #define LCD_BACKLIGHT_PIN            -1
490
     #define LCD_BACKLIGHT_PIN            -1
491
 
491
 
492
   #else
492
   #else
493
 
493
 
494
-    #define LCD_PINS_RS              EXP1_07_PIN
494
+    #define LCD_PINS_RS              EXP1_04_PIN
495
 
495
 
496
-    #define BTN_EN1                  EXP2_08_PIN
497
-    #define BTN_EN2                  EXP2_06_PIN
496
+    #define BTN_EN1                  EXP2_03_PIN
497
+    #define BTN_EN2                  EXP2_05_PIN
498
 
498
 
499
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
500
-    #define LCD_PINS_D4              EXP1_06_PIN
499
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
500
+    #define LCD_PINS_D4              EXP1_05_PIN
501
 
501
 
502
     #if ENABLED(FYSETC_MINI_12864)
502
     #if ENABLED(FYSETC_MINI_12864)
503
-      #define DOGLCD_CS              EXP1_08_PIN
504
-      #define DOGLCD_A0              EXP1_07_PIN
503
+      #define DOGLCD_CS              EXP1_03_PIN
504
+      #define DOGLCD_A0              EXP1_04_PIN
505
       //#define LCD_BACKLIGHT_PIN           -1
505
       //#define LCD_BACKLIGHT_PIN           -1
506
-      #define LCD_RESET_PIN          EXP1_06_PIN  // Must be high or open for LCD to operate normally.
506
+      #define LCD_RESET_PIN          EXP1_05_PIN  // Must be high or open for LCD to operate normally.
507
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
507
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
508
         #ifndef RGB_LED_R_PIN
508
         #ifndef RGB_LED_R_PIN
509
-          #define RGB_LED_R_PIN      EXP1_05_PIN
509
+          #define RGB_LED_R_PIN      EXP1_06_PIN
510
         #endif
510
         #endif
511
         #ifndef RGB_LED_G_PIN
511
         #ifndef RGB_LED_G_PIN
512
-          #define RGB_LED_G_PIN      EXP1_04_PIN
512
+          #define RGB_LED_G_PIN      EXP1_07_PIN
513
         #endif
513
         #endif
514
         #ifndef RGB_LED_B_PIN
514
         #ifndef RGB_LED_B_PIN
515
-          #define RGB_LED_B_PIN      EXP1_03_PIN
515
+          #define RGB_LED_B_PIN      EXP1_08_PIN
516
         #endif
516
         #endif
517
       #elif ENABLED(FYSETC_MINI_12864_2_1)
517
       #elif ENABLED(FYSETC_MINI_12864_2_1)
518
-        #define NEOPIXEL_PIN         EXP1_05_PIN
518
+        #define NEOPIXEL_PIN         EXP1_06_PIN
519
       #endif
519
       #endif
520
     #endif // !FYSETC_MINI_12864
520
     #endif // !FYSETC_MINI_12864
521
 
521
 
522
     #if IS_ULTIPANEL
522
     #if IS_ULTIPANEL
523
-      #define LCD_PINS_D5            EXP1_05_PIN
524
-      #define LCD_PINS_D6            EXP1_04_PIN
525
-      #define LCD_PINS_D7            EXP1_03_PIN
523
+      #define LCD_PINS_D5            EXP1_06_PIN
524
+      #define LCD_PINS_D6            EXP1_07_PIN
525
+      #define LCD_PINS_D7            EXP1_08_PIN
526
 
526
 
527
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
527
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
528
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
528
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
553
 
553
 
554
 /**
554
 /**
555
  *          ------
555
  *          ------
556
- *      RX | 8  7 | 3.3V      GPIO0  PF14 ... Leave as unused (ESP3D software configures this with a pullup so OK to leave as floating)
557
- *   GPIO0 | 6  5 | Reset     GPIO2  PF15 ... must be high (ESP3D software configures this with a pullup so OK to leave as floating)
558
- *   GPIO2 | 4  3 | Enable    Reset  PG0  ... active low, probably OK to leave floating
559
- *     GND | 2  1 | TX        Enable PG1  ... Must be high for module to run
556
+ *      RX | 3  4 | 3.3V      GPIO0  PF14 ... Leave as unused (ESP3D software configures this with a pullup so OK to leave as floating)
557
+ *   GPIO0 | 5  6 | Reset     GPIO2  PF15 ... must be high (ESP3D software configures this with a pullup so OK to leave as floating)
558
+ *   GPIO2 | 7  8 | Enable    Reset  PG0  ... active low, probably OK to leave floating
559
+ *     GND | 9 10 | TX        Enable PG1  ... Must be high for module to run
560
  *          ------
560
  *          ------
561
  *            W1
561
  *            W1
562
  */
562
  */

+ 91
- 91
Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h 查看文件

336
 
336
 
337
 /**
337
 /**
338
  *                ------                                   ------
338
  *                ------                                   ------
339
- * (BEEPER) PC5  |10  9 | PB0  (BTN_ENC)  (MISO)      PA6 |10  9 | PA5 (SCK)
340
- * (LCD_EN) PB1  | 8  7 | PE9  (LCD_RS)   (BTN_EN1)   PE7 | 8  7 | PA4 (SD_SS)
341
- * (LCD_D4) PE10 | 6  5   PE11 (LCD_D5)   (BTN_EN2)   PB2 | 6  5   PA7 (MOSI)
342
- * (LCD_D6) PE12 | 4  3 | PE13 (LCD_D7)   (SD_DETECT) PC4 | 4  3 | RESET
343
- *           GND | 2  1 | 5V                          GND | 2  1 | --
339
+ * (BEEPER) PC5  | 1  2 | PB0  (BTN_ENC)  (MISO)      PA6 | 1  2 | PA5 (SCK)
340
+ * (LCD_EN) PB1  | 3  4 | PE9  (LCD_RS)   (BTN_EN1)   PE7 | 3  4 | PA4 (SD_SS)
341
+ * (LCD_D4) PE10 | 5  6   PE11 (LCD_D5)   (BTN_EN2)   PB2 | 5  6   PA7 (MOSI)
342
+ * (LCD_D6) PE12 | 7  8 | PE13 (LCD_D7)   (SD_DETECT) PC4 | 7  8 | RESET
343
+ *           GND | 9 10 | 5V                          GND | 9 10 | --
344
  *                ------                                   ------
344
  *                ------                                   ------
345
  *                 EXP1                                     EXP2
345
  *                 EXP1                                     EXP2
346
  */
346
  */
347
-#define EXP1_03_PIN                         PE13
348
-#define EXP1_04_PIN                         PE12
349
-#define EXP1_05_PIN                         PE11
350
-#define EXP1_06_PIN                         PE10
351
-#define EXP1_07_PIN                         PE9
352
-#define EXP1_08_PIN                         PB1
353
-#define EXP1_09_PIN                         PB0
354
-#define EXP1_10_PIN                         PC5
355
-
356
-#define EXP2_03_PIN                         -1
357
-#define EXP2_04_PIN                         PC4
358
-#define EXP2_05_PIN                         PA7
359
-#define EXP2_06_PIN                         PB2
360
-#define EXP2_07_PIN                         PA4
361
-#define EXP2_08_PIN                         PE7
362
-#define EXP2_09_PIN                         PA5
363
-#define EXP2_10_PIN                         PA6
347
+#define EXP1_08_PIN                         PE13
348
+#define EXP1_07_PIN                         PE12
349
+#define EXP1_06_PIN                         PE11
350
+#define EXP1_05_PIN                         PE10
351
+#define EXP1_04_PIN                         PE9
352
+#define EXP1_03_PIN                         PB1
353
+#define EXP1_02_PIN                         PB0
354
+#define EXP1_01_PIN                         PC5
355
+
356
+#define EXP2_08_PIN                         -1
357
+#define EXP2_07_PIN                         PC4
358
+#define EXP2_06_PIN                         PA7
359
+#define EXP2_05_PIN                         PB2
360
+#define EXP2_04_PIN                         PA4
361
+#define EXP2_03_PIN                         PE7
362
+#define EXP2_02_PIN                         PA5
363
+#define EXP2_01_PIN                         PA6
364
 
364
 
365
 //
365
 //
366
 // Onboard SD card
366
 // Onboard SD card
367
 // Must use soft SPI because Marlin's default hardware SPI is tied to LCD's EXP2
367
 // Must use soft SPI because Marlin's default hardware SPI is tied to LCD's EXP2
368
 //
368
 //
369
 #if SD_CONNECTION_IS(LCD)
369
 #if SD_CONNECTION_IS(LCD)
370
-  #define SDSS                       EXP2_07_PIN
370
+  #define SDSS                       EXP2_04_PIN
371
   #define SD_SS_PIN                         SDSS
371
   #define SD_SS_PIN                         SDSS
372
-  #define SD_SCK_PIN                 EXP2_09_PIN
373
-  #define SD_MISO_PIN                EXP2_10_PIN
374
-  #define SD_MOSI_PIN                EXP2_05_PIN
375
-  #define SD_DETECT_PIN              EXP2_04_PIN
372
+  #define SD_SCK_PIN                 EXP2_02_PIN
373
+  #define SD_MISO_PIN                EXP2_01_PIN
374
+  #define SD_MOSI_PIN                EXP2_06_PIN
375
+  #define SD_DETECT_PIN              EXP2_07_PIN
376
 #elif SD_CONNECTION_IS(ONBOARD)
376
 #elif SD_CONNECTION_IS(ONBOARD)
377
   #define SDIO_SUPPORT                            // Use SDIO for onboard SD
377
   #define SDIO_SUPPORT                            // Use SDIO for onboard SD
378
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
378
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
393
    */
393
    */
394
 
394
 
395
   // M1 on Driver Expansion Module
395
   // M1 on Driver Expansion Module
396
-  #define E2_STEP_PIN                EXP2_05_PIN
397
-  #define E2_DIR_PIN                 EXP2_06_PIN
398
-  #define E2_ENABLE_PIN              EXP2_04_PIN
396
+  #define E2_STEP_PIN                EXP2_06_PIN
397
+  #define E2_DIR_PIN                 EXP2_05_PIN
398
+  #define E2_ENABLE_PIN              EXP2_07_PIN
399
   #if !EXP_MOT_USE_EXP2_ONLY
399
   #if !EXP_MOT_USE_EXP2_ONLY
400
-    #define E2_DIAG_PIN              EXP1_06_PIN
401
-    #define E2_CS_PIN                EXP1_05_PIN
400
+    #define E2_DIAG_PIN              EXP1_05_PIN
401
+    #define E2_CS_PIN                EXP1_06_PIN
402
     #if HAS_TMC_UART
402
     #if HAS_TMC_UART
403
-      #define E2_SERIAL_TX_PIN       EXP1_05_PIN
404
-      #define E2_SERIAL_RX_PIN       EXP1_05_PIN
403
+      #define E2_SERIAL_TX_PIN       EXP1_06_PIN
404
+      #define E2_SERIAL_RX_PIN       EXP1_06_PIN
405
     #endif
405
     #endif
406
   #endif
406
   #endif
407
 
407
 
408
   // M2 on Driver Expansion Module
408
   // M2 on Driver Expansion Module
409
-  #define E3_STEP_PIN                EXP2_08_PIN
410
-  #define E3_DIR_PIN                 EXP2_07_PIN
409
+  #define E3_STEP_PIN                EXP2_03_PIN
410
+  #define E3_DIR_PIN                 EXP2_04_PIN
411
   #if !EXP_MOT_USE_EXP2_ONLY
411
   #if !EXP_MOT_USE_EXP2_ONLY
412
-    #define E3_ENABLE_PIN            EXP1_03_PIN
413
-    #define E3_DIAG_PIN              EXP1_08_PIN
414
-    #define E3_CS_PIN                EXP1_07_PIN
412
+    #define E3_ENABLE_PIN            EXP1_08_PIN
413
+    #define E3_DIAG_PIN              EXP1_03_PIN
414
+    #define E3_CS_PIN                EXP1_04_PIN
415
     #if HAS_TMC_UART
415
     #if HAS_TMC_UART
416
-      #define E3_SERIAL_TX_PIN       EXP1_07_PIN
417
-      #define E3_SERIAL_RX_PIN       EXP1_07_PIN
416
+      #define E3_SERIAL_TX_PIN       EXP1_04_PIN
417
+      #define E3_SERIAL_RX_PIN       EXP1_04_PIN
418
     #endif
418
     #endif
419
   #else
419
   #else
420
-    #define E3_ENABLE_PIN            EXP2_04_PIN
420
+    #define E3_ENABLE_PIN            EXP2_07_PIN
421
   #endif
421
   #endif
422
 
422
 
423
   // M3 on Driver Expansion Module
423
   // M3 on Driver Expansion Module
424
-  #define E4_STEP_PIN                EXP2_10_PIN
425
-  #define E4_DIR_PIN                 EXP2_09_PIN
424
+  #define E4_STEP_PIN                EXP2_01_PIN
425
+  #define E4_DIR_PIN                 EXP2_02_PIN
426
   #if !EXP_MOT_USE_EXP2_ONLY
426
   #if !EXP_MOT_USE_EXP2_ONLY
427
-    #define E4_ENABLE_PIN            EXP1_04_PIN
428
-    #define E4_DIAG_PIN              EXP1_10_PIN
429
-    #define E4_CS_PIN                EXP1_09_PIN
427
+    #define E4_ENABLE_PIN            EXP1_07_PIN
428
+    #define E4_DIAG_PIN              EXP1_01_PIN
429
+    #define E4_CS_PIN                EXP1_02_PIN
430
     #if HAS_TMC_UART
430
     #if HAS_TMC_UART
431
-      #define E4_SERIAL_TX_PIN       EXP1_09_PIN
432
-      #define E4_SERIAL_RX_PIN       EXP1_09_PIN
431
+      #define E4_SERIAL_TX_PIN       EXP1_02_PIN
432
+      #define E4_SERIAL_RX_PIN       EXP1_02_PIN
433
     #endif
433
     #endif
434
   #else
434
   #else
435
-    #define E4_ENABLE_PIN            EXP2_04_PIN
435
+    #define E4_ENABLE_PIN            EXP2_07_PIN
436
   #endif
436
   #endif
437
 
437
 
438
 #endif // BTT_MOTOR_EXPANSION
438
 #endif // BTT_MOTOR_EXPANSION
443
 #if IS_TFTGLCD_PANEL
443
 #if IS_TFTGLCD_PANEL
444
 
444
 
445
   #if ENABLED(TFTGLCD_PANEL_SPI)
445
   #if ENABLED(TFTGLCD_PANEL_SPI)
446
-    #define TFTGLCD_CS               EXP2_08_PIN
446
+    #define TFTGLCD_CS               EXP2_03_PIN
447
   #endif
447
   #endif
448
 
448
 
449
 #elif HAS_WIRED_LCD
449
 #elif HAS_WIRED_LCD
450
 
450
 
451
-  #define BEEPER_PIN                 EXP1_10_PIN
452
-  #define BTN_ENC                    EXP1_09_PIN
451
+  #define BEEPER_PIN                 EXP1_01_PIN
452
+  #define BTN_ENC                    EXP1_02_PIN
453
 
453
 
454
   #if ENABLED(CR10_STOCKDISPLAY)
454
   #if ENABLED(CR10_STOCKDISPLAY)
455
 
455
 
456
-    #define LCD_PINS_RS              EXP1_04_PIN
456
+    #define LCD_PINS_RS              EXP1_07_PIN
457
 
457
 
458
-    #define BTN_EN1                  EXP1_08_PIN
459
-    #define BTN_EN2                  EXP1_06_PIN
458
+    #define BTN_EN1                  EXP1_03_PIN
459
+    #define BTN_EN2                  EXP1_05_PIN
460
 
460
 
461
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
462
-    #define LCD_PINS_D4              EXP1_05_PIN
461
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
462
+    #define LCD_PINS_D4              EXP1_06_PIN
463
 
463
 
464
   #elif ENABLED(MKS_MINI_12864)
464
   #elif ENABLED(MKS_MINI_12864)
465
 
465
 
466
-    #define DOGLCD_A0                EXP1_04_PIN
467
-    #define DOGLCD_CS                EXP1_05_PIN
468
-    #define BTN_EN1                  EXP2_08_PIN
469
-    #define BTN_EN2                  EXP2_06_PIN
466
+    #define DOGLCD_A0                EXP1_07_PIN
467
+    #define DOGLCD_CS                EXP1_06_PIN
468
+    #define BTN_EN1                  EXP2_03_PIN
469
+    #define BTN_EN2                  EXP2_05_PIN
470
 
470
 
471
   #else
471
   #else
472
 
472
 
473
-    #define LCD_PINS_RS              EXP1_07_PIN
473
+    #define LCD_PINS_RS              EXP1_04_PIN
474
 
474
 
475
-    #define BTN_EN1                  EXP2_08_PIN
476
-    #define BTN_EN2                  EXP2_06_PIN
475
+    #define BTN_EN1                  EXP2_03_PIN
476
+    #define BTN_EN2                  EXP2_05_PIN
477
 
477
 
478
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
479
-    #define LCD_PINS_D4              EXP1_06_PIN
478
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
479
+    #define LCD_PINS_D4              EXP1_05_PIN
480
 
480
 
481
     #if ENABLED(FYSETC_MINI_12864)
481
     #if ENABLED(FYSETC_MINI_12864)
482
-      #define DOGLCD_CS              EXP1_08_PIN
483
-      #define DOGLCD_A0              EXP1_07_PIN
482
+      #define DOGLCD_CS              EXP1_03_PIN
483
+      #define DOGLCD_A0              EXP1_04_PIN
484
       //#define LCD_BACKLIGHT_PIN           -1
484
       //#define LCD_BACKLIGHT_PIN           -1
485
-      #define LCD_RESET_PIN          EXP1_06_PIN  // Must be high or open for LCD to operate normally.
485
+      #define LCD_RESET_PIN          EXP1_05_PIN  // Must be high or open for LCD to operate normally.
486
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
486
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
487
         #ifndef RGB_LED_R_PIN
487
         #ifndef RGB_LED_R_PIN
488
-          #define RGB_LED_R_PIN      EXP1_05_PIN
488
+          #define RGB_LED_R_PIN      EXP1_06_PIN
489
         #endif
489
         #endif
490
         #ifndef RGB_LED_G_PIN
490
         #ifndef RGB_LED_G_PIN
491
-          #define RGB_LED_G_PIN      EXP1_04_PIN
491
+          #define RGB_LED_G_PIN      EXP1_07_PIN
492
         #endif
492
         #endif
493
         #ifndef RGB_LED_B_PIN
493
         #ifndef RGB_LED_B_PIN
494
-          #define RGB_LED_B_PIN      EXP1_03_PIN
494
+          #define RGB_LED_B_PIN      EXP1_08_PIN
495
         #endif
495
         #endif
496
       #elif ENABLED(FYSETC_MINI_12864_2_1)
496
       #elif ENABLED(FYSETC_MINI_12864_2_1)
497
-        #define NEOPIXEL_PIN         EXP1_05_PIN
497
+        #define NEOPIXEL_PIN         EXP1_06_PIN
498
       #endif
498
       #endif
499
     #endif // !FYSETC_MINI_12864
499
     #endif // !FYSETC_MINI_12864
500
 
500
 
501
     #if IS_ULTIPANEL
501
     #if IS_ULTIPANEL
502
-      #define LCD_PINS_D5            EXP1_05_PIN
503
-      #define LCD_PINS_D6            EXP1_04_PIN
504
-      #define LCD_PINS_D7            EXP1_03_PIN
502
+      #define LCD_PINS_D5            EXP1_06_PIN
503
+      #define LCD_PINS_D6            EXP1_07_PIN
504
+      #define LCD_PINS_D7            EXP1_08_PIN
505
 
505
 
506
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
506
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
507
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
507
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
528
 
528
 
529
 #if HAS_SPI_TFT
529
 #if HAS_SPI_TFT
530
 
530
 
531
-  #define BTN_EN1                    EXP2_08_PIN
532
-  #define BTN_EN2                    EXP2_06_PIN
533
-  #define BTN_ENC                    EXP1_09_PIN
531
+  #define BTN_EN1                    EXP2_03_PIN
532
+  #define BTN_EN2                    EXP2_05_PIN
533
+  #define BTN_ENC                    EXP1_02_PIN
534
 
534
 
535
   //
535
   //
536
   // e.g., BTT_TFT35_SPI_V1_0 (480x320, 3.5", SPI Stock Display with Rotary Encoder in BIQU B1 SE)
536
   // e.g., BTT_TFT35_SPI_V1_0 (480x320, 3.5", SPI Stock Display with Rotary Encoder in BIQU B1 SE)
537
   //
537
   //
538
-  #define TFT_CS_PIN                 EXP2_07_PIN
539
-  #define TFT_A0_PIN                 EXP2_04_PIN
540
-  #define TFT_SCK_PIN                EXP2_09_PIN
541
-  #define TFT_MISO_PIN               EXP2_10_PIN
542
-  #define TFT_MOSI_PIN               EXP2_05_PIN
543
-
544
-  #define TOUCH_INT_PIN              EXP1_04_PIN
545
-  #define TOUCH_MISO_PIN             EXP1_05_PIN
546
-  #define TOUCH_MOSI_PIN             EXP1_08_PIN
547
-  #define TOUCH_SCK_PIN              EXP1_06_PIN
548
-  #define TOUCH_CS_PIN               EXP1_07_PIN
538
+  #define TFT_CS_PIN                 EXP2_04_PIN
539
+  #define TFT_A0_PIN                 EXP2_07_PIN
540
+  #define TFT_SCK_PIN                EXP2_02_PIN
541
+  #define TFT_MISO_PIN               EXP2_01_PIN
542
+  #define TFT_MOSI_PIN               EXP2_06_PIN
543
+
544
+  #define TOUCH_INT_PIN              EXP1_07_PIN
545
+  #define TOUCH_MISO_PIN             EXP1_06_PIN
546
+  #define TOUCH_MOSI_PIN             EXP1_03_PIN
547
+  #define TOUCH_SCK_PIN              EXP1_05_PIN
548
+  #define TOUCH_CS_PIN               EXP1_04_PIN
549
 
549
 
550
 #endif
550
 #endif
551
 
551
 

+ 40
- 40
Marlin/src/pins/stm32f4/pins_FLYF407ZG.h 查看文件

177
 
177
 
178
 /**
178
 /**
179
  *        ------                ------
179
  *        ------                ------
180
- *  PB10 |10  9 | PE15    PB14 |10  9 | PB13
181
- *  PE14 | 8  7 | PE12    PC5  | 8  7 | PF11
182
- *  PE10   6  5 | PE9     PC4    6  5 | PB15
183
- *  PE8  | 4  3 | PE7     PB2  | 4  3 | RESET
184
- *   GND | 2  1 | 5V       GND | 2  1 | --
180
+ *  PB10 | 1  2 | PE15    PB14 | 1  2 | PB13
181
+ *  PE14 | 3  4 | PE12    PC5  | 3  4 | PF11
182
+ *  PE10   5  6 | PE9     PC4    5  6 | PB15
183
+ *  PE8  | 7  8 | PE7     PB2  | 7  8 | RESET
184
+ *   GND | 9 10 | 5V       GND | 9 10 | --
185
  *        ------                ------
185
  *        ------                ------
186
  *         EXP1                  EXP2
186
  *         EXP1                  EXP2
187
  */
187
  */
188
-#define EXP1_03_PIN                         PE7
189
-#define EXP1_04_PIN                         PE8
190
-#define EXP1_05_PIN                         PE9
191
-#define EXP1_06_PIN                         PE10
192
-#define EXP1_07_PIN                         PE12
193
-#define EXP1_08_PIN                         PE14
194
-#define EXP1_09_PIN                         PE15
195
-#define EXP1_10_PIN                         PB10
196
-
197
-#define EXP2_03_PIN                         -1    // RESET
198
-#define EXP2_04_PIN                         PB2
199
-#define EXP2_05_PIN                         PB15
200
-#define EXP2_06_PIN                         PC4
201
-#define EXP2_07_PIN                         PF11
202
-#define EXP2_08_PIN                         PC5
203
-#define EXP2_09_PIN                         PB13
204
-#define EXP2_10_PIN                         PB14
188
+#define EXP1_08_PIN                         PE7
189
+#define EXP1_07_PIN                         PE8
190
+#define EXP1_06_PIN                         PE9
191
+#define EXP1_05_PIN                         PE10
192
+#define EXP1_04_PIN                         PE12
193
+#define EXP1_03_PIN                         PE14
194
+#define EXP1_02_PIN                         PE15
195
+#define EXP1_01_PIN                         PB10
196
+
197
+#define EXP2_08_PIN                         -1    // RESET
198
+#define EXP2_07_PIN                         PB2
199
+#define EXP2_06_PIN                         PB15
200
+#define EXP2_05_PIN                         PC4
201
+#define EXP2_04_PIN                         PF11
202
+#define EXP2_03_PIN                         PC5
203
+#define EXP2_02_PIN                         PB13
204
+#define EXP2_01_PIN                         PB14
205
 
205
 
206
 //
206
 //
207
 // Onboard SD support
207
 // Onboard SD support
226
 
226
 
227
 #elif SD_CONNECTION_IS(LCD)
227
 #elif SD_CONNECTION_IS(LCD)
228
 
228
 
229
-  #define SD_SCK_PIN                 EXP2_09_PIN
230
-  #define SD_MISO_PIN                EXP2_10_PIN
231
-  #define SD_MOSI_PIN                EXP2_05_PIN
232
-  #define SDSS                       EXP2_07_PIN
233
-  #define SD_DETECT_PIN              EXP2_04_PIN
229
+  #define SD_SCK_PIN                 EXP2_02_PIN
230
+  #define SD_MISO_PIN                EXP2_01_PIN
231
+  #define SD_MOSI_PIN                EXP2_06_PIN
232
+  #define SDSS                       EXP2_04_PIN
233
+  #define SD_DETECT_PIN              EXP2_07_PIN
234
 
234
 
235
 #endif
235
 #endif
236
 
236
 
239
 //
239
 //
240
 #if ENABLED(TMC_USE_SW_SPI)
240
 #if ENABLED(TMC_USE_SW_SPI)
241
   #ifndef TMC_SW_SCK
241
   #ifndef TMC_SW_SCK
242
-    #define TMC_SW_SCK               EXP2_09_PIN
242
+    #define TMC_SW_SCK               EXP2_02_PIN
243
   #endif
243
   #endif
244
   #ifndef TMC_SW_MISO
244
   #ifndef TMC_SW_MISO
245
-    #define TMC_SW_MISO              EXP2_10_PIN
245
+    #define TMC_SW_MISO              EXP2_01_PIN
246
   #endif
246
   #endif
247
   #ifndef TMC_SW_MOSI
247
   #ifndef TMC_SW_MOSI
248
-    #define TMC_SW_MOSI              EXP2_05_PIN
248
+    #define TMC_SW_MOSI              EXP2_06_PIN
249
   #endif
249
   #endif
250
 #endif
250
 #endif
251
 
251
 
286
 // LCD / Controller
286
 // LCD / Controller
287
 //
287
 //
288
 #if IS_RRD_SC
288
 #if IS_RRD_SC
289
-  #define BEEPER_PIN                 EXP1_10_PIN
290
-  #define LCD_PINS_RS                EXP1_07_PIN
291
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
292
-  #define LCD_PINS_D4                EXP1_06_PIN
293
-  #define LCD_PINS_D5                EXP1_05_PIN
294
-  #define LCD_PINS_D6                EXP1_04_PIN
295
-  #define LCD_PINS_D7                EXP1_03_PIN
296
-  #define BTN_EN1                    EXP2_06_PIN
297
-  #define BTN_EN2                    EXP2_08_PIN
298
-  #define BTN_ENC                    EXP1_09_PIN
289
+  #define BEEPER_PIN                 EXP1_01_PIN
290
+  #define LCD_PINS_RS                EXP1_04_PIN
291
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
292
+  #define LCD_PINS_D4                EXP1_05_PIN
293
+  #define LCD_PINS_D5                EXP1_06_PIN
294
+  #define LCD_PINS_D6                EXP1_07_PIN
295
+  #define LCD_PINS_D7                EXP1_08_PIN
296
+  #define BTN_EN1                    EXP2_05_PIN
297
+  #define BTN_EN2                    EXP2_03_PIN
298
+  #define BTN_ENC                    EXP1_02_PIN
299
 #endif
299
 #endif
300
 
300
 
301
 //
301
 //

+ 56
- 56
Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h 查看文件

140
 
140
 
141
 /**
141
 /**
142
  *                   ------                                  ------
142
  *                   ------                                  ------
143
- * (SD_MISO)   PA6  |10  9 | PA5  (SD_SCK)    (BEEPER) PC9  |10  9 | PC12 (BTN_ENC)
144
- * (BTN_EN1)   PC10 | 8  7 | PA4   (SD_SS)    (LCD_EN) PB15 | 8  7 | PB12  (LCD_RS)
145
- * (BTN_EN2)   PC11   6  5 | PA7 (SD_MOSI)    (LCD_D4) PB13   6  5 | PB14  (LCD_D5)
146
- * (SD_DETECT) PC3  | 4  3 | RESET            (LCD_D6) PB6  | 4  3 |  PB7  (LCD_D7)
147
- *              GND | 2  1 | 5V                         GND | 2  1 |   5V
143
+ * (SD_MISO)   PA6  | 1  2 | PA5  (SD_SCK)    (BEEPER) PC9  | 1  2 | PC12 (BTN_ENC)
144
+ * (BTN_EN1)   PC10 | 3  4 | PA4   (SD_SS)    (LCD_EN) PB15 | 3  4 | PB12  (LCD_RS)
145
+ * (BTN_EN2)   PC11   5  6 | PA7 (SD_MOSI)    (LCD_D4) PB13   5  6 | PB14  (LCD_D5)
146
+ * (SD_DETECT) PC3  | 7  8 | RESET            (LCD_D6) PB6  | 7  8 |  PB7  (LCD_D7)
147
+ *              GND | 9 10 | 5V                         GND | 9 10 |   5V
148
  *                   ------                                  ------
148
  *                   ------                                  ------
149
  *                    EXP2                                    EXP1
149
  *                    EXP2                                    EXP1
150
  */
150
  */
151
 
151
 
152
 /**
152
 /**
153
  *                     ------
153
  *                     ------
154
- *                 5V |10  9 | GND
155
- * (LCD_EN/MOSI) PB15 | 8  7 | PB12  (LCD_RS)
156
- * (LCD_D4/SCK)  PB13   6  5 | PC11 (BTN_EN2)
157
- * (LCD_D5/MISO) PB14 | 4  3 | PC10 (BTN_EN1)
158
- * (BTN_ENC)     PC12 | 2  1 | PC9   (BEEPER)
154
+ *                 5V | 1  2 | GND
155
+ * (LCD_EN/MOSI) PB15 | 3  4 | PB12  (LCD_RS)
156
+ * (LCD_D4/SCK)  PB13   5  6 | PC11 (BTN_EN2)
157
+ * (LCD_D5/MISO) PB14 | 7  8 | PC10 (BTN_EN1)
158
+ * (BTN_ENC)     PC12 | 9 10 | PC9   (BEEPER)
159
  *                     ------
159
  *                     ------
160
  *                      EXP3
160
  *                      EXP3
161
  */
161
  */
162
 
162
 
163
-#define EXP1_03_PIN                         PB7
164
-#define EXP1_04_PIN                         PB6
165
-#define EXP1_05_PIN                         PB14
166
-#define EXP1_06_PIN                         PB13
167
-#define EXP1_07_PIN                         PB12
168
-#define EXP1_08_PIN                         PB15
169
-#define EXP1_09_PIN                         PC12
170
-#define EXP1_10_PIN                         PC9
171
-
172
-#define EXP2_03_PIN                         -1
173
-#define EXP2_04_PIN                         PC3
174
-#define EXP2_05_PIN                         PA7
175
-#define EXP2_06_PIN                         PC11
176
-#define EXP2_07_PIN                         PA4
177
-#define EXP2_08_PIN                         PC10
178
-#define EXP2_09_PIN                         PA5
179
-#define EXP2_10_PIN                         PA6
163
+#define EXP1_08_PIN                         PB7
164
+#define EXP1_07_PIN                         PB6
165
+#define EXP1_06_PIN                         PB14
166
+#define EXP1_05_PIN                         PB13
167
+#define EXP1_04_PIN                         PB12
168
+#define EXP1_03_PIN                         PB15
169
+#define EXP1_02_PIN                         PC12
170
+#define EXP1_01_PIN                         PC9
171
+
172
+#define EXP2_08_PIN                         -1
173
+#define EXP2_07_PIN                         PC3
174
+#define EXP2_06_PIN                         PA7
175
+#define EXP2_05_PIN                         PC11
176
+#define EXP2_04_PIN                         PA4
177
+#define EXP2_03_PIN                         PC10
178
+#define EXP2_02_PIN                         PA5
179
+#define EXP2_01_PIN                         PA6
180
 
180
 
181
 #if HAS_WIRED_LCD
181
 #if HAS_WIRED_LCD
182
 
182
 
183
-  #define BEEPER_PIN                 EXP1_10_PIN
184
-  #define BTN_ENC                    EXP1_09_PIN
183
+  #define BEEPER_PIN                 EXP1_01_PIN
184
+  #define BTN_ENC                    EXP1_02_PIN
185
 
185
 
186
   #if ENABLED(CR10_STOCKDISPLAY)
186
   #if ENABLED(CR10_STOCKDISPLAY)
187
 
187
 
188
-    #define LCD_PINS_RS              EXP1_07_PIN
188
+    #define LCD_PINS_RS              EXP1_04_PIN
189
 
189
 
190
-    #define BTN_EN1                  EXP2_08_PIN
191
-    #define BTN_EN2                  EXP2_06_PIN
190
+    #define BTN_EN1                  EXP2_03_PIN
191
+    #define BTN_EN2                  EXP2_05_PIN
192
 
192
 
193
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
194
-    #define LCD_PINS_D4              EXP1_06_PIN
193
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
194
+    #define LCD_PINS_D4              EXP1_05_PIN
195
 
195
 
196
   #elif ENABLED(MKS_MINI_12864)
196
   #elif ENABLED(MKS_MINI_12864)
197
 
197
 
198
-    #define DOGLCD_A0                EXP1_04_PIN
199
-    #define DOGLCD_CS                EXP1_05_PIN
200
-    #define BTN_EN1                  EXP2_08_PIN
201
-    #define BTN_EN2                  EXP2_06_PIN
198
+    #define DOGLCD_A0                EXP1_07_PIN
199
+    #define DOGLCD_CS                EXP1_06_PIN
200
+    #define BTN_EN1                  EXP2_03_PIN
201
+    #define BTN_EN2                  EXP2_05_PIN
202
 
202
 
203
   #else
203
   #else
204
 
204
 
205
-    #define LCD_PINS_RS              EXP1_07_PIN
205
+    #define LCD_PINS_RS              EXP1_04_PIN
206
 
206
 
207
-    #define BTN_EN1                  EXP2_06_PIN
208
-    #define BTN_EN2                  EXP2_08_PIN
207
+    #define BTN_EN1                  EXP2_05_PIN
208
+    #define BTN_EN2                  EXP2_03_PIN
209
 
209
 
210
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
211
-    #define LCD_PINS_D4              EXP1_06_PIN
210
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
211
+    #define LCD_PINS_D4              EXP1_05_PIN
212
 
212
 
213
     #if ENABLED(FYSETC_MINI_12864)
213
     #if ENABLED(FYSETC_MINI_12864)
214
-      #define DOGLCD_CS              EXP1_08_PIN
215
-      #define DOGLCD_A0              EXP1_07_PIN
214
+      #define DOGLCD_CS              EXP1_03_PIN
215
+      #define DOGLCD_A0              EXP1_04_PIN
216
       //#define LCD_BACKLIGHT_PIN           -1
216
       //#define LCD_BACKLIGHT_PIN           -1
217
-      #define LCD_RESET_PIN          EXP1_06_PIN  // Must be high or open for LCD to operate normally.
217
+      #define LCD_RESET_PIN          EXP1_05_PIN  // Must be high or open for LCD to operate normally.
218
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
218
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
219
         #ifndef RGB_LED_R_PIN
219
         #ifndef RGB_LED_R_PIN
220
-          #define RGB_LED_R_PIN      EXP1_05_PIN
220
+          #define RGB_LED_R_PIN      EXP1_06_PIN
221
         #endif
221
         #endif
222
         #ifndef RGB_LED_G_PIN
222
         #ifndef RGB_LED_G_PIN
223
-          #define RGB_LED_G_PIN      EXP1_04_PIN
223
+          #define RGB_LED_G_PIN      EXP1_07_PIN
224
         #endif
224
         #endif
225
         #ifndef RGB_LED_B_PIN
225
         #ifndef RGB_LED_B_PIN
226
-          #define RGB_LED_B_PIN      EXP1_03_PIN
226
+          #define RGB_LED_B_PIN      EXP1_08_PIN
227
         #endif
227
         #endif
228
       #elif ENABLED(FYSETC_MINI_12864_2_1)
228
       #elif ENABLED(FYSETC_MINI_12864_2_1)
229
-        #define NEOPIXEL_PIN         EXP1_05_PIN
229
+        #define NEOPIXEL_PIN         EXP1_06_PIN
230
       #endif
230
       #endif
231
     #endif // !FYSETC_MINI_12864
231
     #endif // !FYSETC_MINI_12864
232
 
232
 
233
     #if IS_ULTIPANEL
233
     #if IS_ULTIPANEL
234
-      #define LCD_PINS_D5            EXP1_05_PIN
235
-      #define LCD_PINS_D6            EXP1_04_PIN
236
-      #define LCD_PINS_D7            EXP1_03_PIN
234
+      #define LCD_PINS_D5            EXP1_06_PIN
235
+      #define LCD_PINS_D6            EXP1_07_PIN
236
+      #define LCD_PINS_D7            EXP1_08_PIN
237
 
237
 
238
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
238
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
239
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
239
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
253
 #endif
253
 #endif
254
 
254
 
255
 #if ENABLED(TOUCH_UI_FTDI_EVE)
255
 #if ENABLED(TOUCH_UI_FTDI_EVE)
256
-  #define BEEPER_PIN                 EXP1_10_PIN
257
-  #define CLCD_MOD_RESET             EXP2_08_PIN
258
-  #define CLCD_SPI_CS                EXP2_06_PIN
256
+  #define BEEPER_PIN                 EXP1_01_PIN
257
+  #define CLCD_MOD_RESET             EXP2_03_PIN
258
+  #define CLCD_SPI_CS                EXP2_05_PIN
259
 #endif
259
 #endif

+ 61
- 61
Marlin/src/pins/stm32f4/pins_FYSETC_S6.h 查看文件

199
 
199
 
200
 /**
200
 /**
201
  *         ------                 ------
201
  *         ------                 ------
202
- *   PC9  |10  9 | PA8      PA6  |10  9 | PA5
203
- *   PC11 | 8  7 | PD2      PC6  | 8  7 | PA4
204
- *   PC10   6  5 | PC12     PC7    6  5 | PA7
205
- *   PD0  | 4  3 | PD1      PB10 | 4  3 | RESET
206
- *    GND | 2  1 | 5V        GND | 2  1 | 5V
202
+ *   PC9  | 1  2 | PA8      PA6  | 1  2 | PA5
203
+ *   PC11 | 3  4 | PD2      PC6  | 3  4 | PA4
204
+ *   PC10   5  6 | PC12     PC7    5  6 | PA7
205
+ *   PD0  | 7  8 | PD1      PB10 | 7  8 | RESET
206
+ *    GND | 9 10 | 5V        GND | 9 10 | 5V
207
  *         ------                 ------
207
  *         ------                 ------
208
  *          EXP1                   EXP2
208
  *          EXP1                   EXP2
209
  */
209
  */
210
-#define EXP1_03_PIN                         PD1
211
-#define EXP1_04_PIN                         PD0
212
-#define EXP1_05_PIN                         PC12
213
-#define EXP1_06_PIN                         PC10
214
-#define EXP1_07_PIN                         PD2
215
-#define EXP1_08_PIN                         PC11
216
-#define EXP1_09_PIN                         PA8
217
-#define EXP1_10_PIN                         PC9
218
-
219
-#define EXP2_03_PIN                         -1    // RESET
220
-#define EXP2_04_PIN                         PB10
221
-#define EXP2_05_PIN                         PA7
222
-#define EXP2_06_PIN                         PC7
223
-#define EXP2_07_PIN                         PA4
224
-#define EXP2_08_PIN                         PC6
225
-#define EXP2_09_PIN                         PA5
226
-#define EXP2_10_PIN                         PA6
210
+#define EXP1_08_PIN                         PD1
211
+#define EXP1_07_PIN                         PD0
212
+#define EXP1_06_PIN                         PC12
213
+#define EXP1_05_PIN                         PC10
214
+#define EXP1_04_PIN                         PD2
215
+#define EXP1_03_PIN                         PC11
216
+#define EXP1_02_PIN                         PA8
217
+#define EXP1_01_PIN                         PC9
218
+
219
+#define EXP2_08_PIN                         -1    // RESET
220
+#define EXP2_07_PIN                         PB10
221
+#define EXP2_06_PIN                         PA7
222
+#define EXP2_05_PIN                         PC7
223
+#define EXP2_04_PIN                         PA4
224
+#define EXP2_03_PIN                         PC6
225
+#define EXP2_02_PIN                         PA5
226
+#define EXP2_01_PIN                         PA6
227
 
227
 
228
 //
228
 //
229
 // SPI / SD Card
229
 // SPI / SD Card
230
 //
230
 //
231
-#define SD_SCK_PIN                   EXP2_09_PIN
232
-#define SD_MISO_PIN                  EXP2_10_PIN
233
-#define SD_MOSI_PIN                  EXP2_05_PIN
231
+#define SD_SCK_PIN                   EXP2_02_PIN
232
+#define SD_MISO_PIN                  EXP2_01_PIN
233
+#define SD_MOSI_PIN                  EXP2_06_PIN
234
 
234
 
235
-#define SDSS                         EXP2_07_PIN
236
-#define SD_DETECT_PIN                EXP2_04_PIN
235
+#define SDSS                         EXP2_04_PIN
236
+#define SD_DETECT_PIN                EXP2_07_PIN
237
 
237
 
238
 //
238
 //
239
 // LCD / Controller
239
 // LCD / Controller
240
 //
240
 //
241
 #if ENABLED(FYSETC_242_OLED_12864)
241
 #if ENABLED(FYSETC_242_OLED_12864)
242
 
242
 
243
-  #define BTN_EN1                    EXP1_10_PIN
244
-  #define BTN_EN2                    EXP1_03_PIN
245
-  #define BTN_ENC                    EXP1_09_PIN
243
+  #define BTN_EN1                    EXP1_01_PIN
244
+  #define BTN_EN2                    EXP1_08_PIN
245
+  #define BTN_ENC                    EXP1_02_PIN
246
 
246
 
247
-  #define BEEPER_PIN                 EXP2_08_PIN
247
+  #define BEEPER_PIN                 EXP2_03_PIN
248
 
248
 
249
-  #define LCD_PINS_DC                EXP1_05_PIN
250
-  #define LCD_PINS_RS                EXP2_06_PIN  // LCD_RST
251
-  #define DOGLCD_CS                  EXP1_07_PIN
252
-  #define DOGLCD_MOSI                EXP1_06_PIN
253
-  #define DOGLCD_SCK                 EXP1_08_PIN
249
+  #define LCD_PINS_DC                EXP1_06_PIN
250
+  #define LCD_PINS_RS                EXP2_05_PIN  // LCD_RST
251
+  #define DOGLCD_CS                  EXP1_04_PIN
252
+  #define DOGLCD_MOSI                EXP1_05_PIN
253
+  #define DOGLCD_SCK                 EXP1_03_PIN
254
   #define DOGLCD_A0                  LCD_PINS_DC
254
   #define DOGLCD_A0                  LCD_PINS_DC
255
   #define FORCE_SOFT_SPI
255
   #define FORCE_SOFT_SPI
256
 
256
 
257
   #define KILL_PIN                          -1    // NC
257
   #define KILL_PIN                          -1    // NC
258
-  #define NEOPIXEL_PIN               EXP1_04_PIN
258
+  #define NEOPIXEL_PIN               EXP1_07_PIN
259
 
259
 
260
 #elif HAS_WIRED_LCD
260
 #elif HAS_WIRED_LCD
261
 
261
 
262
-  #define BEEPER_PIN                 EXP1_10_PIN
263
-  #define BTN_ENC                    EXP1_09_PIN
262
+  #define BEEPER_PIN                 EXP1_01_PIN
263
+  #define BTN_ENC                    EXP1_02_PIN
264
 
264
 
265
   #if ENABLED(CR10_STOCKDISPLAY)
265
   #if ENABLED(CR10_STOCKDISPLAY)
266
-    #define LCD_PINS_RS              EXP1_04_PIN
266
+    #define LCD_PINS_RS              EXP1_07_PIN
267
 
267
 
268
-    #define BTN_EN1                  EXP1_08_PIN
269
-    #define BTN_EN2                  EXP1_06_PIN
268
+    #define BTN_EN1                  EXP1_03_PIN
269
+    #define BTN_EN2                  EXP1_05_PIN
270
 
270
 
271
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
272
-    #define LCD_PINS_D4              EXP1_05_PIN
271
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
272
+    #define LCD_PINS_D4              EXP1_06_PIN
273
 
273
 
274
   #else
274
   #else
275
 
275
 
276
-    #define LCD_PINS_RS              EXP1_07_PIN
276
+    #define LCD_PINS_RS              EXP1_04_PIN
277
 
277
 
278
-    #define BTN_EN1                  EXP2_08_PIN
279
-    #define BTN_EN2                  EXP2_06_PIN
278
+    #define BTN_EN1                  EXP2_03_PIN
279
+    #define BTN_EN2                  EXP2_05_PIN
280
 
280
 
281
-    #define LCD_SDSS                 EXP2_07_PIN
281
+    #define LCD_SDSS                 EXP2_04_PIN
282
 
282
 
283
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
284
-    #define LCD_PINS_D4              EXP1_06_PIN
283
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
284
+    #define LCD_PINS_D4              EXP1_05_PIN
285
 
285
 
286
     #if ENABLED(FYSETC_MINI_12864)
286
     #if ENABLED(FYSETC_MINI_12864)
287
       // See https://wiki.fysetc.com/Mini12864_Panel
287
       // See https://wiki.fysetc.com/Mini12864_Panel
288
-      #define DOGLCD_CS              EXP1_08_PIN
289
-      #define DOGLCD_A0              EXP1_07_PIN
288
+      #define DOGLCD_CS              EXP1_03_PIN
289
+      #define DOGLCD_A0              EXP1_04_PIN
290
       #if ENABLED(FYSETC_GENERIC_12864_1_1)
290
       #if ENABLED(FYSETC_GENERIC_12864_1_1)
291
-        #define LCD_BACKLIGHT_PIN    EXP1_04_PIN
291
+        #define LCD_BACKLIGHT_PIN    EXP1_07_PIN
292
       #endif
292
       #endif
293
-      #define LCD_RESET_PIN          EXP1_06_PIN  // Must be high or open for LCD to operate normally.
293
+      #define LCD_RESET_PIN          EXP1_05_PIN  // Must be high or open for LCD to operate normally.
294
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
294
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
295
         #ifndef RGB_LED_R_PIN
295
         #ifndef RGB_LED_R_PIN
296
-          #define RGB_LED_R_PIN      EXP1_05_PIN
296
+          #define RGB_LED_R_PIN      EXP1_06_PIN
297
         #endif
297
         #endif
298
         #ifndef RGB_LED_G_PIN
298
         #ifndef RGB_LED_G_PIN
299
-          #define RGB_LED_G_PIN      EXP1_04_PIN
299
+          #define RGB_LED_G_PIN      EXP1_07_PIN
300
         #endif
300
         #endif
301
         #ifndef RGB_LED_B_PIN
301
         #ifndef RGB_LED_B_PIN
302
-          #define RGB_LED_B_PIN      EXP1_03_PIN
302
+          #define RGB_LED_B_PIN      EXP1_08_PIN
303
         #endif
303
         #endif
304
       #elif ENABLED(FYSETC_MINI_12864_2_1)
304
       #elif ENABLED(FYSETC_MINI_12864_2_1)
305
-        #define NEOPIXEL_PIN         EXP1_05_PIN
305
+        #define NEOPIXEL_PIN         EXP1_06_PIN
306
       #endif
306
       #endif
307
     #endif
307
     #endif
308
 
308
 
309
     #if IS_ULTIPANEL
309
     #if IS_ULTIPANEL
310
-      #define LCD_PINS_D5            EXP1_05_PIN
311
-      #define LCD_PINS_D6            EXP1_04_PIN
312
-      #define LCD_PINS_D7            EXP1_03_PIN
310
+      #define LCD_PINS_D5            EXP1_06_PIN
311
+      #define LCD_PINS_D6            EXP1_07_PIN
312
+      #define LCD_PINS_D7            EXP1_08_PIN
313
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
313
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
314
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
314
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
315
       #endif
315
       #endif

+ 58
- 58
Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h 查看文件

213
 
213
 
214
 /**
214
 /**
215
  *                  ------                                      ------
215
  *                  ------                                      ------
216
- *   (BEEPER) PB2  |10  9 | PE10 (BTN_ENC)    (SPI1 MISO) PA6  |10  9 | PA5 (SPI1 SCK)
217
- *   (LCD_EN) PE11 | 8  7 | PD10 (LCD_RS)       (BTN_EN1) PE9  | 8  7 | PA4 (SPI1 CS)
218
- *   (LCD_D4) PD9    6  5 | PD8  (LCD_D5)       (BTN_EN2) PE8    6  5 | PA7 (SPI1 MOSI)
219
- *   (LCD_D6) PE15 | 4  3 | PE7  (LCD_D7)       (SPI1_RS) PB11 | 4  3 | RESET
220
- *             GND | 2  1 | 5V                             GND | 2  1 | 3.3V
216
+ *   (BEEPER) PB2  | 1  2 | PE10 (BTN_ENC)    (SPI1 MISO) PA6  | 1  2 | PA5 (SPI1 SCK)
217
+ *   (LCD_EN) PE11 | 3  4 | PD10 (LCD_RS)       (BTN_EN1) PE9  | 3  4 | PA4 (SPI1 CS)
218
+ *   (LCD_D4) PD9    5  6 | PD8  (LCD_D5)       (BTN_EN2) PE8    5  6 | PA7 (SPI1 MOSI)
219
+ *   (LCD_D6) PE15 | 7  8 | PE7  (LCD_D7)       (SPI1_RS) PB11 | 7  8 | RESET
220
+ *             GND | 9 10 | 5V                             GND | 9 10 | 3.3V
221
  *                  ------                                      ------
221
  *                  ------                                      ------
222
  *                   EXP1                                        EXP2
222
  *                   EXP1                                        EXP2
223
  */
223
  */
224
-#define EXP1_03_PIN                         PE7
225
-#define EXP1_04_PIN                         PE15
226
-#define EXP1_05_PIN                         PD8
227
-#define EXP1_06_PIN                         PD9
228
-#define EXP1_07_PIN                         PD10
229
-#define EXP1_08_PIN                         PE11
230
-#define EXP1_09_PIN                         PE10
231
-#define EXP1_10_PIN                         PB2
232
-
233
-#define EXP2_03_PIN                         -1    // RESET
234
-#define EXP2_04_PIN                         PB11
235
-#define EXP2_05_PIN                         PA7
236
-#define EXP2_06_PIN                         PE8
237
-#define EXP2_07_PIN                         PA4
238
-#define EXP2_08_PIN                         PE9
239
-#define EXP2_09_PIN                         PA5
240
-#define EXP2_10_PIN                         PA6
224
+#define EXP1_08_PIN                         PE7
225
+#define EXP1_07_PIN                         PE15
226
+#define EXP1_06_PIN                         PD8
227
+#define EXP1_05_PIN                         PD9
228
+#define EXP1_04_PIN                         PD10
229
+#define EXP1_03_PIN                         PE11
230
+#define EXP1_02_PIN                         PE10
231
+#define EXP1_01_PIN                         PB2
232
+
233
+#define EXP2_08_PIN                         -1    // RESET
234
+#define EXP2_07_PIN                         PB11
235
+#define EXP2_06_PIN                         PA7
236
+#define EXP2_05_PIN                         PE8
237
+#define EXP2_04_PIN                         PA4
238
+#define EXP2_03_PIN                         PE9
239
+#define EXP2_02_PIN                         PA5
240
+#define EXP2_01_PIN                         PA6
241
 
241
 
242
 #if ENABLED(SDSUPPORT)
242
 #if ENABLED(SDSUPPORT)
243
   #ifndef SDCARD_CONNECTION
243
   #ifndef SDCARD_CONNECTION
253
     #define SD_DETECT_PIN                   PC4   // SD_DETECT_PIN doesn't work with NO_SD_HOST_DRIVE disabled
253
     #define SD_DETECT_PIN                   PC4   // SD_DETECT_PIN doesn't work with NO_SD_HOST_DRIVE disabled
254
   #elif SD_CONNECTION_IS(LCD)
254
   #elif SD_CONNECTION_IS(LCD)
255
     #define ENABLE_SPI1
255
     #define ENABLE_SPI1
256
-    #define SDSS                     EXP2_07_PIN
257
-    #define SD_SCK_PIN               EXP2_09_PIN
258
-    #define SD_MISO_PIN              EXP2_10_PIN
259
-    #define SD_MOSI_PIN              EXP2_05_PIN
260
-    #define SD_DETECT_PIN            EXP2_04_PIN
256
+    #define SDSS                     EXP2_04_PIN
257
+    #define SD_SCK_PIN               EXP2_02_PIN
258
+    #define SD_MISO_PIN              EXP2_01_PIN
259
+    #define SD_MOSI_PIN              EXP2_06_PIN
260
+    #define SD_DETECT_PIN            EXP2_07_PIN
261
   #endif
261
   #endif
262
 #endif
262
 #endif
263
 
263
 
264
 #if EITHER(TFT_COLOR_UI, TFT_CLASSIC_UI)
264
 #if EITHER(TFT_COLOR_UI, TFT_CLASSIC_UI)
265
-  #define TFT_CS_PIN                 EXP1_04_PIN
266
-  #define TFT_SCK_PIN                EXP2_09_PIN
267
-  #define TFT_MISO_PIN               EXP2_10_PIN
268
-  #define TFT_MOSI_PIN               EXP2_05_PIN
269
-  #define TFT_DC_PIN                 EXP1_03_PIN
265
+  #define TFT_CS_PIN                 EXP1_07_PIN
266
+  #define TFT_SCK_PIN                EXP2_02_PIN
267
+  #define TFT_MISO_PIN               EXP2_01_PIN
268
+  #define TFT_MOSI_PIN               EXP2_06_PIN
269
+  #define TFT_DC_PIN                 EXP1_08_PIN
270
   #define TFT_A0_PIN                  TFT_DC_PIN
270
   #define TFT_A0_PIN                  TFT_DC_PIN
271
 
271
 
272
-  #define TFT_RESET_PIN              EXP1_07_PIN
272
+  #define TFT_RESET_PIN              EXP1_04_PIN
273
 
273
 
274
-  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
274
+  #define LCD_BACKLIGHT_PIN          EXP1_03_PIN
275
   #define TFT_BACKLIGHT_PIN    LCD_BACKLIGHT_PIN
275
   #define TFT_BACKLIGHT_PIN    LCD_BACKLIGHT_PIN
276
 
276
 
277
   #define TOUCH_BUTTONS_HW_SPI
277
   #define TOUCH_BUTTONS_HW_SPI
284
     #define TFT_HEIGHT                       320
284
     #define TFT_HEIGHT                       320
285
   #endif
285
   #endif
286
 
286
 
287
-  #define TOUCH_CS_PIN               EXP1_06_PIN  // SPI1_NSS
288
-  #define TOUCH_SCK_PIN              EXP2_09_PIN  // SPI1_SCK
289
-  #define TOUCH_MISO_PIN             EXP2_10_PIN  // SPI1_MISO
290
-  #define TOUCH_MOSI_PIN             EXP2_05_PIN  // SPI1_MOSI
287
+  #define TOUCH_CS_PIN               EXP1_05_PIN  // SPI1_NSS
288
+  #define TOUCH_SCK_PIN              EXP2_02_PIN  // SPI1_SCK
289
+  #define TOUCH_MISO_PIN             EXP2_01_PIN  // SPI1_MISO
290
+  #define TOUCH_MOSI_PIN             EXP2_06_PIN  // SPI1_MOSI
291
 
291
 
292
   #define LCD_READ_ID                       0xD3
292
   #define LCD_READ_ID                       0xD3
293
   #define LCD_USE_DMA_SPI
293
   #define LCD_USE_DMA_SPI
312
 
312
 
313
 #elif HAS_WIRED_LCD
313
 #elif HAS_WIRED_LCD
314
 
314
 
315
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
316
-  #define LCD_PINS_RS                EXP1_07_PIN
315
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
316
+  #define LCD_PINS_RS                EXP1_04_PIN
317
   #define LCD_BACKLIGHT_PIN                 -1
317
   #define LCD_BACKLIGHT_PIN                 -1
318
 
318
 
319
   // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
319
   // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
321
 
321
 
322
     #define ENABLE_SPI1
322
     #define ENABLE_SPI1
323
     #define FORCE_SOFT_SPI
323
     #define FORCE_SOFT_SPI
324
-    #define DOGLCD_A0                EXP1_04_PIN
325
-    #define DOGLCD_CS                EXP1_05_PIN
326
-    #define DOGLCD_SCK               EXP2_09_PIN
327
-    #define DOGLCD_MOSI              EXP2_05_PIN
324
+    #define DOGLCD_A0                EXP1_07_PIN
325
+    #define DOGLCD_CS                EXP1_06_PIN
326
+    #define DOGLCD_SCK               EXP2_02_PIN
327
+    #define DOGLCD_MOSI              EXP2_06_PIN
328
     //#define LCD_BACKLIGHT_PIN             -1
328
     //#define LCD_BACKLIGHT_PIN             -1
329
     //#define LCD_RESET_PIN                 -1
329
     //#define LCD_RESET_PIN                 -1
330
 
330
 
331
   #elif ENABLED(FYSETC_MINI_12864_2_1)
331
   #elif ENABLED(FYSETC_MINI_12864_2_1)
332
 
332
 
333
-    #define LCD_PINS_DC              EXP1_07_PIN
334
-    #define DOGLCD_CS                EXP1_08_PIN
333
+    #define LCD_PINS_DC              EXP1_04_PIN
334
+    #define DOGLCD_CS                EXP1_03_PIN
335
     #define DOGLCD_A0                LCD_PINS_DC
335
     #define DOGLCD_A0                LCD_PINS_DC
336
     #define LCD_BACKLIGHT_PIN               -1
336
     #define LCD_BACKLIGHT_PIN               -1
337
-    #define LCD_RESET_PIN            EXP1_06_PIN
338
-    #define NEOPIXEL_PIN             EXP1_05_PIN
339
-    #define DOGLCD_MOSI              EXP2_05_PIN
340
-    #define DOGLCD_SCK               EXP2_09_PIN
337
+    #define LCD_RESET_PIN            EXP1_05_PIN
338
+    #define NEOPIXEL_PIN             EXP1_06_PIN
339
+    #define DOGLCD_MOSI              EXP2_06_PIN
340
+    #define DOGLCD_SCK               EXP2_02_PIN
341
     #if SD_CONNECTION_IS(ONBOARD)
341
     #if SD_CONNECTION_IS(ONBOARD)
342
       #define FORCE_SOFT_SPI
342
       #define FORCE_SOFT_SPI
343
     #endif
343
     #endif
345
 
345
 
346
   #else
346
   #else
347
 
347
 
348
-    #define LCD_PINS_D4              EXP1_06_PIN
348
+    #define LCD_PINS_D4              EXP1_05_PIN
349
     #if ENABLED(ULTIPANEL)
349
     #if ENABLED(ULTIPANEL)
350
-      #define LCD_PINS_D5            EXP1_05_PIN
351
-      #define LCD_PINS_D6            EXP1_04_PIN
352
-      #define LCD_PINS_D7            EXP1_03_PIN
350
+      #define LCD_PINS_D5            EXP1_06_PIN
351
+      #define LCD_PINS_D6            EXP1_07_PIN
352
+      #define LCD_PINS_D7            EXP1_08_PIN
353
     #endif
353
     #endif
354
 
354
 
355
     #define BOARD_ST7920_DELAY_1              96
355
     #define BOARD_ST7920_DELAY_1              96
361
 #endif // HAS_WIRED_LCD
361
 #endif // HAS_WIRED_LCD
362
 
362
 
363
 #if ANY(TFT_COLOR_UI, TFT_CLASSIC_UI, HAS_WIRED_LCD)
363
 #if ANY(TFT_COLOR_UI, TFT_CLASSIC_UI, HAS_WIRED_LCD)
364
-  #define BEEPER_PIN                 EXP1_10_PIN
365
-  #define BTN_EN1                    EXP2_08_PIN
366
-  #define BTN_EN2                    EXP2_06_PIN
367
-  #define BTN_ENC                    EXP1_09_PIN
364
+  #define BEEPER_PIN                 EXP1_01_PIN
365
+  #define BTN_EN1                    EXP2_03_PIN
366
+  #define BTN_EN2                    EXP2_05_PIN
367
+  #define BTN_ENC                    EXP1_02_PIN
368
 #endif
368
 #endif

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

236
 
236
 
237
 /**
237
 /**
238
  *                ------                                     ------
238
  *                ------                                     ------
239
- * (BEEPER)  PC5 |10  9 | PE13 (BTN_ENC)   (SPI1 MISO)  PA6 |10  9 | PA5  (SPI1 SCK)
240
- * (LCD_EN) PD13 | 8  7 | PC6  (LCD_RS)      (BTN_EN1)  PE8 | 8  7 | PE10 (SPI1 CS)
241
- * (LCD_D4) PE14   6  5 | PE15 (LCD_D5)      (BTN_EN2) PE11   6  5 | PA7  (SPI1 MOSI)
242
- * (LCD_D6) PD11 | 4  3 | PD10 (LCD_D7)      (SPI1_RS) PE12 | 4  3 | RESET
243
- *           GND | 2  1 | 5V                            GND | 2  1 | 3.3V
239
+ * (BEEPER)  PC5 | 1  2 | PE13 (BTN_ENC)   (SPI1 MISO)  PA6 | 1  2 | PA5  (SPI1 SCK)
240
+ * (LCD_EN) PD13 | 3  4 | PC6  (LCD_RS)      (BTN_EN1)  PE8 | 3  4 | PE10 (SPI1 CS)
241
+ * (LCD_D4) PE14   5  6 | PE15 (LCD_D5)      (BTN_EN2) PE11   5  6 | PA7  (SPI1 MOSI)
242
+ * (LCD_D6) PD11 | 7  8 | PD10 (LCD_D7)      (SPI1_RS) PE12 | 7  8 | RESET
243
+ *           GND | 9 10 | 5V                            GND | 9 10 | 3.3V
244
  *                ------                                     ------
244
  *                ------                                     ------
245
  *                 EXP1                                       EXP2
245
  *                 EXP1                                       EXP2
246
  */
246
  */
247
-#define EXP1_03_PIN                         PD10
248
-#define EXP1_04_PIN                         PD11
249
-#define EXP1_05_PIN                         PE15
250
-#define EXP1_06_PIN                         PE14
251
-#define EXP1_07_PIN                         PC6
252
-#define EXP1_08_PIN                         PD13
253
-#define EXP1_09_PIN                         PE13
254
-#define EXP1_10_PIN                         PC5
255
-
256
-#define EXP2_03_PIN                         -1    // RESET
257
-#define EXP2_04_PIN                         PE12
258
-#define EXP2_05_PIN                         PA7
259
-#define EXP2_06_PIN                         PE11
260
-#define EXP2_07_PIN                         PE10
261
-#define EXP2_08_PIN                         PE8
262
-#define EXP2_09_PIN                         PA5
263
-#define EXP2_10_PIN                         PA6
247
+#define EXP1_08_PIN                         PD10
248
+#define EXP1_07_PIN                         PD11
249
+#define EXP1_06_PIN                         PE15
250
+#define EXP1_05_PIN                         PE14
251
+#define EXP1_04_PIN                         PC6
252
+#define EXP1_03_PIN                         PD13
253
+#define EXP1_02_PIN                         PE13
254
+#define EXP1_01_PIN                         PC5
255
+
256
+#define EXP2_08_PIN                         -1    // RESET
257
+#define EXP2_07_PIN                         PE12
258
+#define EXP2_06_PIN                         PA7
259
+#define EXP2_05_PIN                         PE11
260
+#define EXP2_04_PIN                         PE10
261
+#define EXP2_03_PIN                         PE8
262
+#define EXP2_02_PIN                         PA5
263
+#define EXP2_01_PIN                         PA6
264
 
264
 
265
 //
265
 //
266
 // SPI SD Card
266
 // SPI SD Card
267
 //
267
 //
268
 #if SD_CONNECTION_IS(LCD)
268
 #if SD_CONNECTION_IS(LCD)
269
   #define ENABLE_SPI1
269
   #define ENABLE_SPI1
270
-  #define SDSS                       EXP2_07_PIN
271
-  #define SD_SCK_PIN                 EXP2_09_PIN
272
-  #define SD_MISO_PIN                EXP2_10_PIN
273
-  #define SD_MOSI_PIN                EXP2_05_PIN
274
-  #define SD_DETECT_PIN              EXP2_04_PIN
270
+  #define SDSS                       EXP2_04_PIN
271
+  #define SD_SCK_PIN                 EXP2_02_PIN
272
+  #define SD_MISO_PIN                EXP2_01_PIN
273
+  #define SD_MOSI_PIN                EXP2_06_PIN
274
+  #define SD_DETECT_PIN              EXP2_07_PIN
275
 #endif
275
 #endif
276
 
276
 
277
 //
277
 //
278
 // LCD / Controller
278
 // LCD / Controller
279
 //
279
 //
280
 #if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI)
280
 #if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI)
281
-  #define TFT_CS_PIN                 EXP1_04_PIN
282
-  #define TFT_SCK_PIN                EXP2_09_PIN
283
-  #define TFT_MISO_PIN               EXP2_10_PIN
284
-  #define TFT_MOSI_PIN               EXP2_05_PIN
285
-  #define TFT_DC_PIN                 EXP1_03_PIN
281
+  #define TFT_CS_PIN                 EXP1_07_PIN
282
+  #define TFT_SCK_PIN                EXP2_02_PIN
283
+  #define TFT_MISO_PIN               EXP2_01_PIN
284
+  #define TFT_MOSI_PIN               EXP2_06_PIN
285
+  #define TFT_DC_PIN                 EXP1_08_PIN
286
   #define TFT_A0_PIN                  TFT_DC_PIN
286
   #define TFT_A0_PIN                  TFT_DC_PIN
287
 
287
 
288
-  #define TFT_RESET_PIN              EXP1_07_PIN
288
+  #define TFT_RESET_PIN              EXP1_04_PIN
289
 
289
 
290
-  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
290
+  #define LCD_BACKLIGHT_PIN          EXP1_03_PIN
291
   #define TFT_BACKLIGHT_PIN    LCD_BACKLIGHT_PIN
291
   #define TFT_BACKLIGHT_PIN    LCD_BACKLIGHT_PIN
292
 
292
 
293
   #define TOUCH_BUTTONS_HW_SPI
293
   #define TOUCH_BUTTONS_HW_SPI
300
     #define TFT_HEIGHT                       320
300
     #define TFT_HEIGHT                       320
301
   #endif
301
   #endif
302
 
302
 
303
-  #define TOUCH_CS_PIN               EXP1_06_PIN  // SPI1_NSS
304
-  #define TOUCH_SCK_PIN              EXP2_09_PIN  // SPI1_SCK
305
-  #define TOUCH_MISO_PIN             EXP2_10_PIN  // SPI1_MISO
306
-  #define TOUCH_MOSI_PIN             EXP2_05_PIN  // SPI1_MOSI
303
+  #define TOUCH_CS_PIN               EXP1_05_PIN  // SPI1_NSS
304
+  #define TOUCH_SCK_PIN              EXP2_02_PIN  // SPI1_SCK
305
+  #define TOUCH_MISO_PIN             EXP2_01_PIN  // SPI1_MISO
306
+  #define TOUCH_MOSI_PIN             EXP2_06_PIN  // SPI1_MOSI
307
 
307
 
308
   #define LCD_READ_ID                       0xD3
308
   #define LCD_READ_ID                       0xD3
309
   #define LCD_USE_DMA_SPI
309
   #define LCD_USE_DMA_SPI
328
 
328
 
329
 #elif HAS_WIRED_LCD
329
 #elif HAS_WIRED_LCD
330
 
330
 
331
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
332
-  #define LCD_PINS_RS                EXP1_07_PIN
331
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
332
+  #define LCD_PINS_RS                EXP1_04_PIN
333
   #define LCD_BACKLIGHT_PIN                 -1
333
   #define LCD_BACKLIGHT_PIN                 -1
334
 
334
 
335
   // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
335
   // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
336
   #if ENABLED(MKS_MINI_12864)
336
   #if ENABLED(MKS_MINI_12864)
337
     //#define LCD_BACKLIGHT_PIN             -1
337
     //#define LCD_BACKLIGHT_PIN             -1
338
     //#define LCD_RESET_PIN                 -1
338
     //#define LCD_RESET_PIN                 -1
339
-    #define DOGLCD_A0                EXP1_04_PIN
340
-    #define DOGLCD_CS                EXP1_05_PIN
341
-    //#define DOGLCD_SCK             EXP2_09_PIN
342
-    //#define DOGLCD_MOSI            EXP2_05_PIN
339
+    #define DOGLCD_A0                EXP1_07_PIN
340
+    #define DOGLCD_CS                EXP1_06_PIN
341
+    //#define DOGLCD_SCK             EXP2_02_PIN
342
+    //#define DOGLCD_MOSI            EXP2_06_PIN
343
 
343
 
344
     // Required for MKS_MINI_12864 with this board
344
     // Required for MKS_MINI_12864 with this board
345
     //#define MKS_LCD12864B
345
     //#define MKS_LCD12864B
346
     //#undef SHOW_BOOTSCREEN
346
     //#undef SHOW_BOOTSCREEN
347
 
347
 
348
   #elif ENABLED(FYSETC_MINI_12864_2_1)
348
   #elif ENABLED(FYSETC_MINI_12864_2_1)
349
-    #define LCD_PINS_DC              EXP1_07_PIN
350
-    #define DOGLCD_CS                EXP1_08_PIN
349
+    #define LCD_PINS_DC              EXP1_04_PIN
350
+    #define DOGLCD_CS                EXP1_03_PIN
351
     #define DOGLCD_A0                LCD_PINS_DC
351
     #define DOGLCD_A0                LCD_PINS_DC
352
     #define LCD_BACKLIGHT_PIN               -1
352
     #define LCD_BACKLIGHT_PIN               -1
353
-    #define LCD_RESET_PIN            EXP1_06_PIN
354
-    #define NEOPIXEL_PIN             EXP1_05_PIN
355
-    #define DOGLCD_MOSI              EXP2_05_PIN
356
-    #define DOGLCD_SCK               EXP2_09_PIN
353
+    #define LCD_RESET_PIN            EXP1_05_PIN
354
+    #define NEOPIXEL_PIN             EXP1_06_PIN
355
+    #define DOGLCD_MOSI              EXP2_06_PIN
356
+    #define DOGLCD_SCK               EXP2_02_PIN
357
     #if SD_CONNECTION_IS(ONBOARD)
357
     #if SD_CONNECTION_IS(ONBOARD)
358
       #define FORCE_SOFT_SPI
358
       #define FORCE_SOFT_SPI
359
     #endif
359
     #endif
361
 
361
 
362
   #else                                           // !MKS_MINI_12864
362
   #else                                           // !MKS_MINI_12864
363
 
363
 
364
-    #define LCD_PINS_D4              EXP1_06_PIN
364
+    #define LCD_PINS_D4              EXP1_05_PIN
365
     #if ENABLED(ULTIPANEL)
365
     #if ENABLED(ULTIPANEL)
366
-      #define LCD_PINS_D5            EXP1_05_PIN
367
-      #define LCD_PINS_D6            EXP1_04_PIN
368
-      #define LCD_PINS_D7            EXP1_03_PIN
366
+      #define LCD_PINS_D5            EXP1_06_PIN
367
+      #define LCD_PINS_D6            EXP1_07_PIN
368
+      #define LCD_PINS_D7            EXP1_08_PIN
369
     #endif
369
     #endif
370
 
370
 
371
     #define BOARD_ST7920_DELAY_1              96
371
     #define BOARD_ST7920_DELAY_1              96
382
 #endif
382
 #endif
383
 
383
 
384
 #if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI, HAS_WIRED_LCD)
384
 #if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI, HAS_WIRED_LCD)
385
-  #define BEEPER_PIN                 EXP1_10_PIN
385
+  #define BEEPER_PIN                 EXP1_01_PIN
386
   #if DISABLED(USE_SPI_DMA_TC)
386
   #if DISABLED(USE_SPI_DMA_TC)
387
-    #define BTN_EN1                  EXP2_08_PIN
388
-    #define BTN_EN2                  EXP2_06_PIN
389
-    #define BTN_ENC                  EXP1_09_PIN
387
+    #define BTN_EN1                  EXP2_03_PIN
388
+    #define BTN_EN2                  EXP2_05_PIN
389
+    #define BTN_ENC                  EXP1_02_PIN
390
   #endif
390
   #endif
391
 #endif
391
 #endif

+ 56
- 56
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h 查看文件

230
 #endif
230
 #endif
231
 
231
 
232
 /**               ------                                      ------
232
 /**               ------                                      ------
233
- * (BEEPER) PC5  |10  9 | PE13 (BTN_ENC)    (SPI1 MISO) PA6  |10  9 | PA5  (SPI1 SCK)
234
- * (LCD_EN) PD13 | 8  7 | PC6  (LCD_RS)       (BTN_EN1) PE8  | 8  7 | PE10 (SPI1 CS)
235
- * (LCD_D4) PE14   6  5 | PE15 (LCD_D5)       (BTN_EN2) PE11   6  5 | PA7  (SPI1 MOSI)
236
- * (LCD_D6) PD11 | 4  3 | PD10 (LCD_D7)       (SPI DET) PE12 | 4  3 | RESET
237
- *           GND | 2  1 | 5V                             GND | 2  1 | 3.3V
233
+ * (BEEPER) PC5  | 1  2 | PE13 (BTN_ENC)    (SPI1 MISO) PA6  | 1  2 | PA5  (SPI1 SCK)
234
+ * (LCD_EN) PD13 | 3  4 | PC6  (LCD_RS)       (BTN_EN1) PE8  | 3  4 | PE10 (SPI1 CS)
235
+ * (LCD_D4) PE14   5  6 | PE15 (LCD_D5)       (BTN_EN2) PE11   5  6 | PA7  (SPI1 MOSI)
236
+ * (LCD_D6) PD11 | 7  8 | PD10 (LCD_D7)       (SPI DET) PE12 | 7  8 | RESET
237
+ *           GND | 9 10 | 5V                             GND | 9 10 | 3.3V
238
  *                ------                                      ------
238
  *                ------                                      ------
239
  *                 EXP1                                        EXP2
239
  *                 EXP1                                        EXP2
240
  */
240
  */
241
-#define EXP1_03_PIN                     PD10
242
-#define EXP1_04_PIN                     PD11
243
-#define EXP1_05_PIN                     PE15
244
-#define EXP1_06_PIN                     PE14
245
-#define EXP1_07_PIN                     PC6
246
-#define EXP1_08_PIN                     PD13
247
-#define EXP1_09_PIN                     PE13
248
-#define EXP1_10_PIN                     PC5
249
-
250
-#define EXP2_03_PIN                     -1    // RESET
251
-#define EXP2_04_PIN                     PE12
252
-#define EXP2_05_PIN                     PA7
253
-#define EXP2_06_PIN                     PE11
254
-#define EXP2_07_PIN                     PE10
255
-#define EXP2_08_PIN                     PE8
256
-#define EXP2_09_PIN                     PA5
257
-#define EXP2_10_PIN                     PA6
241
+#define EXP1_08_PIN                     PD10
242
+#define EXP1_07_PIN                     PD11
243
+#define EXP1_06_PIN                     PE15
244
+#define EXP1_05_PIN                     PE14
245
+#define EXP1_04_PIN                     PC6
246
+#define EXP1_03_PIN                     PD13
247
+#define EXP1_02_PIN                     PE13
248
+#define EXP1_01_PIN                     PC5
249
+
250
+#define EXP2_08_PIN                     -1    // RESET
251
+#define EXP2_07_PIN                     PE12
252
+#define EXP2_06_PIN                     PA7
253
+#define EXP2_05_PIN                     PE11
254
+#define EXP2_04_PIN                     PE10
255
+#define EXP2_03_PIN                     PE8
256
+#define EXP2_02_PIN                     PA5
257
+#define EXP2_01_PIN                     PA6
258
 
258
 
259
 //
259
 //
260
 // LCD SD
260
 // LCD SD
262
 /*
262
 /*
263
 #if SD_CONNECTION_IS(LCD)
263
 #if SD_CONNECTION_IS(LCD)
264
   #define ENABLE_SPI1
264
   #define ENABLE_SPI1
265
-  #define SDSS                       EXP2_07_PIN
266
-  #define SD_SCK_PIN                 EXP2_09_PIN
267
-  #define SD_MISO_PIN                EXP2_10_PIN
268
-  #define SD_MOSI_PIN                EXP2_05_PIN
269
-  #define SD_DETECT_PIN              EXP2_04_PIN
265
+  #define SDSS                       EXP2_04_PIN
266
+  #define SD_SCK_PIN                 EXP2_02_PIN
267
+  #define SD_MISO_PIN                EXP2_01_PIN
268
+  #define SD_MOSI_PIN                EXP2_06_PIN
269
+  #define SD_DETECT_PIN              EXP2_07_PIN
270
 #endif
270
 #endif
271
 */
271
 */
272
 
272
 
300
     #define TOUCH_ORIENTATION    TOUCH_LANDSCAPE
300
     #define TOUCH_ORIENTATION    TOUCH_LANDSCAPE
301
   #endif
301
   #endif
302
 
302
 
303
-  #define TFT_CS_PIN                 EXP1_04_PIN
304
-  #define TFT_SCK_PIN                EXP2_09_PIN
305
-  #define TFT_MISO_PIN               EXP2_10_PIN
306
-  #define TFT_MOSI_PIN               EXP2_05_PIN
307
-  #define TFT_DC_PIN                 EXP1_03_PIN
303
+  #define TFT_CS_PIN                 EXP1_07_PIN
304
+  #define TFT_SCK_PIN                EXP2_02_PIN
305
+  #define TFT_MISO_PIN               EXP2_01_PIN
306
+  #define TFT_MOSI_PIN               EXP2_06_PIN
307
+  #define TFT_DC_PIN                 EXP1_08_PIN
308
   #define TFT_A0_PIN                  TFT_DC_PIN
308
   #define TFT_A0_PIN                  TFT_DC_PIN
309
 
309
 
310
-  #define TFT_RESET_PIN              EXP1_07_PIN
311
-  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
310
+  #define TFT_RESET_PIN              EXP1_04_PIN
311
+  #define LCD_BACKLIGHT_PIN          EXP1_03_PIN
312
   #define TFT_BACKLIGHT_PIN    LCD_BACKLIGHT_PIN
312
   #define TFT_BACKLIGHT_PIN    LCD_BACKLIGHT_PIN
313
 
313
 
314
   #define TOUCH_BUTTONS_HW_SPI
314
   #define TOUCH_BUTTONS_HW_SPI
321
     #define TFT_HEIGHT                       320
321
     #define TFT_HEIGHT                       320
322
   #endif
322
   #endif
323
 
323
 
324
-  #define TOUCH_CS_PIN               EXP1_06_PIN  // SPI1_NSS
325
-  #define TOUCH_SCK_PIN              EXP2_09_PIN  // SPI1_SCK
326
-  #define TOUCH_MISO_PIN             EXP2_10_PIN  // SPI1_MISO
327
-  #define TOUCH_MOSI_PIN             EXP2_05_PIN  // SPI1_MOSI
324
+  #define TOUCH_CS_PIN               EXP1_05_PIN  // SPI1_NSS
325
+  #define TOUCH_SCK_PIN              EXP2_02_PIN  // SPI1_SCK
326
+  #define TOUCH_MISO_PIN             EXP2_01_PIN  // SPI1_MISO
327
+  #define TOUCH_MOSI_PIN             EXP2_06_PIN  // SPI1_MOSI
328
 
328
 
329
-  #define BTN_EN1                    EXP2_08_PIN
330
-  #define BTN_EN2                    EXP2_06_PIN
331
-  #define BEEPER_PIN                 EXP1_10_PIN
332
-  #define BTN_ENC                    EXP1_09_PIN
329
+  #define BTN_EN1                    EXP2_03_PIN
330
+  #define BTN_EN2                    EXP2_05_PIN
331
+  #define BEEPER_PIN                 EXP1_01_PIN
332
+  #define BTN_ENC                    EXP1_02_PIN
333
 
333
 
334
   #define LCD_READ_ID                       0xD3
334
   #define LCD_READ_ID                       0xD3
335
   #define LCD_USE_DMA_SPI
335
   #define LCD_USE_DMA_SPI
339
 
339
 
340
 #elif HAS_WIRED_LCD
340
 #elif HAS_WIRED_LCD
341
 
341
 
342
-  #define BEEPER_PIN                 EXP1_10_PIN
343
-  #define BTN_ENC                    EXP1_09_PIN
344
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
345
-  #define LCD_PINS_RS                EXP1_07_PIN
346
-  #define BTN_EN1                    EXP2_08_PIN
347
-  #define BTN_EN2                    EXP2_06_PIN
342
+  #define BEEPER_PIN                 EXP1_01_PIN
343
+  #define BTN_ENC                    EXP1_02_PIN
344
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
345
+  #define LCD_PINS_RS                EXP1_04_PIN
346
+  #define BTN_EN1                    EXP2_03_PIN
347
+  #define BTN_EN2                    EXP2_05_PIN
348
   #define LCD_BACKLIGHT_PIN                 -1
348
   #define LCD_BACKLIGHT_PIN                 -1
349
 
349
 
350
   // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
350
   // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
351
   #if ENABLED(MKS_MINI_12864)
351
   #if ENABLED(MKS_MINI_12864)
352
     //#define LCD_BACKLIGHT_PIN             -1
352
     //#define LCD_BACKLIGHT_PIN             -1
353
     //#define LCD_RESET_PIN                 -1
353
     //#define LCD_RESET_PIN                 -1
354
-    #define DOGLCD_A0                EXP1_04_PIN
355
-    #define DOGLCD_CS                EXP1_05_PIN
356
-    //#define DOGLCD_SCK             EXP2_09_PIN
357
-    //#define DOGLCD_MOSI            EXP2_05_PIN
354
+    #define DOGLCD_A0                EXP1_07_PIN
355
+    #define DOGLCD_CS                EXP1_06_PIN
356
+    //#define DOGLCD_SCK             EXP2_02_PIN
357
+    //#define DOGLCD_MOSI            EXP2_06_PIN
358
 
358
 
359
     // Required for MKS_MINI_12864 with this board
359
     // Required for MKS_MINI_12864 with this board
360
     //#define MKS_LCD12864B
360
     //#define MKS_LCD12864B
362
 
362
 
363
   #else                                           // !MKS_MINI_12864
363
   #else                                           // !MKS_MINI_12864
364
 
364
 
365
-    #define LCD_PINS_D4              EXP1_06_PIN
365
+    #define LCD_PINS_D4              EXP1_05_PIN
366
     #if ENABLED(ULTIPANEL)
366
     #if ENABLED(ULTIPANEL)
367
-      #define LCD_PINS_D5            EXP1_05_PIN
368
-      #define LCD_PINS_D6            EXP1_04_PIN
369
-      #define LCD_PINS_D7            EXP1_03_PIN
367
+      #define LCD_PINS_D5            EXP1_06_PIN
368
+      #define LCD_PINS_D6            EXP1_07_PIN
369
+      #define LCD_PINS_D7            EXP1_08_PIN
370
     #endif
370
     #endif
371
 
371
 
372
     #define BOARD_ST7920_DELAY_1              96
372
     #define BOARD_ST7920_DELAY_1              96

+ 34
- 34
Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h 查看文件

199
 
199
 
200
 /**
200
 /**
201
  *        ------
201
  *        ------
202
- *  PA14 |10  9 | PB0
203
- *  PC4  | 8  7 | --
204
- *  PC5  | 6  5   PB13
205
- *  PB12 | 4  3 | PB15
206
- *   GND | 2  1 | 5V
202
+ *  PA14 | 1  2 | PB0
203
+ *  PC4  | 3  4 | --
204
+ *  PC5  | 5  6   PB13
205
+ *  PB12 | 7  8 | PB15
206
+ *   GND | 9 10 | 5V
207
  *        ------
207
  *        ------
208
  *         EXP1
208
  *         EXP1
209
  *
209
  *
213
  * A remote SD card is currently not supported because the pins routed to the EXP2
213
  * A remote SD card is currently not supported because the pins routed to the EXP2
214
  * connector are shared with the onboard SD card.
214
  * connector are shared with the onboard SD card.
215
  */
215
  */
216
-#define EXP1_03_PIN                         PB15
217
-#define EXP1_04_PIN                         PB12
218
-#define EXP1_05_PIN                         PB13
219
-#define EXP1_06_PIN                         PC5
220
-//#define EXP1_07_PIN                       -1
221
-#define EXP1_08_PIN                         PC4
222
-#define EXP1_09_PIN                         PB0
223
-#define EXP1_10_PIN                         PA14
216
+#define EXP1_08_PIN                         PB15
217
+#define EXP1_07_PIN                         PB12
218
+#define EXP1_06_PIN                         PB13
219
+#define EXP1_05_PIN                         PC5
220
+//#define EXP1_04_PIN                       -1
221
+#define EXP1_03_PIN                         PC4
222
+#define EXP1_02_PIN                         PB0
223
+#define EXP1_01_PIN                         PA14
224
 
224
 
225
 #if ENABLED(CR10_STOCKDISPLAY)
225
 #if ENABLED(CR10_STOCKDISPLAY)
226
   /**          ------
226
   /**          ------
227
-   *   BEEPER |10  9 | ENC
228
-   *   EN1    | 8  7 | RESET
229
-   *   EN2    | 6  5   LCD_D4
230
-   *   LCD_RS | 4  3 | LCD_EN
231
-   *      GND | 2  1 | 5V
227
+   *   BEEPER | 1  2 | ENC
228
+   *   EN1    | 3  4 | RESET
229
+   *   EN2    | 5  6   LCD_D4
230
+   *   LCD_RS | 7  8 | LCD_EN
231
+   *      GND | 9 10 | 5V
232
    *           ------
232
    *           ------
233
    */
233
    */
234
   #ifdef DISABLE_JTAGSWD
234
   #ifdef DISABLE_JTAGSWD
235
-    #define BEEPER_PIN               EXP1_10_PIN  // Not connected in dev board
235
+    #define BEEPER_PIN               EXP1_01_PIN  // Not connected in dev board
236
   #endif
236
   #endif
237
-  #define LCD_PINS_RS                EXP1_04_PIN
238
-  #define LCD_PINS_ENABLE            EXP1_03_PIN
239
-  #define LCD_PINS_D4                EXP1_05_PIN
237
+  #define LCD_PINS_RS                EXP1_07_PIN
238
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
239
+  #define LCD_PINS_D4                EXP1_06_PIN
240
   //#define KILL_PIN                        -1
240
   //#define KILL_PIN                        -1
241
 
241
 
242
   #define BOARD_ST7920_DELAY_1           600
242
   #define BOARD_ST7920_DELAY_1           600
245
 
245
 
246
 #elif ENABLED(MKS_MINI_12864)
246
 #elif ENABLED(MKS_MINI_12864)
247
   /**          ------
247
   /**          ------
248
-   *      SCK |10  9 | ENC
249
-   *      EN1 | 8  7 | --
250
-   *      EN2 | 6  5   A0
251
-   *      CS  | 4  3 | MOSI
252
-   *      GND | 2  1 | 5V
248
+   *      SCK | 1  2 | ENC
249
+   *      EN1 | 3  4 | --
250
+   *      EN2 | 5  6   A0
251
+   *      CS  | 7  8 | MOSI
252
+   *      GND | 9 10 | 5V
253
    *           ------
253
    *           ------
254
    */
254
    */
255
-  #define DOGLCD_CS                  EXP1_04_PIN
256
-  #define DOGLCD_A0                  EXP1_05_PIN
257
-  #define DOGLCD_SCK                 EXP1_10_PIN
258
-  #define DOGLCD_MOSI                EXP1_03_PIN
255
+  #define DOGLCD_CS                  EXP1_07_PIN
256
+  #define DOGLCD_A0                  EXP1_06_PIN
257
+  #define DOGLCD_SCK                 EXP1_01_PIN
258
+  #define DOGLCD_MOSI                EXP1_08_PIN
259
   #define LCD_CONTRAST_INIT                  160
259
   #define LCD_CONTRAST_INIT                  160
260
   #define LCD_CONTRAST_MIN                   120
260
   #define LCD_CONTRAST_MIN                   120
261
   #define LCD_CONTRAST_MAX                   180
261
   #define LCD_CONTRAST_MAX                   180
269
 #endif
269
 #endif
270
 
270
 
271
 #if EITHER(CR10_STOCKDISPLAY, MKS_MINI_12864)
271
 #if EITHER(CR10_STOCKDISPLAY, MKS_MINI_12864)
272
-  #define BTN_EN1                    EXP1_08_PIN
273
-  #define BTN_EN2                    EXP1_06_PIN
274
-  #define BTN_ENC                    EXP1_09_PIN
272
+  #define BTN_EN1                    EXP1_03_PIN
273
+  #define BTN_EN2                    EXP1_05_PIN
274
+  #define BTN_ENC                    EXP1_02_PIN
275
 #endif
275
 #endif

+ 33
- 33
Marlin/src/pins/stm32f4/pins_VAKE403D.h 查看文件

161
 #define POWER_LOSS_PIN                      PA4   // ?? Power loss / nAC_FAULT
161
 #define POWER_LOSS_PIN                      PA4   // ?? Power loss / nAC_FAULT
162
 
162
 
163
 #if ENABLED(SDSUPPORT)
163
 #if ENABLED(SDSUPPORT)
164
-  #define SD_DETECT_PIN              EXP2_04_PIN
164
+  #define SD_DETECT_PIN              EXP2_07_PIN
165
   #define SD_SS_PIN                         PB15  // USD_CS -> CS for onboard SD
165
   #define SD_SS_PIN                         PB15  // USD_CS -> CS for onboard SD
166
 #endif
166
 #endif
167
 
167
 
168
 /**
168
 /**
169
  *        ------                  ------
169
  *        ------                  ------
170
- *   PC9 |10  9 | PB12         ? |10  9 | ?
171
- *   PD7 | 8  7 | PC12       PD6 | 8  7 | ?
172
- *   PD1 | 6  5   PD2        PD0 | 6  5   ?
173
- *   PD3 | 4  3 | PD4        PB7 | 4  3 | RESET
174
- *   GND | 2  1 | 5V         GND | 2  1 | 3.3V
170
+ *   PC9 | 1  2 | PB12         ? | 1  2 | ?
171
+ *   PD7 | 3  4 | PC12       PD6 | 3  4 | ?
172
+ *   PD1 | 5  6   PD2        PD0 | 5  6   ?
173
+ *   PD3 | 7  8 | PD4        PB7 | 7  8 | RESET
174
+ *   GND | 9 10 | 5V         GND | 9 10 | 3.3V
175
  *        ------                  ------
175
  *        ------                  ------
176
  *         EXP1                    EXP2
176
  *         EXP1                    EXP2
177
  */
177
  */
178
-#define EXP1_03_PIN                         PD4
179
-#define EXP1_04_PIN                         PD3
180
-#define EXP1_05_PIN                         PD2
181
-#define EXP1_06_PIN                         PD1
182
-#define EXP1_07_PIN                         PC12
183
-#define EXP1_08_PIN                         PD7
184
-#define EXP1_09_PIN                         PB12
185
-#define EXP1_10_PIN                         PC9
186
-
187
-#define EXP2_03_PIN                         -1
188
-#define EXP2_04_PIN                         PB7
189
-//#define EXP2_05_PIN                       ?
190
-#define EXP2_06_PIN                         PD0
191
-//#define EXP2_07_PIN                       ?
192
-#define EXP2_08_PIN                         PD6
193
-//#define EXP2_09_PIN                       ?
194
-//#define EXP2_10_PIN                       ?
178
+#define EXP1_08_PIN                         PD4
179
+#define EXP1_07_PIN                         PD3
180
+#define EXP1_06_PIN                         PD2
181
+#define EXP1_05_PIN                         PD1
182
+#define EXP1_04_PIN                         PC12
183
+#define EXP1_03_PIN                         PD7
184
+#define EXP1_02_PIN                         PB12
185
+#define EXP1_01_PIN                         PC9
186
+
187
+#define EXP2_08_PIN                         -1
188
+#define EXP2_07_PIN                         PB7
189
+//#define EXP2_06_PIN                       ?
190
+#define EXP2_05_PIN                         PD0
191
+//#define EXP2_04_PIN                       ?
192
+#define EXP2_03_PIN                         PD6
193
+//#define EXP2_02_PIN                       ?
194
+//#define EXP2_01_PIN                       ?
195
 
195
 
196
 //
196
 //
197
 // LCD / Controller
197
 // LCD / Controller
202
     #define SDSS                            PB6   // CS for SD card in LCD
202
     #define SDSS                            PB6   // CS for SD card in LCD
203
   #endif
203
   #endif
204
 
204
 
205
-  #define BEEPER_PIN                 EXP1_10_PIN
205
+  #define BEEPER_PIN                 EXP1_01_PIN
206
 
206
 
207
-  #define BTN_EN1                    EXP2_08_PIN
208
-  #define BTN_EN2                    EXP2_06_PIN
209
-  #define BTN_ENC                    EXP1_09_PIN
207
+  #define BTN_EN1                    EXP2_03_PIN
208
+  #define BTN_EN2                    EXP2_05_PIN
209
+  #define BTN_ENC                    EXP1_02_PIN
210
 
210
 
211
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
212
-  #define LCD_PINS_RS                EXP1_07_PIN
211
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
212
+  #define LCD_PINS_RS                EXP1_04_PIN
213
 
213
 
214
-  #define LCD_PINS_D4                EXP1_06_PIN
215
-  #define LCD_PINS_D5                EXP1_05_PIN
216
-  #define LCD_PINS_D6                EXP1_04_PIN
217
-  #define LCD_PINS_D7                EXP1_03_PIN
214
+  #define LCD_PINS_D4                EXP1_05_PIN
215
+  #define LCD_PINS_D5                EXP1_06_PIN
216
+  #define LCD_PINS_D6                EXP1_07_PIN
217
+  #define LCD_PINS_D7                EXP1_08_PIN
218
 
218
 
219
 #endif
219
 #endif
220
 
220
 

+ 39
- 39
Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h 查看文件

145
 /**
145
 /**
146
  *              SKR Mini E3 V3.0
146
  *              SKR Mini E3 V3.0
147
  *                  ------
147
  *                  ------
148
- *  (BEEPER)  PB5  |10  9 | PA15 (BTN_ENC)
149
- *  (BTN_EN1) PA9  | 8  7 | RESET
150
- *  (BTN_EN2) PA10   6  5 | PB9  (LCD_D4)
151
- *  (LCD_RS)  PB8  | 4  3 | PD6  (LCD_EN)
152
- *             GND | 2  1 | 5V
148
+ *  (BEEPER)  PB5  | 1  2 | PA15 (BTN_ENC)
149
+ *  (BTN_EN1) PA9  | 3  4 | RESET
150
+ *  (BTN_EN2) PA10   5  6 | PB9  (LCD_D4)
151
+ *  (LCD_RS)  PB8  | 7  8 | PD6  (LCD_EN)
152
+ *             GND | 9 10 | 5V
153
  *                  ------
153
  *                  ------
154
  *                   EXP1
154
  *                   EXP1
155
  */
155
  */
156
-#define EXP1_09_PIN                         PA15
157
-#define EXP1_03_PIN                         PD6
156
+#define EXP1_02_PIN                         PA15
157
+#define EXP1_08_PIN                         PD6
158
 
158
 
159
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
159
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
160
   /**
160
   /**
161
    *        ------                ------                ------
161
    *        ------                ------                ------
162
-   * (ENT) |10  9 | (BEEP)       |10  9 |              |10  9 |
163
-   *  (RX) | 8  7 |         (RX) | 8  7 | (TX)      RX | 8  7 | TX
164
-   *  (TX)   6  5 |        (ENT)   6  5 | (BEEP)   ENT | 6  5 | BEEP
165
-   *   (B) | 4  3 | (A)      (B) | 4  3 | (A)        B | 4  3 | A
166
-   *   GND | 2  1 | (VCC)    GND | 2  1 | VCC      GND | 2  1 | VCC
162
+   * (ENT) | 1  2 | (BEEP)       | 1  2 |              | 1  2 |
163
+   *  (RX) | 3  4 |         (RX) | 3  4 | (TX)      RX | 3  4 | TX
164
+   *  (TX)   5  6 |        (ENT)   5  6 | (BEEP)   ENT | 5  6 | BEEP
165
+   *   (B) | 7  8 | (A)      (B) | 7  8 | (A)        B | 7  8 | A
166
+   *   GND | 9 10 | (VCC)    GND | 9 10 | VCC      GND | 9 10 | VCC
167
    *        ------                ------                ------
167
    *        ------                ------                ------
168
    *         EXP1                  DWIN               DWIN (plug)
168
    *         EXP1                  DWIN               DWIN (plug)
169
    *
169
    *
174
     #error "CAUTION! DWIN_CREALITY_LCD requires a custom cable, see diagram above this line. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
174
     #error "CAUTION! DWIN_CREALITY_LCD requires a custom cable, see diagram above this line. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
175
   #endif
175
   #endif
176
 
176
 
177
-  #define BEEPER_PIN                 EXP1_09_PIN
178
-  #define BTN_EN1                    EXP1_03_PIN
177
+  #define BEEPER_PIN                 EXP1_02_PIN
178
+  #define BTN_EN1                    EXP1_08_PIN
179
   #define BTN_EN2                           PB8
179
   #define BTN_EN2                           PB8
180
   #define BTN_ENC                           PB5
180
   #define BTN_ENC                           PB5
181
 
181
 
184
   #if ENABLED(CR10_STOCKDISPLAY)
184
   #if ENABLED(CR10_STOCKDISPLAY)
185
 
185
 
186
     #define BEEPER_PIN                      PB5
186
     #define BEEPER_PIN                      PB5
187
-    #define BTN_ENC                  EXP1_09_PIN
187
+    #define BTN_ENC                  EXP1_02_PIN
188
 
188
 
189
     #define BTN_EN1                         PA9
189
     #define BTN_EN1                         PA9
190
     #define BTN_EN2                         PA10
190
     #define BTN_EN2                         PA10
191
 
191
 
192
     #define LCD_PINS_RS                     PB8
192
     #define LCD_PINS_RS                     PB8
193
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
193
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
194
     #define LCD_PINS_D4                     PB9
194
     #define LCD_PINS_D4                     PB9
195
 
195
 
196
   #elif ENABLED(ZONESTAR_LCD)                     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
196
   #elif ENABLED(ZONESTAR_LCD)                     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
200
     #endif
200
     #endif
201
 
201
 
202
     #define LCD_PINS_RS                     PB9
202
     #define LCD_PINS_RS                     PB9
203
-    #define LCD_PINS_ENABLE          EXP1_09_PIN
203
+    #define LCD_PINS_ENABLE          EXP1_02_PIN
204
     #define LCD_PINS_D4                     PB8
204
     #define LCD_PINS_D4                     PB8
205
     #define LCD_PINS_D5                     PA10
205
     #define LCD_PINS_D5                     PA10
206
     #define LCD_PINS_D6                     PA9
206
     #define LCD_PINS_D6                     PA9
209
 
209
 
210
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
210
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
211
 
211
 
212
-    #define BTN_ENC                  EXP1_09_PIN
212
+    #define BTN_ENC                  EXP1_02_PIN
213
     #define BTN_EN1                         PA9
213
     #define BTN_EN1                         PA9
214
     #define BTN_EN2                         PA10
214
     #define BTN_EN2                         PA10
215
 
215
 
216
     #define DOGLCD_CS                       PB8
216
     #define DOGLCD_CS                       PB8
217
     #define DOGLCD_A0                       PB9
217
     #define DOGLCD_A0                       PB9
218
     #define DOGLCD_SCK                      PB5
218
     #define DOGLCD_SCK                      PB5
219
-    #define DOGLCD_MOSI              EXP1_03_PIN
219
+    #define DOGLCD_MOSI              EXP1_08_PIN
220
 
220
 
221
     #define FORCE_SOFT_SPI
221
     #define FORCE_SOFT_SPI
222
     #define LCD_BACKLIGHT_PIN               -1
222
     #define LCD_BACKLIGHT_PIN               -1
234
        *
234
        *
235
        *                 Board                               Display
235
        *                 Board                               Display
236
        *                 ------                               ------
236
        *                 ------                               ------
237
-       * (BEEPER) PB6  |10  9 | PB5  (SD_DET)             5V |10  9 | GND
238
-       *         RESET | 8  7 | PA9  (MOD_RESET)          -- | 8  7 | (SD_DET)
239
-       *          PB9    6  5 | PA10 (SD_CS)         (MOSI)  | 6  5 | --
240
-       *          PB7  | 4  3 | PB8  (LCD_CS)        (SD_CS) | 4  3 | (LCD_CS)
241
-       *           GND | 2  1 | 5V                   (SCK)   | 2  1 | (MISO)
237
+       * (BEEPER) PB6  | 1  2 | PB5  (SD_DET)             5V | 1  2 | GND
238
+       *         RESET | 3  4 | PA9  (MOD_RESET)          -- | 3  4 | (SD_DET)
239
+       *          PB9    5  6 | PA10 (SD_CS)         (MOSI)  | 5  6 | --
240
+       *          PB7  | 7  8 | PB8  (LCD_CS)        (SD_CS) | 7  8 | (LCD_CS)
241
+       *           GND | 9 10 | 5V                   (SCK)   | 9 10 | (MISO)
242
        *                 ------                               ------
242
        *                 ------                               ------
243
        *                  EXP1                                 EXP1
243
        *                  EXP1                                 EXP1
244
        *
244
        *
272
        *
272
        *
273
        *                 Board                               Display
273
        *                 Board                               Display
274
        *                 ------                               ------
274
        *                 ------                               ------
275
-       *    (EN2)  PB5  |10  9 | PA15(BTN_ENC)            5V |10  9 | GND
276
-       *  (LCD_CS) PA9  | 8  7 | RST (RESET)              -- | 8  7 | --
275
+       *    (EN2)  PB5  | 1  2 | PA15(BTN_ENC)            5V | 1  2 | GND
276
+       *  (LCD_CS) PA9  | 3  4 | RST (RESET)              -- | 3  4 | --
277
        *  (LCD_A0) PA10 |#6  5 | PB9 (EN1)            (DIN)  | 6  5#| (RESET)
277
        *  (LCD_A0) PA10 |#6  5 | PB9 (EN1)            (DIN)  | 6  5#| (RESET)
278
-       *  (LCD_SCK)PB8  | 4  3 | PD6 (MOSI)         (LCD_A0) | 4  3 | (LCD_CS)
279
-       *            GND | 2  1 | 5V                (BTN_ENC) | 2  1 | --
278
+       *  (LCD_SCK)PB8  | 7  8 | PD6 (MOSI)         (LCD_A0) | 7  8 | (LCD_CS)
279
+       *            GND | 9 10 | 5V                (BTN_ENC) | 9 10 | --
280
        *                 ------                               ------
280
        *                 ------                               ------
281
        *                  EXP1                                 EXP1
281
        *                  EXP1                                 EXP1
282
        *
282
        *
283
        *                                                      ------
283
        *                                                      ------
284
-       *                                                  -- |10  9 | --
285
-       *                   ---                       (RESET) | 8  7 | --
284
+       *                                                  -- | 1  2 | --
285
+       *                   ---                       (RESET) | 3  4 | --
286
        *                  | 3 |                      (MOSI)  | 6  5#| (EN2)
286
        *                  | 3 |                      (MOSI)  | 6  5#| (EN2)
287
-       *                  | 2 | (DIN)                     -- | 4  3 | (EN1)
288
-       *                  | 1 |                     (LCD_SCK)| 2  1 | --
287
+       *                  | 2 | (DIN)                     -- | 7  8 | (EN1)
288
+       *                  | 1 |                     (LCD_SCK)| 9 10 | --
289
        *                   ---                                ------
289
        *                   ---                                ------
290
        *                Neopixel                               EXP2
290
        *                Neopixel                               EXP2
291
        *
291
        *
294
        * Check twice index position!!! (marked as # here)
294
        * Check twice index position!!! (marked as # here)
295
        * On BTT boards pins from IDC10 connector are numbered in unusual order.
295
        * On BTT boards pins from IDC10 connector are numbered in unusual order.
296
        */
296
        */
297
-    #define BTN_ENC                  EXP1_09_PIN
297
+    #define BTN_ENC                  EXP1_02_PIN
298
     #define BTN_EN1                         PB9
298
     #define BTN_EN1                         PB9
299
     #define BTN_EN2                         PB5
299
     #define BTN_EN2                         PB5
300
     #define BEEPER_PIN                      -1
300
     #define BEEPER_PIN                      -1
324
    *
324
    *
325
    *                   Board                             Display
325
    *                   Board                             Display
326
    *                   ------                            ------
326
    *                   ------                            ------
327
-   * (SD_DET)    PB5  |10  9 | PB6 (BEEPER)          5V |10  9 | GND
328
-   * (MOD_RESET) PA9  | 8  7 | RESET            (RESET) | 8  7 | (SD_DET)
329
-   * (SD_CS)     PA10   6  5 | PB9 (FREE)       (MOSI)  | 6  5 | (LCD_CS)
330
-   * (LCD_CS)    PB8  | 4  3 | PB7 (FREE)       (SD_CS) | 4  3 | (MOD_RESET)
331
-   *               5V | 2  1 | GND              (SCK)   | 2  1 | (MISO)
327
+   * (SD_DET)    PB5  | 1  2 | PB6 (BEEPER)          5V | 1  2 | GND
328
+   * (MOD_RESET) PA9  | 3  4 | RESET            (RESET) | 3  4 | (SD_DET)
329
+   * (SD_CS)     PA10   5  6 | PB9 (FREE)       (MOSI)  | 5  6 | (LCD_CS)
330
+   * (LCD_CS)    PB8  | 7  8 | PB7 (FREE)       (SD_CS) | 7  8 | (MOD_RESET)
331
+   *               5V | 9 10 | GND              (SCK)   | 9 10 | (MISO)
332
    *                   ------                            ------
332
    *                   ------                            ------
333
    *                    EXP1                              EXP1
333
    *                    EXP1                              EXP1
334
    *
334
    *
350
 
350
 
351
   #define CLCD_SPI_BUS                         1  // SPI1 connector
351
   #define CLCD_SPI_BUS                         1  // SPI1 connector
352
 
352
 
353
-  #define BEEPER_PIN                 EXP1_09_PIN
353
+  #define BEEPER_PIN                 EXP1_02_PIN
354
 
354
 
355
   #define CLCD_MOD_RESET                    PA9
355
   #define CLCD_MOD_RESET                    PA9
356
   #define CLCD_SPI_CS                       PB8
356
   #define CLCD_SPI_CS                       PB8

+ 92
- 92
Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h 查看文件

326
 
326
 
327
 /**
327
 /**
328
  *                ------                                   ------
328
  *                ------                                   ------
329
- * (BEEPER) PC5  |10  9 | PB0  (BTN_ENC)  (MISO)      PA6 |10  9 | PA5 (SCK)
330
- * (LCD_EN) PB1  | 8  7 | PE8  (LCD_RS)   (BTN_EN1)   PE7 | 8  7 | PA4 (SD_SS)
331
- * (LCD_D4) PE9  | 6  5   PE10 (LCD_D5)   (BTN_EN2)   PB2 | 6  5   PA7 (MOSI)
332
- * (LCD_D6) PE11 | 4  3 | PE12 (LCD_D7)   (SD_DETECT) PC4 | 4  3 | RESET
333
- *           GND | 2  1 | 5V                          GND | 2  1 | --
329
+ * (BEEPER) PC5  | 1  2 | PB0  (BTN_ENC)  (MISO)      PA6 | 1  2 | PA5 (SCK)
330
+ * (LCD_EN) PB1  | 3  4 | PE8  (LCD_RS)   (BTN_EN1)   PE7 | 3  4 | PA4 (SD_SS)
331
+ * (LCD_D4) PE9  | 5  6   PE10 (LCD_D5)   (BTN_EN2)   PB2 | 5  6   PA7 (MOSI)
332
+ * (LCD_D6) PE11 | 7  8 | PE12 (LCD_D7)   (SD_DETECT) PC4 | 7  8 | RESET
333
+ *           GND | 9 10 | 5V                          GND | 9 10 | --
334
  *                ------                                   ------
334
  *                ------                                   ------
335
  *                 EXP1                                     EXP2
335
  *                 EXP1                                     EXP2
336
  */
336
  */
337
-#define EXP1_03_PIN                         PE12
338
-#define EXP1_04_PIN                         PE11
339
-#define EXP1_05_PIN                         PE10
340
-#define EXP1_06_PIN                         PE9
341
-#define EXP1_07_PIN                         PE8
342
-#define EXP1_08_PIN                         PB1
343
-#define EXP1_09_PIN                         PB0
344
-#define EXP1_10_PIN                         PC5
345
-
346
-#define EXP2_03_PIN                         -1
347
-#define EXP2_04_PIN                         PC4
348
-#define EXP2_05_PIN                         PA7
349
-#define EXP2_06_PIN                         PB2
350
-#define EXP2_07_PIN                         PA4
351
-#define EXP2_08_PIN                         PE7
352
-#define EXP2_09_PIN                         PA5
353
-#define EXP2_10_PIN                         PA6
337
+#define EXP1_08_PIN                         PE12
338
+#define EXP1_07_PIN                         PE11
339
+#define EXP1_06_PIN                         PE10
340
+#define EXP1_05_PIN                         PE9
341
+#define EXP1_04_PIN                         PE8
342
+#define EXP1_03_PIN                         PB1
343
+#define EXP1_02_PIN                         PB0
344
+#define EXP1_01_PIN                         PC5
345
+
346
+#define EXP2_08_PIN                         -1
347
+#define EXP2_07_PIN                         PC4
348
+#define EXP2_06_PIN                         PA7
349
+#define EXP2_05_PIN                         PB2
350
+#define EXP2_04_PIN                         PA4
351
+#define EXP2_03_PIN                         PE7
352
+#define EXP2_02_PIN                         PA5
353
+#define EXP2_01_PIN                         PA6
354
 
354
 
355
 //
355
 //
356
 // Onboard SD card
356
 // Onboard SD card
357
 // Must use soft SPI because Marlin's default hardware SPI is tied to LCD's EXP2
357
 // Must use soft SPI because Marlin's default hardware SPI is tied to LCD's EXP2
358
 //
358
 //
359
 #if SD_CONNECTION_IS(LCD)
359
 #if SD_CONNECTION_IS(LCD)
360
-  #define SDSS                       EXP2_07_PIN
360
+  #define SDSS                       EXP2_04_PIN
361
   #define SD_SS_PIN                         SDSS
361
   #define SD_SS_PIN                         SDSS
362
-  #define SD_SCK_PIN                 EXP2_09_PIN
363
-  #define SD_MISO_PIN                EXP2_10_PIN
364
-  #define SD_MOSI_PIN                EXP2_05_PIN
365
-  #define SD_DETECT_PIN              EXP2_04_PIN
362
+  #define SD_SCK_PIN                 EXP2_02_PIN
363
+  #define SD_MISO_PIN                EXP2_01_PIN
364
+  #define SD_MOSI_PIN                EXP2_06_PIN
365
+  #define SD_DETECT_PIN              EXP2_07_PIN
366
 #elif SD_CONNECTION_IS(ONBOARD)
366
 #elif SD_CONNECTION_IS(ONBOARD)
367
   #define SDIO_SUPPORT
367
   #define SDIO_SUPPORT
368
   #define SDIO_CLOCK                 24000000  // 24MHz
368
   #define SDIO_CLOCK                 24000000  // 24MHz
384
    */
384
    */
385
 
385
 
386
   // M1 on Driver Expansion Module
386
   // M1 on Driver Expansion Module
387
-  #define E2_STEP_PIN                EXP2_05_PIN
388
-  #define E2_DIR_PIN                 EXP2_06_PIN
389
-  #define E2_ENABLE_PIN              EXP2_04_PIN
387
+  #define E2_STEP_PIN                EXP2_06_PIN
388
+  #define E2_DIR_PIN                 EXP2_05_PIN
389
+  #define E2_ENABLE_PIN              EXP2_07_PIN
390
   #if !EXP_MOT_USE_EXP2_ONLY
390
   #if !EXP_MOT_USE_EXP2_ONLY
391
-    #define E2_DIAG_PIN              EXP1_06_PIN
392
-    #define E2_CS_PIN                EXP1_05_PIN
391
+    #define E2_DIAG_PIN              EXP1_05_PIN
392
+    #define E2_CS_PIN                EXP1_06_PIN
393
     #if HAS_TMC_UART
393
     #if HAS_TMC_UART
394
-      #define E2_SERIAL_TX_PIN       EXP1_05_PIN
395
-      #define E2_SERIAL_RX_PIN       EXP1_05_PIN
394
+      #define E2_SERIAL_TX_PIN       EXP1_06_PIN
395
+      #define E2_SERIAL_RX_PIN       EXP1_06_PIN
396
     #endif
396
     #endif
397
   #endif
397
   #endif
398
 
398
 
399
   // M2 on Driver Expansion Module
399
   // M2 on Driver Expansion Module
400
-  #define E3_STEP_PIN                EXP2_08_PIN
401
-  #define E3_DIR_PIN                 EXP2_07_PIN
400
+  #define E3_STEP_PIN                EXP2_03_PIN
401
+  #define E3_DIR_PIN                 EXP2_04_PIN
402
   #if !EXP_MOT_USE_EXP2_ONLY
402
   #if !EXP_MOT_USE_EXP2_ONLY
403
-    #define E3_ENABLE_PIN            EXP1_03_PIN
404
-    #define E3_DIAG_PIN              EXP1_08_PIN
405
-    #define E3_CS_PIN                EXP1_07_PIN
403
+    #define E3_ENABLE_PIN            EXP1_08_PIN
404
+    #define E3_DIAG_PIN              EXP1_03_PIN
405
+    #define E3_CS_PIN                EXP1_04_PIN
406
     #if HAS_TMC_UART
406
     #if HAS_TMC_UART
407
-      #define E3_SERIAL_TX_PIN       EXP1_07_PIN
408
-      #define E3_SERIAL_RX_PIN       EXP1_07_PIN
407
+      #define E3_SERIAL_TX_PIN       EXP1_04_PIN
408
+      #define E3_SERIAL_RX_PIN       EXP1_04_PIN
409
     #endif
409
     #endif
410
   #else
410
   #else
411
-    #define E3_ENABLE_PIN            EXP2_04_PIN
411
+    #define E3_ENABLE_PIN            EXP2_07_PIN
412
   #endif
412
   #endif
413
 
413
 
414
   // M3 on Driver Expansion Module
414
   // M3 on Driver Expansion Module
415
-  #define E4_STEP_PIN                EXP2_10_PIN
416
-  #define E4_DIR_PIN                 EXP2_09_PIN
415
+  #define E4_STEP_PIN                EXP2_01_PIN
416
+  #define E4_DIR_PIN                 EXP2_02_PIN
417
   #if !EXP_MOT_USE_EXP2_ONLY
417
   #if !EXP_MOT_USE_EXP2_ONLY
418
-    #define E4_ENABLE_PIN            EXP1_04_PIN
419
-    #define E4_DIAG_PIN              EXP1_10_PIN
420
-    #define E4_CS_PIN                EXP1_09_PIN
418
+    #define E4_ENABLE_PIN            EXP1_07_PIN
419
+    #define E4_DIAG_PIN              EXP1_01_PIN
420
+    #define E4_CS_PIN                EXP1_02_PIN
421
     #if HAS_TMC_UART
421
     #if HAS_TMC_UART
422
-      #define E4_SERIAL_TX_PIN       EXP1_09_PIN
423
-      #define E4_SERIAL_RX_PIN       EXP1_09_PIN
422
+      #define E4_SERIAL_TX_PIN       EXP1_02_PIN
423
+      #define E4_SERIAL_RX_PIN       EXP1_02_PIN
424
     #endif
424
     #endif
425
   #else
425
   #else
426
-    #define E4_ENABLE_PIN            EXP2_04_PIN
426
+    #define E4_ENABLE_PIN            EXP2_07_PIN
427
   #endif
427
   #endif
428
 
428
 
429
 #endif // BTT_MOTOR_EXPANSION
429
 #endif // BTT_MOTOR_EXPANSION
434
 #if IS_TFTGLCD_PANEL
434
 #if IS_TFTGLCD_PANEL
435
 
435
 
436
   #if ENABLED(TFTGLCD_PANEL_SPI)
436
   #if ENABLED(TFTGLCD_PANEL_SPI)
437
-    #define TFTGLCD_CS               EXP2_08_PIN
437
+    #define TFTGLCD_CS               EXP2_03_PIN
438
   #endif
438
   #endif
439
 
439
 
440
 #elif HAS_WIRED_LCD
440
 #elif HAS_WIRED_LCD
441
 
441
 
442
-  #define BEEPER_PIN                 EXP1_10_PIN
443
-  #define BTN_ENC                    EXP1_09_PIN
442
+  #define BEEPER_PIN                 EXP1_01_PIN
443
+  #define BTN_ENC                    EXP1_02_PIN
444
 
444
 
445
   #if ENABLED(CR10_STOCKDISPLAY)
445
   #if ENABLED(CR10_STOCKDISPLAY)
446
 
446
 
447
-    #define LCD_PINS_RS              EXP1_04_PIN
447
+    #define LCD_PINS_RS              EXP1_07_PIN
448
 
448
 
449
-    #define BTN_EN1                  EXP1_08_PIN
450
-    #define BTN_EN2                  EXP1_06_PIN
449
+    #define BTN_EN1                  EXP1_03_PIN
450
+    #define BTN_EN2                  EXP1_05_PIN
451
 
451
 
452
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
453
-    #define LCD_PINS_D4              EXP1_05_PIN
452
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
453
+    #define LCD_PINS_D4              EXP1_06_PIN
454
 
454
 
455
   #elif ENABLED(MKS_MINI_12864)
455
   #elif ENABLED(MKS_MINI_12864)
456
 
456
 
457
-    #define DOGLCD_A0                EXP1_04_PIN
458
-    #define DOGLCD_CS                EXP1_05_PIN
459
-    #define BTN_EN1                  EXP2_08_PIN
460
-    #define BTN_EN2                  EXP2_06_PIN
457
+    #define DOGLCD_A0                EXP1_07_PIN
458
+    #define DOGLCD_CS                EXP1_06_PIN
459
+    #define BTN_EN1                  EXP2_03_PIN
460
+    #define BTN_EN2                  EXP2_05_PIN
461
 
461
 
462
   #else
462
   #else
463
 
463
 
464
-    #define LCD_PINS_RS              EXP1_07_PIN
464
+    #define LCD_PINS_RS              EXP1_04_PIN
465
 
465
 
466
-    #define BTN_EN1                  EXP2_08_PIN
467
-    #define BTN_EN2                  EXP2_06_PIN
466
+    #define BTN_EN1                  EXP2_03_PIN
467
+    #define BTN_EN2                  EXP2_05_PIN
468
 
468
 
469
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
470
-    #define LCD_PINS_D4              EXP1_06_PIN
469
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
470
+    #define LCD_PINS_D4              EXP1_05_PIN
471
 
471
 
472
     #if ENABLED(FYSETC_MINI_12864)
472
     #if ENABLED(FYSETC_MINI_12864)
473
-      #define DOGLCD_CS              EXP1_08_PIN
474
-      #define DOGLCD_A0              EXP1_07_PIN
473
+      #define DOGLCD_CS              EXP1_03_PIN
474
+      #define DOGLCD_A0              EXP1_04_PIN
475
       //#define LCD_BACKLIGHT_PIN           -1
475
       //#define LCD_BACKLIGHT_PIN           -1
476
-      #define LCD_RESET_PIN          EXP1_06_PIN  // Must be high or open for LCD to operate normally.
476
+      #define LCD_RESET_PIN          EXP1_05_PIN  // Must be high or open for LCD to operate normally.
477
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
477
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
478
         #ifndef RGB_LED_R_PIN
478
         #ifndef RGB_LED_R_PIN
479
-          #define RGB_LED_R_PIN      EXP1_05_PIN
479
+          #define RGB_LED_R_PIN      EXP1_06_PIN
480
         #endif
480
         #endif
481
         #ifndef RGB_LED_G_PIN
481
         #ifndef RGB_LED_G_PIN
482
-          #define RGB_LED_G_PIN      EXP1_04_PIN
482
+          #define RGB_LED_G_PIN      EXP1_07_PIN
483
         #endif
483
         #endif
484
         #ifndef RGB_LED_B_PIN
484
         #ifndef RGB_LED_B_PIN
485
-          #define RGB_LED_B_PIN      EXP1_03_PIN
485
+          #define RGB_LED_B_PIN      EXP1_08_PIN
486
         #endif
486
         #endif
487
       #elif ENABLED(FYSETC_MINI_12864_2_1)
487
       #elif ENABLED(FYSETC_MINI_12864_2_1)
488
-        #define NEOPIXEL_PIN         EXP1_05_PIN
488
+        #define NEOPIXEL_PIN         EXP1_06_PIN
489
       #endif
489
       #endif
490
     #endif // !FYSETC_MINI_12864
490
     #endif // !FYSETC_MINI_12864
491
 
491
 
492
     #if IS_ULTIPANEL
492
     #if IS_ULTIPANEL
493
-      #define LCD_PINS_D5            EXP1_05_PIN
494
-      #define LCD_PINS_D6            EXP1_04_PIN
495
-      #define LCD_PINS_D7            EXP1_03_PIN
493
+      #define LCD_PINS_D5            EXP1_06_PIN
494
+      #define LCD_PINS_D6            EXP1_07_PIN
495
+      #define LCD_PINS_D7            EXP1_08_PIN
496
 
496
 
497
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
497
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
498
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
498
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
521
   //
521
   //
522
   // e.g., BTT_TFT35_SPI_V1_0 (480x320, 3.5", SPI Stock Display with Rotary Encoder in BIQU B1 SE)
522
   // e.g., BTT_TFT35_SPI_V1_0 (480x320, 3.5", SPI Stock Display with Rotary Encoder in BIQU B1 SE)
523
   //
523
   //
524
-  #define TFT_CS_PIN                 EXP2_07_PIN
525
-  #define TFT_A0_PIN                 EXP2_04_PIN
526
-  #define TFT_SCK_PIN                EXP2_09_PIN
527
-  #define TFT_MISO_PIN               EXP2_10_PIN
528
-  #define TFT_MOSI_PIN               EXP2_05_PIN
529
-
530
-  #define TOUCH_INT_PIN              EXP1_04_PIN
531
-  #define TOUCH_MISO_PIN             EXP1_05_PIN
532
-  #define TOUCH_MOSI_PIN             EXP1_08_PIN
533
-  #define TOUCH_SCK_PIN              EXP1_06_PIN
534
-  #define TOUCH_CS_PIN               EXP1_07_PIN
535
-
536
-  #define BTN_EN1                    EXP2_08_PIN
537
-  #define BTN_EN2                    EXP2_06_PIN
538
-  #define BTN_ENC                    EXP1_09_PIN
524
+  #define TFT_CS_PIN                 EXP2_04_PIN
525
+  #define TFT_A0_PIN                 EXP2_07_PIN
526
+  #define TFT_SCK_PIN                EXP2_02_PIN
527
+  #define TFT_MISO_PIN               EXP2_01_PIN
528
+  #define TFT_MOSI_PIN               EXP2_06_PIN
529
+
530
+  #define TOUCH_INT_PIN              EXP1_07_PIN
531
+  #define TOUCH_MISO_PIN             EXP1_06_PIN
532
+  #define TOUCH_MOSI_PIN             EXP1_03_PIN
533
+  #define TOUCH_SCK_PIN              EXP1_05_PIN
534
+  #define TOUCH_CS_PIN               EXP1_04_PIN
535
+
536
+  #define BTN_EN1                    EXP2_03_PIN
537
+  #define BTN_EN2                    EXP2_05_PIN
538
+  #define BTN_ENC                    EXP1_02_PIN
539
 #endif
539
 #endif
540
 
540
 
541
 //
541
 //

正在加载...
取消
保存