Bläddra i källkod

EXP header pin numbers redux (#24525)

Followup to 504fec98
Scott Lahteine 1 år sedan
förälder
incheckning
2419a167ee
Inget konto är kopplat till bidragsgivarens mejladress
51 ändrade filer med 894 tillägg och 893 borttagningar
  1. 14
    14
      Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
  2. 10
    10
      Marlin/src/pins/esp32/pins_PANDA_common.h
  3. 14
    14
      Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
  4. 24
    24
      Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
  5. 24
    24
      Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
  6. 16
    16
      Marlin/src/pins/lpc1768/pins_EMOTRONIC.h
  7. 14
    14
      Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
  8. 13
    13
      Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
  9. 14
    14
      Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
  10. 7
    7
      Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
  11. 34
    34
      Marlin/src/pins/ramps/pins_RAMPS.h
  12. 14
    14
      Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
  13. 14
    14
      Marlin/src/pins/ramps/pins_ZRIB_V53.h
  14. 14
    14
      Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
  15. 14
    14
      Marlin/src/pins/sam/pins_RAMPS_SMART.h
  16. 14
    14
      Marlin/src/pins/sam/pins_RURAMPS4D_11.h
  17. 14
    14
      Marlin/src/pins/sam/pins_RURAMPS4D_13.h
  18. 22
    22
      Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
  19. 22
    22
      Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
  20. 7
    7
      Marlin/src/pins/sanguino/pins_ZMIB_V2.h
  21. 16
    16
      Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
  22. 74
    73
      Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
  23. 14
    14
      Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
  24. 7
    7
      Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
  25. 35
    35
      Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
  26. 14
    14
      Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
  27. 14
    14
      Marlin/src/pins/stm32f1/pins_FLY_MINI.h
  28. 7
    7
      Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
  29. 14
    14
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
  30. 21
    21
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
  31. 9
    9
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
  32. 20
    20
      Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h
  33. 7
    7
      Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
  34. 12
    12
      Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
  35. 14
    14
      Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
  36. 15
    15
      Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
  37. 49
    49
      Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
  38. 13
    13
      Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
  39. 14
    14
      Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
  40. 18
    18
      Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
  41. 14
    14
      Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
  42. 14
    14
      Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
  43. 14
    14
      Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
  44. 14
    14
      Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
  45. 14
    14
      Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h
  46. 14
    14
      Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
  47. 14
    14
      Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
  48. 7
    7
      Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
  49. 14
    14
      Marlin/src/pins/stm32f4/pins_VAKE403D.h
  50. 47
    47
      Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
  51. 22
    22
      Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h

+ 14
- 14
Marlin/src/pins/esp32/pins_MKS_TINYBEE.h Visa fil

@@ -128,23 +128,23 @@
128 128
  *                 EXP1                                   EXP2
129 129
  */
130 130
 
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 131
 #define EXP1_01_PIN                          149
132
+#define EXP1_02_PIN                           13
133
+#define EXP1_03_PIN                           21
134
+#define EXP1_04_PIN                            4
135
+#define EXP1_05_PIN                            0
136
+#define EXP1_06_PIN                           16
137
+#define EXP1_07_PIN                           15
138
+#define EXP1_08_PIN                           17
139 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 140
 #define EXP2_01_PIN                           19
141
+#define EXP2_02_PIN                           18
142
+#define EXP2_03_PIN                           14
143
+#define EXP2_04_PIN                            5
144
+#define EXP2_05_PIN                           12
145
+#define EXP2_06_PIN                           23
146
+#define EXP2_07_PIN                           34
147
+#define EXP2_08_PIN                           -1  // RESET
148 148
 
149 149
 //
150 150
 // MicroSD card

+ 10
- 10
Marlin/src/pins/esp32/pins_PANDA_common.h Visa fil

@@ -90,19 +90,19 @@
90 90
  *             ------                              ------
91 91
  *              EXP2                                EXP1
92 92
  */
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 93
 #define EXP1_01_PIN                          129
94
+#define EXP1_02_PIN                           12
95
+#define EXP1_03_PIN                           26
96
+#define EXP1_04_PIN                           27
97
+#define EXP1_05_PIN                           14
98 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 99
 #define EXP2_01_PIN                           19  // ?
100
+#define EXP2_02_PIN                           18  // ?
101
+#define EXP2_03_PIN                           33
102
+#define EXP2_04_PIN                            5  // ?
103
+#define EXP2_05_PIN                           32
104
+#define EXP2_06_PIN                           23  // ?
105
+#define EXP2_07_PIN                            2  // ?
106 106
 
107 107
 //
108 108
 // SD Card

+ 14
- 14
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h Visa fil

@@ -66,23 +66,23 @@
66 66
  *         ------                  ------
67 67
  *          EXP1                    EXP2
68 68
  */
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 69
 #define EXP1_01_PIN                        P1_30
70
+#define EXP1_02_PIN                        P2_11
71
+#define EXP1_03_PIN                        P0_18
72
+#define EXP1_04_PIN                        P0_16
73
+#define EXP1_05_PIN                        P0_15
74
+#define EXP1_06_PIN                        -1     // NC
75
+#define EXP1_07_PIN                        -1     // NC
76
+#define EXP1_08_PIN                        -1     // NC
77 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 78
 #define EXP2_01_PIN                        P0_17
79
+#define EXP2_02_PIN                        P0_15
80
+#define EXP2_03_PIN                        P3_26
81
+#define EXP2_04_PIN                        P1_23
82
+#define EXP2_05_PIN                        P3_25
83
+#define EXP2_06_PIN                        P0_18
84
+#define EXP2_07_PIN                        P1_31
85
+#define EXP2_08_PIN                        -1     // RESET
86 86
 
87 87
 /**
88 88
  * LCD / Controller

+ 24
- 24
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h Visa fil

@@ -199,23 +199,23 @@
199 199
  *                 ------                                     ------
200 200
  *                  EXP1                                       EXP2
201 201
  */
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 202
 #define EXP1_01_PIN                        P1_30
203
+#define EXP1_02_PIN                        P0_28
204
+#define EXP1_03_PIN                        P1_18
205
+#define EXP1_04_PIN                        P1_19
206
+#define EXP1_05_PIN                        P1_20
207
+#define EXP1_06_PIN                        P1_21
208
+#define EXP1_07_PIN                        P1_22
209
+#define EXP1_08_PIN                        P1_23
210 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 211
 #define EXP2_01_PIN                        P0_17
212
+#define EXP2_02_PIN                        P0_15
213
+#define EXP2_03_PIN                        P3_26
214
+#define EXP2_04_PIN                        P0_16
215
+#define EXP2_05_PIN                        P3_25
216
+#define EXP2_06_PIN                        P0_18
217
+#define EXP2_07_PIN                        P1_31
218
+#define EXP2_08_PIN                        -1
219 219
 
220 220
 #if HAS_WIRED_LCD
221 221
   #if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
@@ -239,11 +239,11 @@
239 239
     *
240 240
     *                  BEFORE                          AFTER
241 241
     *                  ------                          ------
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
242
+    *           (CLK) | 1  2 | (BEEPER)      (BEEPER) |10  9 | --
243
+    *              -- | 3  4 | (BTN_ENC)    (BTN_ENC) | 8  7 | (CLK)
244
+    *           (SID)   5  6 | (BTN_EN1)    (BTN_EN1)   6  5 | (SID)
245
+    *            (CS) | 7  8 | (BTN_EN2)    (BTN_EN2) | 4  3 | (CS)
246
+    *             GND | 9 10 | 5V                 GND | 2  1 | 5V
247 247
     *                  ------                          ------
248 248
     *                   LCD                             LCD
249 249
     */
@@ -274,11 +274,11 @@
274 274
      *
275 275
      *                  BEFORE                      AFTER
276 276
      *                  ______                     ______
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
277
+     *                 | 1  2 | (MOSI)     (MOSI) |10  9 | --
278
+     *       (BTN_ENC) | 3  4 | (SCK)   (BTN_ENC) | 8  7 | (SCK)
279
+     *       (BTN_EN1)   5  6 | (SID)   (BTN_EN1)   6  5 | (SID)
280
+     *       (BTN_EN2) | 7  8 | (CS)    (BTN_EN2) | 4  3 | (CS)
281
+     *              5V | 9 10 | GND           GND | 2  1 | 5V
282 282
      *                  ------                     ------
283 283
      *                   LCD                        LCD
284 284
      */

+ 24
- 24
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h Visa fil

@@ -254,23 +254,23 @@
254 254
  *        ------                ------
255 255
  *         EXP1                  EXP2
256 256
  */
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 257
 #define EXP1_01_PIN                        P1_30
258
+#define EXP1_02_PIN                        P0_28
259
+#define EXP1_03_PIN                        P1_18
260
+#define EXP1_04_PIN                        P1_19
261
+#define EXP1_05_PIN                        P1_20
262
+#define EXP1_06_PIN                        P1_21
263
+#define EXP1_07_PIN                        P1_22
264
+#define EXP1_08_PIN                        P1_23
265 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 266
 #define EXP2_01_PIN                        P0_17
267
+#define EXP2_02_PIN                        P0_15
268
+#define EXP2_03_PIN                        P3_26
269
+#define EXP2_04_PIN                        P0_16
270
+#define EXP2_05_PIN                        P3_25
271
+#define EXP2_06_PIN                        P0_18
272
+#define EXP2_07_PIN                        P1_31
273
+#define EXP2_08_PIN                        -1     // RESET
274 274
 
275 275
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
276 276
 
@@ -300,11 +300,11 @@
300 300
      *
301 301
      *                BEFORE                     AFTER
302 302
      *                ------                     ------
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
303
+     *      (BEEPER) | 1  2 | (CLK)    (BEEPER) |10  9 | (CLK)
304
+     *     (BTN_ENC) | 3  4 | --      (BTN_ENC) | 8  7 | --
305
+     *     (BTN_EN1)   5  6 | (SID)   (BTN_EN1)   6  5 | (SID)
306
+     *     (BTN_EN2) | 7  8 | (CS)    (BTN_EN2) | 4  3 | (CS)
307
+     *            5V | 9 10 | GND           GND | 2  1 | 5V
308 308
      *                ------                     ------
309 309
      *                 LCD                        LCD
310 310
      */
@@ -336,11 +336,11 @@
336 336
     *
337 337
     *            BEFORE                     AFTER
338 338
     *            ------                     ------
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
339
+    *  (BEEPER) | 1  2 | (CLK)    (BEEPER) |10  9 | --
340
+    * (BTN_ENC) | 3  4 | --      (BTN_ENC) | 8  7 | (CLK)
341
+    * (BTN_EN1)   5  6 | (SID)   (BTN_EN1)   6  5 | (SID)
342
+    * (BTN_EN2) | 7  8 | (CS)    (BTN_EN2) | 4  3 | (CS)
343
+    *        5V | 9 10 | GND           GND | 2  1 | 5V
344 344
     *            ------                     ------
345 345
     *             LCD                        LCD
346 346
     */

+ 16
- 16
Marlin/src/pins/lpc1768/pins_EMOTRONIC.h Visa fil

@@ -91,25 +91,25 @@
91 91
 //
92 92
 // Extension ports
93 93
 //
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 94
 #define EXP1_01_PIN                        P0_03  // RX0
95
+#define EXP1_02_PIN                        P0_02  // TX0
96
+#define EXP1_03_PIN                        P1_30
97
+#define EXP1_04_PIN                        P1_31
98
+#define EXP1_05_PIN                        P0_17  // MISO0
99
+#define EXP1_06_PIN                        P0_18  // MOSI0
100
+#define EXP1_07_PIN                        P0_15  // SCK0
101
+#define EXP1_08_PIN                        P0_16  // SSEL0
102
+#define EXP1_09_PIN                        P0_27  // SDA0
103
+#define EXP1_10_PIN                        P0_28  // SCL0
104 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 105
 #define EXP2_01_PIN                        P0_10
106
+#define EXP2_02_PIN                        P0_11
107
+#define EXP2_03_PIN                        P0_00  // SDA1
108
+#define EXP2_04_PIN                        P0_01  // SCL1
109
+#define EXP2_05_PIN                        P1_28
110
+#define EXP2_06_PIN                        P1_29
111
+#define EXP2_07_PIN                        P1_26
112
+#define EXP2_08_PIN                        P1_27
113 113
 
114 114
 //
115 115
 // SD Support

+ 14
- 14
Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h Visa fil

@@ -239,23 +239,23 @@
239 239
  *                ------                                        ------
240 240
  *                 EXP1                                          EXP2
241 241
  */
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 242
 #define EXP1_01_PIN                        P1_31
243
+#define EXP1_02_PIN                        P1_30
244
+#define EXP1_03_PIN                        P0_18
245
+#define EXP1_04_PIN                        P0_16
246
+#define EXP1_05_PIN                        P0_15
247
+#define EXP1_06_PIN                        P0_17
248
+#define EXP1_07_PIN                        P1_00
249
+#define EXP1_08_PIN                        P1_22
250 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 251
 #define EXP2_01_PIN                        P0_08
252
+#define EXP2_02_PIN                        P0_07
253
+#define EXP2_03_PIN                        P3_25
254
+#define EXP2_04_PIN                        P0_28
255
+#define EXP2_05_PIN                        P3_26
256
+#define EXP2_06_PIN                        P0_09
257
+#define EXP2_07_PIN                        P0_27
258
+#define EXP2_08_PIN                        -1     // RESET
259 259
 
260 260
 #ifndef SDCARD_CONNECTION
261 261
   #define SDCARD_CONNECTION              ONBOARD

+ 13
- 13
Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h Visa fil

@@ -194,14 +194,14 @@
194 194
  *                  ------
195 195
  *                   EXP
196 196
  */
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 197
 #define EXP1_01_PIN                        P2_08
198
+#define EXP1_02_PIN                        P0_16
199
+#define EXP1_03_PIN                        P0_19
200
+#define EXP1_04_PIN                        -1
201
+#define EXP1_05_PIN                        P0_20
202
+#define EXP1_06_PIN                        P0_15
203
+#define EXP1_07_PIN                        P0_17
204
+#define EXP1_08_PIN                        P0_18
205 205
 
206 206
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
207 207
   #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
@@ -210,12 +210,12 @@
210 210
 
211 211
  /**
212 212
   *          Ender 3 V2 display                       SKR E3 Turbo (EXP1)                Ender 3 V2 display --> SKR E3 Turbo
213
-  *                ------                                     ------                                  RX  8 -->  5  P0_15
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
213
+  *                ------                                     ------                                  RX  3 -->  5  P0_15
214
+  *           --  | 1  2 | --                (BEEPER)  P2_08 |10  9 | P0_16 (BTN_ENC)                 TX  4 -->  9  P0_16
215
+  * (SKR_TX1) RX  | 3  4 | TX (SKR_RX1)      (BTN_EN1) P0_19 | 8  7 | RESET                       BEEPER  6 --> 10  P2_08
216
+  * (BTN_ENC) ENT   5  6 | BEEPER            (BTN_EN2) P0_20   6  5 | P0_15 (LCD_D4)
217
+  * (BTN_E2)  B   | 7  8 | A  (BTN_E1)       (LCD_RS)  P0_17 | 4  3 | P0_18 (LCD_EN)
218
+  *           GND | 9 10 | 5V                            GND | 2  1 | 5V
219 219
   *                ------                                     ------
220 220
   */
221 221
 

+ 14
- 14
Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h Visa fil

@@ -278,23 +278,23 @@
278 278
  *                 ------                                     ------
279 279
  *                  EXP1                                       EXP2
280 280
  */
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 281
 #define EXP1_01_PIN                        P1_31
282
+#define EXP1_02_PIN                        P1_30
283
+#define EXP1_03_PIN                        P0_18
284
+#define EXP1_04_PIN                        P0_16
285
+#define EXP1_05_PIN                        P0_15
286
+#define EXP1_06_PIN                        P0_17
287
+#define EXP1_07_PIN                        P1_00
288
+#define EXP1_08_PIN                        P1_22
289 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 290
 #define EXP2_01_PIN                        P0_08
291
+#define EXP2_02_PIN                        P0_07
292
+#define EXP2_03_PIN                        P3_25
293
+#define EXP2_04_PIN                        P0_28
294
+#define EXP2_05_PIN                        P3_26
295
+#define EXP2_06_PIN                        P0_09
296
+#define EXP2_07_PIN                        P0_27
297
+#define EXP2_08_PIN                        -1     // RESET
298 298
 
299 299
 #if IS_TFTGLCD_PANEL
300 300
 

+ 7
- 7
Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h Visa fil

@@ -171,14 +171,14 @@
171 171
  * A remote SD card is currently not supported because the pins routed to the EXP2
172 172
  * connector are shared with the onboard SD card.
173 173
  */
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 174
 #define EXP1_01_PIN                        P1_31
175
+#define EXP1_02_PIN                        P1_30
176
+#define EXP1_03_PIN                        P3_26
177
+#define EXP1_04_PIN                        P2_11
178
+#define EXP1_05_PIN                        P3_25
179
+#define EXP1_06_PIN                        P0_15
180
+#define EXP1_07_PIN                        P0_16
181
+#define EXP1_08_PIN                        P0_18
182 182
 
183 183
 #if ENABLED(CR10_STOCKDISPLAY)
184 184
   /**          ------

+ 34
- 34
Marlin/src/pins/ramps/pins_RAMPS.h Visa fil

@@ -515,18 +515,18 @@
515 515
  */
516 516
 #ifndef EXP1_08_PIN
517 517
 
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 518
   #define EXP1_03_PIN                AUX4_17_PIN
519
+  #define EXP1_04_PIN                AUX4_18_PIN
520
+  #define EXP1_05_PIN                AUX4_16_PIN
521
+  #define EXP1_06_PIN                AUX4_15_PIN
522
+  #define EXP1_07_PIN                AUX4_14_PIN
523
+  #define EXP1_08_PIN                AUX4_13_PIN
524 524
 
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 525
   #define EXP2_01_PIN                AUX3_03_PIN
526
+  #define EXP2_02_PIN                AUX3_05_PIN
527
+  #define EXP2_04_PIN                AUX3_06_PIN
528
+  #define EXP2_06_PIN                AUX3_04_PIN
529
+  #define EXP2_07_PIN                AUX3_02_PIN
530 530
 
531 531
   #if ENABLED(G3D_PANEL)
532 532
     /**                  Gadgets3D Smart Adapter
@@ -539,12 +539,12 @@
539 539
      *              ------                        ------
540 540
      *               EXP1                          EXP2
541 541
      */
542
-    #define EXP1_02_PIN              AUX4_12_PIN
543 542
     #define EXP1_01_PIN              AUX4_11_PIN
543
+    #define EXP1_02_PIN              AUX4_12_PIN
544 544
 
545
-    #define EXP2_08_PIN              AUX4_07_PIN
546
-    #define EXP2_05_PIN              AUX4_09_PIN
547 545
     #define EXP2_03_PIN              AUX4_10_PIN
546
+    #define EXP2_05_PIN              AUX4_09_PIN
547
+    #define EXP2_08_PIN              AUX4_07_PIN
548 548
 
549 549
   #else
550 550
 
@@ -558,17 +558,17 @@
558 558
      *             ------                           ------
559 559
      *              EXP1                             EXP2
560 560
      */
561
-    #define EXP1_02_PIN              AUX4_10_PIN
562 561
     #define EXP1_01_PIN              AUX4_09_PIN
562
+    #define EXP1_02_PIN              AUX4_10_PIN
563 563
 
564 564
     #if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
565
-      #define EXP2_08_PIN                     -1  // RESET
566
-      #define EXP2_05_PIN            AUX4_12_PIN
567 565
       #define EXP2_03_PIN            AUX4_11_PIN
566
+      #define EXP2_05_PIN            AUX4_12_PIN
567
+      #define EXP2_08_PIN                     -1  // RESET
568 568
     #else
569
-      #define EXP2_08_PIN            AUX4_07_PIN
570
-      #define EXP2_05_PIN            AUX4_11_PIN
571 569
       #define EXP2_03_PIN            AUX4_12_PIN
570
+      #define EXP2_05_PIN            AUX4_11_PIN
571
+      #define EXP2_08_PIN            AUX4_07_PIN
572 572
     #endif
573 573
 
574 574
   #endif
@@ -898,28 +898,28 @@
898 898
    *
899 899
    *               Board                            Display
900 900
    *               ------                           ------
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)
901
+   *    (MISO) 50 | 1  2 | 52 (SCK)             5V |10  9 | GND
902
+   *  (LCD_CS) 33 | 3  4 | 53 (SD_CS)        RESET | 8  7 | (SD_DET)
903
+   *           31   5  6 | 51 (MOSI)        (MOSI)   6  5 | (LCD_CS)
904
+   *  (SD_DET) 49 | 7  8 | RESET           (SD_CS) | 4  3 | (MOD_RESET)
905
+   *          GND | 9 10 | --                (SCK) | 2  1 | (MISO)
906 906
    *               ------                           ------
907
-   *                EXP2
907
+   *                EXP2                             EXP1
908 908
    *
909 909
    * Needs custom cable:
910 910
    *
911 911
    *    Board   Adapter   Display
912
-   *           _________
913
-   *   EXP2-1 ----------- EXP1-10
914
-   *   EXP2-2 ----------- EXP1-9
915
-   *   EXP2-4 ----------- EXP1-8
916
-   *   EXP2-4 ----------- EXP1-7
917
-   *   EXP2-3 ----------- EXP1-6
918
-   *   EXP2-6 ----------- EXP1-5
919
-   *   EXP2-7 ----------- EXP1-4
920
-   *   EXP2-8 ----------- EXP1-3
921
-   *   EXP2-1 ----------- EXP1-2
922
-   *   EXP1-10 ---------- EXP1-1
912
+   *   ----------------------------------
913
+   *   EXP2-1 <--diode--- EXP1-1    MISO
914
+   *   EXP2-2 ----------- EXP1-2    SCK
915
+   *   EXP2-4 ----------- EXP1-3    MOD_RST
916
+   *   EXP2-4 ----------- EXP1-4    SD_CS
917
+   *   EXP2-3 ----------- EXP1-5    LCD_CS
918
+   *   EXP2-6 ----------- EXP1-6    MOSI
919
+   *   EXP2-7 ----------- EXP1-7    SD DET
920
+   *   EXP2-8 ----------- EXP1-8    RESET
921
+   *   EXP2-1 ----------- EXP1-9    MISO->GND
922
+   *   EXP1-10 ---------- EXP1-10   5V
923 923
    *
924 924
    *  NOTE: The MISO pin should not get a 5V signal.
925 925
    *        To fix, insert a 1N4148 diode in the MISO line.

+ 14
- 14
Marlin/src/pins/ramps/pins_RAMPS_PLUS.h Visa fil

@@ -73,22 +73,22 @@
73 73
  *         ------                     ------
74 74
  *          EXP1                       EXP2
75 75
  */
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 76
 #define EXP1_01_PIN                           37
77
+#define EXP1_02_PIN                           35
78
+#define EXP1_03_PIN                           31
79
+#define EXP1_04_PIN                           41
80
+#define EXP1_05_PIN                           33
81
+#define EXP1_06_PIN                           23
82
+#define EXP1_07_PIN                           42
83
+#define EXP1_08_PIN                           44
84 84
 
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 85
 #define EXP2_01_PIN                           50
86
+#define EXP2_02_PIN                           52
87
+#define EXP2_03_PIN                           29
88
+#define EXP2_04_PIN                           53
89
+#define EXP2_05_PIN                           25
90
+#define EXP2_06_PIN                           51
91
+#define EXP2_07_PIN                           49
92
+#define EXP2_08_PIN                           27
93 93
 
94 94
 #include "pins_RAMPS.h"

+ 14
- 14
Marlin/src/pins/ramps/pins_ZRIB_V53.h Visa fil

@@ -309,23 +309,23 @@
309 309
  */
310 310
 
311 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 312
   #define EXP1_01_PIN                         37
313
+  #define EXP1_02_PIN                         35
314
+  #define EXP1_03_PIN                         17
315
+  #define EXP1_04_PIN                         16
316
+  #define EXP1_05_PIN                         23
317
+  #define EXP1_06_PIN                         25
318
+  #define EXP1_07_PIN                         27
319
+  #define EXP1_08_PIN                         29
320 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 321
   #define EXP2_01_PIN                 XS6_07_PIN
322
+  #define EXP2_02_PIN                 XS6_03_PIN
323
+  #define EXP2_03_PIN                         31
324
+  #define EXP2_04_PIN                         53
325
+  #define EXP2_05_PIN                         33
326
+  #define EXP2_06_PIN                 XS6_05_PIN
327
+  #define EXP2_07_PIN                         49
328
+  #define EXP2_08_PIN                         41
329 329
 #endif
330 330
 
331 331
 //////////////////////////

+ 14
- 14
Marlin/src/pins/sam/pins_RAMPS_FD_V1.h Visa fil

@@ -143,23 +143,23 @@
143 143
  *         ------                     ------
144 144
  *          EXP1                       EXP2
145 145
  */
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 146
 #define EXP1_01_PIN                           37
147
+#define EXP1_02_PIN                           35
148
+#define EXP1_03_PIN                           29
149
+#define EXP1_04_PIN                           27
150
+#define EXP1_05_PIN                           25
151
+#define EXP1_06_PIN                           23
152
+#define EXP1_07_PIN                           16
153
+#define EXP1_08_PIN                           17
154 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 155
 #define EXP2_01_PIN                           74
156
+#define EXP2_02_PIN                           76
157
+#define EXP2_03_PIN                           31
158
+#define EXP2_04_PIN                            4
159
+#define EXP2_05_PIN                           33
160
+#define EXP2_06_PIN                           75
161
+#define EXP2_07_PIN                           49
162
+#define EXP2_08_PIN                           -1
163 163
 
164 164
 //
165 165
 // LCD / Controller

+ 14
- 14
Marlin/src/pins/sam/pins_RAMPS_SMART.h Visa fil

@@ -118,23 +118,23 @@
118 118
    *         ------                     ------
119 119
    *          EXP1                       EXP2
120 120
    */
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 121
   #define EXP1_01_PIN                         37
122
+  #define EXP1_02_PIN                         35
123
+  #define EXP1_03_PIN                         31
124
+  #define EXP1_04_PIN                         41
125
+  #define EXP1_05_PIN                         33
126
+  #define EXP1_06_PIN                         23
127
+  #define EXP1_07_PIN                         42
128
+  #define EXP1_08_PIN                         44
129 129
 
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 130
   #define EXP2_01_PIN                         50
131
+  #define EXP2_02_PIN                         52
132
+  #define EXP2_03_PIN                         29
133
+  #define EXP2_04_PIN                         53
134
+  #define EXP2_05_PIN                         25
135
+  #define EXP2_06_PIN                         51
136
+  #define EXP2_07_PIN                         49
137
+  #define EXP2_08_PIN                         27
138 138
 
139 139
 #endif
140 140
 

+ 14
- 14
Marlin/src/pins/sam/pins_RURAMPS4D_11.h Visa fil

@@ -193,23 +193,23 @@
193 193
  *              ------                                ------
194 194
  *               EXP1                                  EXP2
195 195
  */
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 196
 #define EXP1_01_PIN                           62
197
+#define EXP1_02_PIN                           40
198
+#define EXP1_03_PIN                           64
199
+#define EXP1_04_PIN                           63
200
+#define EXP1_05_PIN                           48
201
+#define EXP1_06_PIN                           50
202
+#define EXP1_07_PIN                           52
203
+#define EXP1_08_PIN                           53
204 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 205
 #define EXP2_01_PIN                           74  // MISO
206
+#define EXP2_02_PIN                           76  // SCK
207
+#define EXP2_03_PIN                           44
208
+#define EXP2_04_PIN                           10
209
+#define EXP2_05_PIN                           42
210
+#define EXP2_06_PIN                           75  // MOSI
211
+#define EXP2_07_PIN                           51
212
+#define EXP2_08_PIN                           -1  // RESET
213 213
 
214 214
 //
215 215
 // LCD / Controller

+ 14
- 14
Marlin/src/pins/sam/pins_RURAMPS4D_13.h Visa fil

@@ -183,23 +183,23 @@
183 183
  *              ------                                ------
184 184
  *               EXP1                                  EXP2
185 185
  */
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 186
 #define EXP1_01_PIN                           62
187
+#define EXP1_02_PIN                           40
188
+#define EXP1_03_PIN                           64
189
+#define EXP1_04_PIN                           63
190
+#define EXP1_05_PIN                           48
191
+#define EXP1_06_PIN                           50
192
+#define EXP1_07_PIN                           52
193
+#define EXP1_08_PIN                           53
194 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 195
 #define EXP2_01_PIN                           74  // MISO
196
+#define EXP2_02_PIN                           76  // SCK
197
+#define EXP2_03_PIN                           44
198
+#define EXP2_04_PIN                           10
199
+#define EXP2_05_PIN                           42
200
+#define EXP2_06_PIN                           75  // MOSI
201
+#define EXP2_07_PIN                           51
202
+#define EXP2_08_PIN                           -1  // RESET
203 203
 
204 204
 //
205 205
 // LCD / Controller

+ 22
- 22
Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h Visa fil

@@ -166,33 +166,33 @@
166 166
  *      BTN_ENCODER 40         KILL_PIN      49
167 167
  */
168 168
 
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 169
 #define EXP1_01_PIN                           41
170
+#define EXP1_02_PIN                           40
171
+#define EXP1_03_PIN                           35
172
+#define EXP1_04_PIN                           34
173
+#define EXP1_05_PIN                           36
174
+#define EXP1_06_PIN                           37
175
+#define EXP1_07_PIN                           38
176
+#define EXP1_08_PIN                           39
177 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 178
 #define EXP2_01_PIN                           50
179
+#define EXP2_02_PIN                           52
180
+#define EXP2_03_PIN                           43
181
+#define EXP2_04_PIN                           53
182
+#define EXP2_05_PIN                           42
183
+#define EXP2_06_PIN                           51
184
+#define EXP2_07_PIN                           44
185
+#define EXP2_10_PIN                           49
186 186
 
187 187
 #if ENABLED(CR10_STOCKDISPLAY)
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
188
+  #define EXP3_01_PIN                EXP1_01_PIN
189
+  #define EXP3_02_PIN                EXP1_02_PIN
190
+  #define EXP3_03_PIN                EXP1_03_PIN
191
+  #define EXP3_04_PIN                EXP1_04_PIN
192
+  #define EXP3_05_PIN                EXP1_05_PIN
193
+  #define EXP3_06_PIN                EXP1_06_PIN
194
+  #define EXP3_07_PIN                EXP1_07_PIN
195
+  #define EXP3_08_PIN                EXP1_08_PIN
196 196
 #endif
197 197
 
198 198
 /************************************/

+ 22
- 22
Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h Visa fil

@@ -218,33 +218,33 @@
218 218
  *      BTN_ENCODER 40
219 219
  */
220 220
 
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 221
 #define EXP1_01_PIN                           41
222
+#define EXP1_02_PIN                           40
223
+#define EXP1_03_PIN                           35
224
+#define EXP1_04_PIN                           34
225
+#define EXP1_05_PIN                           36
226
+#define EXP1_06_PIN                           37
227
+#define EXP1_07_PIN                           38
228
+#define EXP1_08_PIN                           39
229 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 230
 #define EXP2_01_PIN                           50
231
+#define EXP2_02_PIN                           52
232
+#define EXP2_03_PIN                           43
233
+#define EXP2_04_PIN                           53
234
+#define EXP2_05_PIN                           42
235
+#define EXP2_06_PIN                           51
236
+#define EXP2_07_PIN                           44
237
+#define EXP2_10_PIN                           49
238 238
 
239 239
 #if ENABLED(CR10_STOCKDISPLAY)
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
240
+  #define EXP3_01_PIN                EXP1_01_PIN
241
+  #define EXP3_02_PIN                EXP1_02_PIN
242
+  #define EXP3_03_PIN                EXP1_03_PIN
243
+  #define EXP3_04_PIN                EXP1_04_PIN
244
+  #define EXP3_05_PIN                EXP1_05_PIN
245
+  #define EXP3_06_PIN                EXP1_06_PIN
246
+  #define EXP3_07_PIN                EXP1_07_PIN
247
+  #define EXP3_08_PIN                EXP1_08_PIN
248 248
 #endif
249 249
 
250 250
 /************************************/

+ 7
- 7
Marlin/src/pins/sanguino/pins_ZMIB_V2.h Visa fil

@@ -171,18 +171,18 @@
171 171
  *      (GND) | 9 10 | (5V)
172 172
  *             ------
173 173
  */
174
-#define EXP1_08_PIN                            2
175
-#define EXP1_07_PIN                           29
174
+#define EXP1_01_PIN                            5
175
+#define EXP1_02_PIN                            7
176
+#define EXP1_03_PIN                           11
177
+#define EXP1_04_PIN                           10
178
+#define EXP1_05_PIN                           12
176 179
 #ifndef IS_ZMIB_V2
177 180
   #define EXP1_06_PIN                          4  // ZMIB V1
178 181
 #else
179 182
   #define EXP1_06_PIN                          3  // ZMIB V2
180 183
 #endif
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
184
+#define EXP1_07_PIN                           29
185
+#define EXP1_08_PIN                            2
186 186
 
187 187
 #if ENABLED(ZONESTAR_12864LCD)
188 188
   //

+ 16
- 16
Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h Visa fil

@@ -234,28 +234,28 @@
234 234
    *
235 235
    *                   Board                                   Display
236 236
    *                   ------                                  ------
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)
237
+   * (SD_DET)    PA15 | 1  2 | PB6 (BEEPER)                5V |10  9 | GND
238
+   * (MOD_RESET) PA9  | 3  4 | RESET                  (RESET) | 8  7 | (SD_DET)
239
+   * (SD_CS)     PA10   5  6 | PB9                    (MOSI)    6  5 | (LCD_CS)
240
+   * (LCD_CS)    PB8  | 7  8 | PB7                    (SD_CS) | 4  3 | (MOD_RESET)
241
+   *              GND | 9 10 | 5V                     (SCK)   | 2  1 | (MISO)
242 242
    *                   ------                                  ------
243 243
    *                    EXP1                                    EXP1
244 244
    *
245 245
    * Needs custom cable:
246 246
    *
247 247
    *    Board   Adapter   Display
248
-   *           _________
249
-   *   EXP1-1 ----------- EXP1-10
250
-   *   EXP1-2 ----------- EXP1-9
251
-   *   SPI1-4 ----------- EXP1-6
252
-   *   EXP1-4 ----------- EXP1-5
253
-   *   SP11-3 ----------- EXP1-2
254
-   *   EXP1-6 ----------- EXP1-4
255
-   *   EXP1-7 ----------- EXP1-8
256
-   *   EXP1-8 ----------- EXP1-3
257
-   *   SPI1-1 ----------- EXP1-1
258
-   *  EXP1-10 ----------- EXP1-7
248
+   *   ----------------------------------
249
+   *   EXP1-10 ---------- EXP1-10  5V
250
+   *   EXP1-9 ----------- EXP1-9   GND
251
+   *   SPI1-4 ----------- EXP1-6   MOSI
252
+   *   EXP1-7 ----------- EXP1-5   LCD_CS
253
+   *   SP11-3 ----------- EXP1-2   SCK
254
+   *   EXP1-5 ----------- EXP1-4   SD_CS
255
+   *   EXP1-4 ----------- EXP1-8   RESET
256
+   *   EXP1-3 ----------- EXP1-3   MOD_RST
257
+   *   SPI1-1 ----------- EXP1-1   MISO
258
+   *   EXP1-1 ----------- EXP1-7   SD_DET
259 259
    */
260 260
 
261 261
   #define CLCD_SPI_BUS                         1  // SPI1 connector

+ 74
- 73
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h Visa fil

@@ -129,21 +129,21 @@
129 129
  *                 EXP1                                      EXP1
130 130
  */
131 131
 #ifdef SKR_MINI_E3_V2
132
-  #define EXP1_9                            PA15
133
-  #define EXP1_3                            PB15
132
+  #define EXP1_02_PIN                       PA15
133
+  #define EXP1_08_PIN                       PB15
134 134
 #else
135
-  #define EXP1_9                            PB6
136
-  #define EXP1_3                            PB7
135
+  #define EXP1_02_PIN                       PB6
136
+  #define EXP1_08_PIN                       PB7
137 137
 #endif
138 138
 
139 139
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
140 140
   /**
141 141
    *        ------                ------                ------
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
142
+   * (ENT) | 1  2 | (BEEP)       |10  9 |              |10  9 |
143
+   *  (RX) | 3  4 |         (RX) | 8  7 | (TX)      RX | 8  7 | TX
144
+   *  (TX)   5  6 |        (ENT)   6  5 | (BEEP)   ENT | 6  5 | BEEP
145
+   *   (B) | 7  8 | (A)      (B) | 4  3 | (A)        B | 4  3 | A
146
+   *   GND | 9 10 | (VCC)    GND | 2  1 | VCC      GND | 2  1 | VCC
147 147
    *        ------                ------                ------
148 148
    *         EXP1                  DWIN               DWIN (plug)
149 149
    *
@@ -154,8 +154,8 @@
154 154
     #error "CAUTION! Ender-3 V2 display requires a custom cable. See 'pins_BTT_SKR_MINI_E3_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
155 155
   #endif
156 156
 
157
-  #define BEEPER_PIN                      EXP1_9
158
-  #define BTN_EN1                         EXP1_3
157
+  #define BEEPER_PIN                 EXP1_02_PIN
158
+  #define BTN_EN1                    EXP1_08_PIN
159 159
   #define BTN_EN2                           PB8
160 160
   #define BTN_ENC                           PB5
161 161
 
@@ -164,13 +164,13 @@
164 164
   #if ENABLED(CR10_STOCKDISPLAY)
165 165
 
166 166
     #define BEEPER_PIN                      PB5
167
-    #define BTN_ENC                       EXP1_9
167
+    #define BTN_ENC                  EXP1_02_PIN
168 168
 
169 169
     #define BTN_EN1                         PA9
170 170
     #define BTN_EN2                         PA10
171 171
 
172 172
     #define LCD_PINS_RS                     PB8
173
-    #define LCD_PINS_ENABLE               EXP1_3
173
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
174 174
     #define LCD_PINS_D4                     PB9
175 175
 
176 176
   #elif ENABLED(ZONESTAR_LCD)                     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
@@ -180,7 +180,7 @@
180 180
     #endif
181 181
 
182 182
     #define LCD_PINS_RS                     PB9
183
-    #define LCD_PINS_ENABLE               EXP1_9
183
+    #define LCD_PINS_ENABLE          EXP1_02_PIN
184 184
     #define LCD_PINS_D4                     PB8
185 185
     #define LCD_PINS_D5                     PA10
186 186
     #define LCD_PINS_D6                     PA9
@@ -189,14 +189,14 @@
189 189
 
190 190
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
191 191
 
192
-    #define BTN_ENC                       EXP1_9
192
+    #define BTN_ENC                  EXP1_02_PIN
193 193
     #define BTN_EN1                         PA9
194 194
     #define BTN_EN2                         PA10
195 195
 
196 196
     #define DOGLCD_CS                       PB8
197 197
     #define DOGLCD_A0                       PB9
198 198
     #define DOGLCD_SCK                      PB5
199
-    #define DOGLCD_MOSI                   EXP1_3
199
+    #define DOGLCD_MOSI              EXP1_08_PIN
200 200
 
201 201
     #define FORCE_SOFT_SPI
202 202
     #define LCD_BACKLIGHT_PIN               -1
@@ -214,28 +214,28 @@
214 214
        *
215 215
        *                   Board                        Display
216 216
        *                   ------                        ------
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)
217
+       * (SD_DET)    PB5  | 1  2 | PB6 (BEEPER)      5V |10  9 | GND
218
+       * (MOD_RESET) PA9  | 3  4 | RESET             -- | 8  7 | (SD_DET)
219
+       * (SD_CS)     PA10   5  6 | PB9          (MOSI)  | 6  5 | --
220
+       * (LCD_CS)    PB8  | 7  8 | PB7          (SD_CS) | 4  3 | (LCD_CS)
221
+       *              GND | 9 10 | 5V           (SCK)   | 2  1 | (MISO)
222 222
        *                   ------                        ------
223 223
        *                    EXP1                          EXP1
224 224
        *
225 225
        * Needs custom cable:
226 226
        *
227
-       *    Board             Display
228
-       *
229
-       *   EXP1-1 ----------- EXP1-10
230
-       *   EXP1-2 ----------- EXP1-9
231
-       *   SPI1-4 ----------- EXP1-6
232
-       *   EXP1-4 ----------- FREE
233
-       *   SPI1-3 ----------- EXP1-2
234
-       *   EXP1-6 ----------- EXP1-4
235
-       *   EXP1-7 ----------- FREE
236
-       *   EXP1-8 ----------- EXP1-3
237
-       *   SPI1-1 ----------- EXP1-1
238
-       *  EXP1-10 ----------- EXP1-7
227
+       *    Board   Adapter   Display
228
+       *   ----------------------------------
229
+       *   EXP1-10 ---------- EXP1-10  5V
230
+       *   EXP1-9 ----------- EXP1-9   GND
231
+       *   SPI1-4 ----------- EXP1-6   MOSI
232
+       *   EXP1-7 ----------- n/c
233
+       *   SPI1-3 ----------- EXP1-2   SCK
234
+       *   EXP1-5 ----------- EXP1-4   SD_CS
235
+       *   EXP1-4 ----------- n/c
236
+       *   EXP1-3 ----------- EXP1-3   LCD_CS
237
+       *   SPI1-1 ----------- EXP1-1   MISO
238
+       *   EXP1-1 ----------- EXP1-7   SD_DET
239 239
        */
240 240
 
241 241
       #define TFTGLCD_CS                    PA9
@@ -253,20 +253,20 @@
253 253
      *
254 254
      *       Board                      Display
255 255
      *       ------                     ------
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
256
+     * PB5  | 1  2 | PA15       (BEEP) |10  9 | BTN_ENC
257
+     * PA9  | 3  4 | RESET      LCD_CS | 8  7 | LCD A0
258
+     * PA10 | 5  6 | PB9       LCD_RST | 6  5 | RED
259
+     * PB8  | 7  8 | PB15      (GREEN) | 4  3 | (BLUE)
260
+     * GND  | 9 10 | 5V            GND | 2  1 | 5V
261 261
      *       ------                     ------
262 262
      *        EXP1                       EXP1
263 263
      *
264 264
      *            ---                   ------
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)
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)
270 270
      *            ---                   ------
271 271
      *            TFT                    EXP2
272 272
      *
@@ -274,18 +274,19 @@
274 274
      *
275 275
      *    Board             Display
276 276
      *
277
-     *   EXP1-1 ----------- EXP1-1
278
-     *   EXP1-2 ----------- EXP1-2
279
-     *   EXP1-3 ----------- EXP2-6
280
-     *   EXP1-4 ----------- EXP1-5
281
-     *   EXP1-5 ----------- EXP2-8
282
-     *   EXP1-6 ----------- EXP1-6
283
-     *   EXP1-8 ----------- EXP1-8
284
-     *   EXP1-9 ----------- EXP1-9
285
-     *  EXP1-10 ----------- EXP1-7
277
+     *   EXP1-10 ---------- EXP1-1   5V
278
+     *   EXP1-9 ----------- EXP1-2   GND
279
+     *   EXP1-8 ----------- EXP2-6   EN2
280
+     *   EXP1-7 ----------- EXP1-5   RED
281
+     *   EXP1-6 ----------- EXP2-8   EN1
282
+     *   EXP1-5 ----------- EXP1-6   LCD_RST
283
+     *   EXP1-4 ----------- n/c
284
+     *   EXP1-3 ----------- EXP1-8   LCD_CS
285
+     *   EXP1-2 ----------- EXP1-9   ENC
286
+     *   EXP1-1 ----------- EXP1-7   LCD_A0
286 287
      *
287
-     *    TFT-2 ----------- EXP2-9
288
-     *    TFT-3 ----------- EXP2-5
288
+     *    TFT-2 ----------- EXP2-9   SCK
289
+     *    TFT-3 ----------- EXP2-5   MOSI
289 290
      *
290 291
      * for backlight configuration see steps 2 (V2.1) and 3 in https://wiki.fysetc.com/Mini12864_Panel/
291 292
      */
@@ -325,33 +326,33 @@
325 326
    *
326 327
    *                   Board                            Display
327 328
    *                   ------                           ------
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)
329
+   * (SD_DET)    PB5  | 1  2 | PB6 (BEEPER)         5V |10  9 | GND
330
+   * (MOD_RESET) PA9  | 3  4 | RESET           (RESET) | 8  7 | (SD_DET)
331
+   * (SD_CS)     PA10   5  6 | PB9             (MOSI)  | 6  5 | (LCD_CS)
332
+   * (LCD_CS)    PB8  | 7  8 | PB7             (SD_CS) | 4  3 | (MOD_RESET)
333
+   *              GND | 9 10 | 5V              (SCK)   | 2  1 | (MISO)
333 334
    *                   ------                           ------
334 335
    *                    EXP1                             EXP1
335 336
    *
336 337
    * Needs custom cable:
337 338
    *
338 339
    *    Board   Adapter   Display
339
-   *           _________
340
-   *   EXP1-1 ----------- EXP1-10
341
-   *   EXP1-2 ----------- EXP1-9
342
-   *   SPI1-4 ----------- EXP1-6
343
-   *   EXP1-4 ----------- EXP1-5
344
-   *   SPI1-3 ----------- EXP1-2
345
-   *   EXP1-6 ----------- EXP1-4
346
-   *   EXP1-7 ----------- EXP1-8
347
-   *   EXP1-8 ----------- EXP1-3
348
-   *   SPI1-1 ----------- EXP1-1
349
-   *  EXP1-10 ----------- EXP1-7
340
+   *   ----------------------------------
341
+   *   EXP1-10 ---------- EXP1-10  5V
342
+   *   EXP1-9 ----------- EXP1-9   GND
343
+   *   SPI1-4 ----------- EXP1-6   MOSI
344
+   *   EXP1-7 ----------- EXP1-5   LCD_CS
345
+   *   SPI1-3 ----------- EXP1-2   SCK
346
+   *   EXP1-5 ----------- EXP1-4   SD_CS
347
+   *   EXP1-4 ----------- EXP1-8   RESET
348
+   *   EXP1-3 ----------- EXP1-3   MOD_RST
349
+   *   SPI1-1 ----------- EXP1-1   MISO
350
+   *   EXP1-1 ----------- EXP1-7   SD_DET
350 351
    */
351 352
 
352
-  #define CLCD_SPI_BUS                         1  // SPI1 connector
353
+  #define CLCD_SPI_BUS 1                          // SPI1 connector
353 354
 
354
-  #define BEEPER_PIN                      EXP1_9
355
+  #define BEEPER_PIN                 EXP1_02_PIN
355 356
 
356 357
   #define CLCD_MOD_RESET                    PA9
357 358
   #define CLCD_SPI_CS                       PB8
@@ -375,7 +376,7 @@
375 376
   #error "SD CUSTOM_CABLE is not compatible with SKR Mini E3."
376 377
 #endif
377 378
 
378
-#define ONBOARD_SPI_DEVICE                     1  // SPI1 -> used only by HAL/STM32F1...
379
+#define ONBOARD_SPI_DEVICE 1                      // SPI1 -> used only by HAL/STM32F1...
379 380
 #define ONBOARD_SD_CS_PIN                   PA4   // Chip select for "System" SD card
380 381
 
381 382
 #define ENABLE_SPI1

+ 14
- 14
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h Visa fil

@@ -119,23 +119,23 @@
119 119
  *                 ------                                    ------
120 120
  *                  EXP1                                      EXP2
121 121
  */
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 122
 #define EXP1_01_PIN                         PC10
123
+#define EXP1_02_PIN                         PC11
124
+#define EXP1_03_PIN                         PB6
125
+#define EXP1_04_PIN                         PC12
126
+#define EXP1_05_PIN                         PC13
127
+#define EXP1_06_PIN                         PB7
128
+#define EXP1_07_PIN                         PC15
129
+#define EXP1_08_PIN                         PC14
130 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 131
 #define EXP2_01_PIN                         PB4
132
+#define EXP2_02_PIN                         PB3
133
+#define EXP2_03_PIN                         PD2
134
+#define EXP2_04_PIN                         PA15
135
+#define EXP2_05_PIN                         PB8
136
+#define EXP2_06_PIN                         PB5
137
+#define EXP2_07_PIN                         PB9
138
+#define EXP2_08_PIN                         -1    // RESET
139 139
 
140 140
 //
141 141
 // LCD / Controller

+ 7
- 7
Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h Visa fil

@@ -131,14 +131,14 @@
131 131
  *       ------
132 132
  *        EXP1
133 133
  */
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 134
 #define EXP1_01_PIN                         PB5
135
+#define EXP1_02_PIN                         PB6
136
+#define EXP1_03_PIN                         PA2
137
+#define EXP1_04_PIN                         -1   // RESET
138
+#define EXP1_05_PIN                         PA3
139
+#define EXP1_06_PIN                         PB8
140
+#define EXP1_07_PIN                         PB7
141
+#define EXP1_08_PIN                         PA4
142 142
 
143 143
 //
144 144
 // LCD / Controller

+ 35
- 35
Marlin/src/pins/stm32f1/pins_CREALITY_V4.h Visa fil

@@ -176,17 +176,17 @@
176 176
      *        ------
177 177
      *         EXP1
178 178
      */
179
-    #define EXP1_03_PIN                     PB15
180
-    #define EXP1_04_PIN                     PB12
181
-    #define EXP1_05_PIN                     PB13
182
-    #define EXP1_06_PIN                     PB14
183
-    #define EXP1_07_PIN                     PE8
184
-    #define EXP1_08_PIN                     PB10
185
-    #define EXP1_09_PIN                     PB2
186
-    #define EXP1_10_PIN                     PC6
179
+    #define EXP1_01_PIN                     PC6
180
+    #define EXP1_02_PIN                     PB2
181
+    #define EXP1_03_PIN                     PB10
182
+    #define EXP1_04_PIN                     PE8
183
+    #define EXP1_05_PIN                     PB14
184
+    #define EXP1_06_PIN                     PB13
185
+    #define EXP1_07_PIN                     PB12
186
+    #define EXP1_08_PIN                     PB15
187 187
 
188 188
     #ifndef HAS_PIN_27_BOARD
189
-      #define BEEPER_PIN             EXP1_10_PIN
189
+      #define BEEPER_PIN             EXP1_01_PIN
190 190
     #endif
191 191
 
192 192
   #elif ENABLED(VET6_12864_LCD)
@@ -202,50 +202,50 @@
202 202
      *        ------
203 203
      *         EXP1
204 204
      */
205
-    #define EXP1_03_PIN                     PA7
206
-    #define EXP1_04_PIN                     PA4
207
-    #define EXP1_05_PIN                     PA5
208
-    #define EXP1_06_PIN                     PA6
209
-    #define EXP1_07_PIN                     -1
210
-    #define EXP1_08_PIN                     PB10
211
-    #define EXP1_09_PIN                     PC5
212
-    #define EXP1_10_PIN                     -1
205
+    #define EXP1_01_PIN                     -1
206
+    #define EXP1_02_PIN                     PC5
207
+    #define EXP1_03_PIN                     PB10
208
+    #define EXP1_04_PIN                     -1
209
+    #define EXP1_05_PIN                     PA6
210
+    #define EXP1_06_PIN                     PA5
211
+    #define EXP1_07_PIN                     PA4
212
+    #define EXP1_08_PIN                     PA7
213 213
 
214 214
   #else
215 215
     #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
216 216
   #endif
217 217
 
218
-  #define LCD_PINS_RS                EXP1_04_PIN
219
-  #define LCD_PINS_ENABLE            EXP1_03_PIN
220
-  #define LCD_PINS_D4                EXP1_05_PIN
218
+  #define LCD_PINS_RS                EXP1_07_PIN
219
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
220
+  #define LCD_PINS_D4                EXP1_06_PIN
221 221
 
222
-  #define BTN_ENC                    EXP1_09_PIN
223
-  #define BTN_EN1                    EXP1_08_PIN
224
-  #define BTN_EN2                    EXP1_06_PIN
222
+  #define BTN_ENC                    EXP1_02_PIN
223
+  #define BTN_EN1                    EXP1_03_PIN
224
+  #define BTN_EN2                    EXP1_05_PIN
225 225
 
226 226
 #elif ANY(HAS_DWIN_E3V2, IS_DWIN_MARLINUI, DWIN_VET6_CREALITY_LCD)
227 227
 
228 228
   #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
229 229
     // RET6 DWIN ENCODER LCD
230
-    #define EXP1_03_PIN                     PB15
231
-    #define EXP1_04_PIN                     PB12
232
-    #define EXP1_05_PIN                     PB13
233
-    #define EXP1_06_PIN                     PB14
230
+    #define EXP1_05_PIN                     PB14
231
+    #define EXP1_06_PIN                     PB13
232
+    #define EXP1_07_PIN                     PB12
233
+    #define EXP1_08_PIN                     PB15
234 234
     //#define LCD_LED_PIN                   PB2
235 235
   #else
236 236
     // VET6 DWIN ENCODER LCD
237
-    #define EXP1_03_PIN                     PA7
238
-    #define EXP1_04_PIN                     PA4
239
-    #define EXP1_05_PIN                     PA5
240
-    #define EXP1_06_PIN                     PA6
237
+    #define EXP1_05_PIN                     PA6
238
+    #define EXP1_06_PIN                     PA5
239
+    #define EXP1_07_PIN                     PA4
240
+    #define EXP1_08_PIN                     PA7
241 241
   #endif
242 242
 
243
-  #define BTN_ENC                    EXP1_06_PIN
244
-  #define BTN_EN1                    EXP1_03_PIN
245
-  #define BTN_EN2                    EXP1_04_PIN
243
+  #define BTN_ENC                    EXP1_05_PIN
244
+  #define BTN_EN1                    EXP1_08_PIN
245
+  #define BTN_EN2                    EXP1_07_PIN
246 246
 
247 247
   #ifndef BEEPER_PIN
248
-    #define BEEPER_PIN               EXP1_05_PIN
248
+    #define BEEPER_PIN               EXP1_06_PIN
249 249
   #endif
250 250
 
251 251
 #endif

+ 14
- 14
Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h Visa fil

@@ -158,14 +158,14 @@
158 158
      *        ------
159 159
      *         EXP1
160 160
      */
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 161
     #define EXP1_01_PIN                     PC6
162
+    #define EXP1_02_PIN                     PB2
163
+    #define EXP1_03_PIN                     PB10
164
+    #define EXP1_04_PIN                     PE8
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 169
 
170 170
     #define BEEPER_PIN               EXP1_01_PIN
171 171
 
@@ -182,14 +182,14 @@
182 182
      *        ------
183 183
      *         EXP1
184 184
      */
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 185
     #define EXP1_01_PIN                     -1
186
+    #define EXP1_02_PIN                     PC5
187
+    #define EXP1_03_PIN                     PB10
188
+    #define EXP1_04_PIN                     -1
189
+    #define EXP1_05_PIN                     PA6
190
+    #define EXP1_06_PIN                     PA5
191
+    #define EXP1_07_PIN                     PA4
192
+    #define EXP1_08_PIN                     PA7
193 193
 
194 194
   #else
195 195
     #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."

+ 14
- 14
Marlin/src/pins/stm32f1/pins_FLY_MINI.h Visa fil

@@ -131,23 +131,23 @@
131 131
  *                ------                                        ------
132 132
  *                 EXP1                                          EXP2
133 133
  */
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 134
 #define EXP1_01_PIN                        PC14
135
+#define EXP1_02_PIN                        PC13
136
+#define EXP1_03_PIN                        PB9
137
+#define EXP1_04_PIN                        PB8
138
+#define EXP1_05_PIN                        PB7
139
+#define EXP1_06_PIN                        PB6
140
+#define EXP1_07_PIN                        PB5
141
+#define EXP1_08_PIN                        PB4
142 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 143
 #define EXP2_01_PIN                        PB14
144
+#define EXP2_02_PIN                        PB13
145
+#define EXP2_03_PIN                        PB3
146
+#define EXP2_04_PIN                        PB12
147
+#define EXP2_05_PIN                        PD2
148
+#define EXP2_06_PIN                        PB15
149
+#define EXP2_07_PIN                        PB11
150
+#define EXP2_08_PIN                        -1     // RESET
151 151
 
152 152
 //
153 153
 // LCD / Controller

+ 7
- 7
Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h Visa fil

@@ -146,14 +146,14 @@
146 146
  *  - Functionally the pins are assigned in the same order as on the Ender-3 board.
147 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_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 149
 #define EXP1_01_PIN                         PC9
150
+#define EXP1_02_PIN                         PC12
151
+#define EXP1_03_PIN                         PC11
152
+#define EXP1_04_PIN                         PB14
153
+#define EXP1_05_PIN                         PC10
154
+#define EXP1_06_PIN                         PB13
155
+#define EXP1_07_PIN                         PB12
156
+#define EXP1_08_PIN                         PB15
157 157
 
158 158
 #if HAS_WIRED_LCD
159 159
   #define BEEPER_PIN                 EXP1_01_PIN

+ 14
- 14
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h Visa fil

@@ -215,23 +215,23 @@
215 215
  *        ------                  ------
216 216
  *         EXP1                    EXP2
217 217
  */
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 218
 #define EXP1_01_PIN                         PC5
219
+#define EXP1_02_PIN                         PE13
220
+#define EXP1_03_PIN                         PD13
221
+#define EXP1_04_PIN                         PC6
222
+#define EXP1_05_PIN                         PE14
223
+#define EXP1_06_PIN                         PE15
224
+#define EXP1_07_PIN                         PD11
225
+#define EXP1_08_PIN                         PD10
226 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 227
 #define EXP2_01_PIN                         PA6
228
+#define EXP2_02_PIN                         PA5
229
+#define EXP2_03_PIN                         PE8
230
+#define EXP2_04_PIN                         PE10
231
+#define EXP2_05_PIN                         PE11
232
+#define EXP2_06_PIN                         PA7
233
+#define EXP2_07_PIN                         PE12
234
+#define EXP2_08_PIN                         -1
235 235
 
236 236
 //
237 237
 // SD Card

+ 21
- 21
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h Visa fil

@@ -149,33 +149,33 @@
149 149
  *                ------                                    ------                                  ------
150 150
  *                 EXP1                                      EXP2                                "Ender-3 EXP1"
151 151
  */
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 152
 #define EXP1_01_PIN                         PC1
153
+#define EXP1_02_PIN                         PC3
154
+#define EXP1_03_PIN                         PA4
155
+#define EXP1_04_PIN                         PA5
156
+#define EXP1_05_PIN                         PA6
157
+#define EXP1_06_PIN                         PA7
158
+#define EXP1_07_PIN                         PC4
159
+#define EXP1_08_PIN                         PC5
160 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 161
 #define EXP2_01_PIN                         PB14
162
+#define EXP2_02_PIN                         PB13
163
+#define EXP2_03_PIN                         PB11
164
+#define EXP2_04_PIN                         PA15
165
+#define EXP2_05_PIN                         PB0
166
+#define EXP2_06_PIN                         PB15
167
+#define EXP2_07_PIN                         PC10
168
+#define EXP2_08_PIN                         -1   // RESET
169 169
 
170 170
 // "Ender-3 EXP1"
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 171
 #define EXP3_01_PIN                         PC1
172
+#define EXP3_02_PIN                         PC3
173
+#define EXP3_03_PIN                         PB11
174
+#define EXP3_04_PIN                         -1   // RESET
175
+#define EXP3_05_PIN                         PB0
176
+#define EXP3_06_PIN                         PA6
177
+#define EXP3_07_PIN                         PA5
178
+#define EXP3_08_PIN                         PA4
179 179
 
180 180
 #if HAS_WIRED_LCD
181 181
 

+ 9
- 9
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h Visa fil

@@ -88,16 +88,16 @@
88 88
  *                 ------
89 89
  *               "E3" EXP1
90 90
  */
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 91
 #define EXP3_01_PIN                         PD2
92
+#define EXP3_02_PIN                         PB3
93
+#define EXP3_03_PIN                         PB5
94
+#define EXP3_04_PIN                         PA11  // RESET?
95
+#define EXP3_05_PIN                         PB4
96
+#define EXP3_06_PIN                         PC1
97
+#define EXP3_07_PIN                         PC3
98
+#define EXP3_08_PIN                         PC2
99
+#define EXP3_09_PIN                         -1    // GND
100
+#define EXP3_10_PIN                         -1    // 5V
101 101
 
102 102
 //
103 103
 // LCD Pins

+ 20
- 20
Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h Visa fil

@@ -179,30 +179,30 @@
179 179
 
180 180
   /** FYSETC TFT TFT81050 display pinout
181 181
    *
182
-   *               Board                                     Display
183
-   *               -----                                      -----
184
-   *           5V | 1 2 | GND               (SPI1-MISO) MISO | 1 2 | SCK   (SPI1-SCK)
185
-   * (FREE)   PB7 | 3 4 | PB8  (LCD_CS)     (PA9)  MOD_RESET | 3 4 | SD_CS (PA10)
186
-   * (FREE)   PB9 | 5 6   PA10 (SD_CS)      (PB8)     LCD_CS | 5 6   MOSI  (SPI1-MOSI)
187
-   *        RESET | 7 8 | PA9  (MOD_RESET)  (PA15)    SD_DET | 7 8 | RESET
188
-   * (BEEPER) PB6 | 9 10| PA15 (SD_DET)                  GND | 9 10| 5V
189
-   *               -----                                      -----
190
-   *                EXP1                                       EXP1
182
+   *                   Board                                   Display
183
+   *                   ------                                  ------
184
+   * (SD_DET)    PA15 | 1  2 | PB6 (BEEPER)  (SPI1-MISO) MISO | 1  2 | SCK   (SPI1-SCK)
185
+   * (MOD_RESET) PA9  | 3  4 | RESET                MOD_RESET | 3  4 | SD_CS
186
+   * (SD_CS)     PA10   5  6 | PB9 (FREE)              LCD_CS | 5  6   MOSI  (SPI1-MOSI)
187
+   * (LCD_CS)    PB8  | 7  8 | PB7 (FREE)              SD_DET | 7  8 | RESET
188
+   *             GND  | 9 10 |  5V                        GND | 9 10 | 5V
189
+   *                   ------                                  ------
190
+   *                    EXP1                                    EXP1
191 191
    *
192 192
    * Needs custom cable:
193 193
    *
194 194
    *    Board   Adapter   Display
195
-   *           _________
196
-   *   EXP1-1 ----------- EXP1-10
197
-   *   EXP1-2 ----------- EXP1-9
198
-   *   SPI1-4 ----------- EXP1-6
199
-   *   EXP1-4 ----------- EXP1-5
200
-   *   SP11-3 ----------- EXP1-2
201
-   *   EXP1-6 ----------- EXP1-4
202
-   *   EXP1-7 ----------- EXP1-8
203
-   *   EXP1-8 ----------- EXP1-3
204
-   *   SPI1-1 ----------- EXP1-1
205
-   *  EXP1-10 ----------- EXP1-7
195
+   *   ----------------------------------
196
+   *   EXP1-10 ---------- EXP1-10  5V
197
+   *   EXP1-9 ----------- EXP1-9   GND
198
+   *   SPI1-4 ----------- EXP1-6   MOSI
199
+   *   EXP1-7 ----------- EXP1-5   LCD_CS
200
+   *   SP11-3 ----------- EXP1-2   SCK
201
+   *   EXP1-5 ----------- EXP1-4   SD_CS
202
+   *   EXP1-4 ----------- EXP1-8   RESET
203
+   *   EXP1-3 ----------- EXP1-3   MOD_RST
204
+   *   SPI1-1 ----------- EXP1-1   MISO
205
+   *   EXP1-1 ----------- EXP1-7   SD_DET
206 206
    */
207 207
 
208 208
   #define CLCD_SPI_BUS                         1  // SPI1 connector

+ 7
- 7
Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h Visa fil

@@ -72,14 +72,14 @@
72 72
 //   2 +5V
73 73
 //   1 GND
74 74
 
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 75
 #define EXP1_01_PIN                         PB1
76
+#define EXP1_02_PIN                         PB0
77
+#define EXP1_03_PIN                         PA9
78
+#define EXP1_04_PIN                         PA10
79
+#define EXP1_05_PIN                         PC5
80
+#define EXP1_06_PIN                         PB2
81
+#define EXP1_07_PIN                         PB10
82
+#define EXP1_08_PIN                         PB11
83 83
 
84 84
 // AUX1 connector
85 85
 //  1 +5V

+ 12
- 12
Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h Visa fil

@@ -89,14 +89,14 @@
89 89
 //   2 +5V                    +5V
90 90
 //   1 GND                    GND
91 91
 
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 92
 #define EXP1_01_PIN                         PE13
93
+#define EXP1_02_PIN                         PE11
94
+#define EXP1_03_PIN                         PE12
95
+#define EXP1_04_PIN                         PE10
96
+#define EXP1_05_PIN                         PE8
97
+#define EXP1_06_PIN                         PE9
98
+#define EXP1_07_PIN                         PE15
99
+#define EXP1_08_PIN                         PE14
100 100
 
101 101
 // EXP2 connector
102 102
 //     MARK     I/O     ZONESTAR_LCD12864   REPRAPDISCOUNT_LCD12864
@@ -111,12 +111,12 @@
111 111
 //   2 +5V                    +5V
112 112
 //   1 GND                    GND
113 113
 
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 114
 #define EXP2_03_PIN                         PA9
115
+#define EXP2_04_PIN                         PA10
116
+#define EXP2_05_PIN                         PA15
117
+#define EXP2_06_PIN                         PB4
118
+#define EXP2_07_PIN                         PB5
119
+#define EXP2_08_PIN                         PB3
120 120
 
121 121
 // AUX1 connector
122 122
 //  1 +5V

+ 14
- 14
Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h Visa fil

@@ -90,14 +90,14 @@
90 90
 //   2 +5V
91 91
 //   1 GND
92 92
 
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 93
 #define EXP1_01_PIN                         PE13
94
+#define EXP1_02_PIN                         PE11
95
+#define EXP1_03_PIN                         PE12
96
+#define EXP1_04_PIN                         PE10
97
+#define EXP1_05_PIN                         PE8
98
+#define EXP1_06_PIN                         PE9
99
+#define EXP1_07_PIN                         PE15
100
+#define EXP1_08_PIN                         PE14
101 101
 
102 102
 // EXP2 connector
103 103
 //     MARK     I/O     ZONESTAR_LCD12864   REPRAPDISCOUNT_LCD12864
@@ -112,14 +112,14 @@
112 112
 //   2 +5V
113 113
 //   1 GND
114 114
 
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 115
 #define EXP2_01_PIN                         PC0
116
+#define EXP2_02_PIN                         PE7
117
+#define EXP2_03_PIN                         PA9
118
+#define EXP2_04_PIN                         PA10
119
+#define EXP2_05_PIN                         PA15
120
+#define EXP2_06_PIN                         PB4
121
+#define EXP2_07_PIN                         PB5
122
+#define EXP2_08_PIN                         PB3
123 123
 
124 124
 // AUX1 connector
125 125
 //  1 +5V

+ 15
- 15
Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h Visa fil

@@ -208,24 +208,24 @@
208 208
  *                 EXP1                                      EXP2               |
209 209
  * ------------------------------------------------------------------------------
210 210
  */
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 211
 #define EXP1_01_PIN                         PE7
212
+#define EXP1_02_PIN                         PB1
213
+#define EXP1_03_PIN                         PE9
214
+#define EXP1_04_PIN                         PE8
215
+#define EXP1_05_PIN                         PE10
216
+#define EXP1_06_PIN                         PE11
217
+#define EXP1_07_PIN                         PE12
218
+#define EXP1_08_PIN                         PE13
219 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 220
 #define EXP2_01_PIN                         PA6
221
+#define EXP2_02_PIN                         PA5
222
+#define EXP2_03_PIN                         PC5
223
+#define EXP2_04_PIN                         PA4
224
+#define EXP2_05_PIN                         PB0
225
+#define EXP2_06_PIN                         PA7
226
+#define EXP2_07_PIN                         PC4
227
+#define EXP2_08_PIN                         -1
228
+#define EXP2_10_PIN                         PA3
229 229
 
230 230
 // HAL SPI1 pins
231 231
 #define SD_SCK_PIN                   EXP2_02_PIN  // SPI1 SCLK

+ 49
- 49
Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h Visa fil

@@ -219,28 +219,28 @@
219 219
       *
220 220
       *               BTT E3 RRF                                   Display Ribbon
221 221
       *                ------                                         ------
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)
222
+      * (BEEPER)  PE8 | 1  2 | PE9  (BTN_ENC)                    GND |10  9 | 5V
223
+      * (BTN_EN1) PE7 | 3  4 | RESET                          BEEPER | 8  7 | ESTOP    (RESET)
224
+      * (BTN_EN2) PB2   5  6 | PE10 (LCD_D4)       (BTN_ENC) ENC_BTN | 6  5 | LCD_SCLK (LCD_D4)
225
+      * (LCD_RS)  PB1 | 7  8 | PE11 (LCD_EN)       (BTN_EN2) ENC_A   | 4  3 | LCD_DATA (LCD_EN)
226
+      *           GND | 9 10 | 5V                  (BTN_EN1) ENC_B   | 2  1 | LCD_CS   (LCD_RS)
227 227
       *                ------                                         ------
228
-      *                 EXP1                                          Ribbon
228
+      *                 EXP1                                           LCD
229 229
       *
230 230
       * Needs custom cable:
231 231
       *
232 232
       *    Board   Adapter   Display Ribbon (coming from display)
233
-      *
234
-      *   EXP1-1 ----------- EXP1-9
235
-      *   EXP1-2 ----------- EXP1-10
236
-      *   EXP1-3 ----------- EXP1-3
237
-      *   EXP1-4 ----------- EXP1-1
238
-      *   EXP1-5 ----------- EXP1-5
239
-      *   EXP1-6 ----------- EXP1-4
240
-      *   EXP1-7 ----------- EXP1-7
241
-      *   EXP1-8 ----------- EXP1-8
242
-      *   EXP1-9 ----------- EXP1-6
243
-      *  EXP1-10 ----------- EXP1-8
233
+      *  ----------------------------------
234
+      *  EXP1-10 ---------- LCD-9   5V
235
+      *  EXP1-9 ----------- LCD-10  GND
236
+      *  EXP1-8 ----------- LCD-3   LCD_EN
237
+      *  EXP1-7 ----------- LCD-1   LCD_RS
238
+      *  EXP1-6 ----------- LCD-5   LCD_D4
239
+      *  EXP1-5 ----------- LCD-4   EN2
240
+      *  EXP1-4 ----------- LCD-7   RESET
241
+      *  EXP1-3 ----------- LCD-2   EN1
242
+      *  EXP1-2 ----------- LCD-6   BTN
243
+      *  EXP1-1 ----------- LCD-8   BEEPER
244 244
       */
245 245
 
246 246
     #endif
@@ -286,28 +286,28 @@
286 286
        *
287 287
        *                  Board                       Display
288 288
        *                  ------                       ------
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)
289
+       * (SD_DET)    PE8 | 1  2 | PE9 (BEEPER)     5V |10  9 | GND
290
+       * (MOD_RESET) PE7 | 3  4 | RESET            -- | 8  7 | (SD_DET)
291
+       * (SD_CS)     PB2   5  6 | PE10        (MOSI)    6  5 | --
292
+       * (LCD_CS)    PB1 | 7  8 | PE11        (SD_CS) | 4  3 | (LCD_CS)
293
+       *             GND | 9 10 | 5V          (SCK)   | 2  1 | (MISO)
294 294
        *                  ------                       ------
295 295
        *                   EXP1                         EXP1
296 296
        *
297 297
        * Needs custom cable:
298 298
        *
299 299
        *    Board   Adapter   Display
300
-       *           _________
301
-       *   EXP1-1 ----------- EXP1-10
302
-       *   EXP1-2 ----------- EXP1-9
303
-       *   SPI1-4 ----------- EXP1-6
304
-       *   EXP1-4 ----------- FREE
305
-       *   SPI1-3 ----------- EXP1-2
306
-       *   EXP1-6 ----------- EXP1-4
307
-       *   EXP1-7 ----------- FREE
308
-       *   EXP1-8 ----------- EXP1-3
309
-       *   SPI1-1 ----------- EXP1-1
310
-       *  EXP1-10 ----------- EXP1-7
300
+       *   ----------------------------------
301
+       *   EXP1-10 ---------- EXP1-10  5V
302
+       *   EXP1-9 ----------- EXP1-9   GND
303
+       *   SPI1-4 ----------- EXP1-6   MOSI
304
+       *   EXP1-7 ----------- n/c
305
+       *   SPI1-3 ----------- EXP1-2   SCK
306
+       *   EXP1-5 ----------- EXP1-4   SD_CS
307
+       *   EXP1-4 ----------- n/c
308
+       *   EXP1-3 ----------- EXP1-3   LCD_CS
309
+       *   SPI1-1 ----------- EXP1-1   MISO
310
+       *   EXP1-1 ----------- EXP1-7   SD_DET
311 311
        */
312 312
 
313 313
       #define TFTGLCD_CS                    PE7
@@ -341,28 +341,28 @@
341 341
    *
342 342
    *                  Board                          Display
343 343
    *                  ------                          ------
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)
344
+   * (SD_DET)    PE8 | 1  2 | PE9 (BEEPER)        5V |10  9 | GND
345
+   * (MOD_RESET) PE7 | 3  4 | RESET            RESET | 8  7 | (SD_DET)
346
+   * (SD_CS)     PB2   5  6 | PE10           (MOSI)  | 6  5 | (LCD_CS)
347
+   * (LCD_CS)    PB1 | 7  8 | PE11           (SD_CS) | 4  3 | (MOD_RESET)
348
+   *             GND | 9 10 | 5V             (SCK)   | 2  1 | (MISO)
349 349
    *                  ------                          ------
350 350
    *                   EXP1                            EXP1
351 351
    *
352 352
    * Needs custom cable:
353 353
    *
354 354
    *    Board   Adapter   Display
355
-   *
356
-   *   EXP1-1 ----------- EXP1-10
357
-   *   EXP1-2 ----------- EXP1-9
358
-   *   SPI1-4 ----------- EXP1-6
359
-   *   EXP1-4 ----------- EXP1-5
360
-   *   SPI1-3 ----------- EXP1-2
361
-   *   EXP1-6 ----------- EXP1-4
362
-   *   EXP1-7 ----------- EXP1-8
363
-   *   EXP1-8 ----------- EXP1-3
364
-   *   SPI1-1 ----------- EXP1-1
365
-   *  EXP1-10 ----------- EXP1-7
355
+   *   ----------------------------------
356
+   *   EXP1-10 ---------- EXP1-10  5V
357
+   *   EXP1-9 ----------- EXP1-9   GND
358
+   *   SPI1-4 ----------- EXP1-6   MOSI
359
+   *   EXP1-7 ----------- EXP1-5   LCD_CS
360
+   *   SPI1-3 ----------- EXP1-2   SCK
361
+   *   EXP1-5 ----------- EXP1-4   SD_CS
362
+   *   EXP1-4 ----------- EXP1-8   RESET
363
+   *   EXP1-3 ----------- EXP1-3   MOD_RST
364
+   *   SPI1-1 ----------- EXP1-1   MISO
365
+   *   EXP1-1 ----------- EXP1-7   SD_DET
366 366
    */
367 367
 
368 368
   #define CLCD_SPI_BUS                         1  // SPI1 connector

+ 13
- 13
Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h Visa fil

@@ -374,22 +374,22 @@
374 374
  *                ------                                     ------
375 375
  *                 EXP1                                       EXP2
376 376
  */
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 377
 #define EXP1_01_PIN                         PC11
378
+#define EXP1_02_PIN                         PA15
379
+#define EXP1_03_PIN                         PC10
380
+#define EXP1_04_PIN                         PA8
381
+#define EXP1_05_PIN                         PG8
382
+#define EXP1_06_PIN                         PG7
383
+#define EXP1_07_PIN                         PG6
384
+#define EXP1_08_PIN                         PG5
385 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 386
 #define EXP2_01_PIN                         PB14
387
+#define EXP2_02_PIN                         PB13
388
+#define EXP2_03_PIN                         PD10
389
+#define EXP2_04_PIN                         PB12
390
+#define EXP2_05_PIN                         PH10
391
+#define EXP2_06_PIN                         PB15
392
+#define EXP2_07_PIN                         PB10
393 393
 
394 394
 //
395 395
 // LCDs and Controllers

+ 14
- 14
Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h Visa fil

@@ -330,23 +330,23 @@
330 330
  *                ------                                      ------
331 331
  *                 EXP1                                        EXP2
332 332
  */
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 333
 #define EXP1_01_PIN                         PE8
334
+#define EXP1_02_PIN                         PE7
335
+#define EXP1_03_PIN                         PE9
336
+#define EXP1_04_PIN                         PE10
337
+#define EXP1_05_PIN                         PE12
338
+#define EXP1_06_PIN                         PE13
339
+#define EXP1_07_PIN                         PE14
340
+#define EXP1_08_PIN                         PE15
341 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 342
 #define EXP2_01_PIN                         PA6
343
+#define EXP2_02_PIN                         PA5
344
+#define EXP2_03_PIN                         PB1
345
+#define EXP2_04_PIN                         PA4
346
+#define EXP2_05_PIN                         PB2
347
+#define EXP2_06_PIN                         PA7
348
+#define EXP2_07_PIN                         PC15
349
+#define EXP2_08_PIN                         -1
350 350
 
351 351
 //
352 352
 // Onboard SD card

+ 18
- 18
Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h Visa fil

@@ -321,23 +321,23 @@
321 321
  *                ------                                      ------
322 322
  *                 EXP1                                        EXP2
323 323
  */
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 324
 #define EXP1_01_PIN                         PG4
325
+#define EXP1_02_PIN                         PA8
326
+#define EXP1_03_PIN                         PD11
327
+#define EXP1_04_PIN                         PD10
328
+#define EXP1_05_PIN                         PG2
329
+#define EXP1_06_PIN                         PG3
330
+#define EXP1_07_PIN                         PG6
331
+#define EXP1_08_PIN                         PG7
332 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 333
 #define EXP2_01_PIN                         PB14
334
+#define EXP2_02_PIN                         PB13
335
+#define EXP2_03_PIN                         PG10
336
+#define EXP2_04_PIN                         PB12
337
+#define EXP2_05_PIN                         PF11
338
+#define EXP2_06_PIN                         PB15
339
+#define EXP2_07_PIN                         PF12
340
+#define EXP2_08_PIN                         -1
341 341
 
342 342
 //
343 343
 // Onboard SD card
@@ -553,10 +553,10 @@
553 553
 
554 554
 /**
555 555
  *          ------
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
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
560 560
  *          ------
561 561
  *            W1
562 562
  */

+ 14
- 14
Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h Visa fil

@@ -344,23 +344,23 @@
344 344
  *                ------                                   ------
345 345
  *                 EXP1                                     EXP2
346 346
  */
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 347
 #define EXP1_01_PIN                         PC5
348
+#define EXP1_02_PIN                         PB0
349
+#define EXP1_03_PIN                         PB1
350
+#define EXP1_04_PIN                         PE9
351
+#define EXP1_05_PIN                         PE10
352
+#define EXP1_06_PIN                         PE11
353
+#define EXP1_07_PIN                         PE12
354
+#define EXP1_08_PIN                         PE13
355 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 356
 #define EXP2_01_PIN                         PA6
357
+#define EXP2_02_PIN                         PA5
358
+#define EXP2_03_PIN                         PE7
359
+#define EXP2_04_PIN                         PA4
360
+#define EXP2_05_PIN                         PB2
361
+#define EXP2_06_PIN                         PA7
362
+#define EXP2_07_PIN                         PC4
363
+#define EXP2_08_PIN                         -1
364 364
 
365 365
 //
366 366
 // Onboard SD card

+ 14
- 14
Marlin/src/pins/stm32f4/pins_FLYF407ZG.h Visa fil

@@ -185,23 +185,23 @@
185 185
  *        ------                ------
186 186
  *         EXP1                  EXP2
187 187
  */
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 188
 #define EXP1_01_PIN                         PB10
189
+#define EXP1_02_PIN                         PE15
190
+#define EXP1_03_PIN                         PE14
191
+#define EXP1_04_PIN                         PE12
192
+#define EXP1_05_PIN                         PE10
193
+#define EXP1_06_PIN                         PE9
194
+#define EXP1_07_PIN                         PE8
195
+#define EXP1_08_PIN                         PE7
196 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 197
 #define EXP2_01_PIN                         PB14
198
+#define EXP2_02_PIN                         PB13
199
+#define EXP2_03_PIN                         PC5
200
+#define EXP2_04_PIN                         PF11
201
+#define EXP2_05_PIN                         PC4
202
+#define EXP2_06_PIN                         PB15
203
+#define EXP2_07_PIN                         PB2
204
+#define EXP2_08_PIN                         -1    // RESET
205 205
 
206 206
 //
207 207
 // Onboard SD support

+ 14
- 14
Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h Visa fil

@@ -160,23 +160,23 @@
160 160
  *                      EXP3
161 161
  */
162 162
 
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 163
 #define EXP1_01_PIN                         PC9
164
+#define EXP1_02_PIN                         PC12
165
+#define EXP1_03_PIN                         PB15
166
+#define EXP1_04_PIN                         PB12
167
+#define EXP1_05_PIN                         PB13
168
+#define EXP1_06_PIN                         PB14
169
+#define EXP1_07_PIN                         PB6
170
+#define EXP1_08_PIN                         PB7
171 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 172
 #define EXP2_01_PIN                         PA6
173
+#define EXP2_02_PIN                         PA5
174
+#define EXP2_03_PIN                         PC10
175
+#define EXP2_04_PIN                         PA4
176
+#define EXP2_05_PIN                         PC11
177
+#define EXP2_06_PIN                         PA7
178
+#define EXP2_07_PIN                         PC3
179
+#define EXP2_08_PIN                         -1
180 180
 
181 181
 #if HAS_WIRED_LCD
182 182
 

+ 14
- 14
Marlin/src/pins/stm32f4/pins_FYSETC_S6.h Visa fil

@@ -207,23 +207,23 @@
207 207
  *         ------                 ------
208 208
  *          EXP1                   EXP2
209 209
  */
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 210
 #define EXP1_01_PIN                         PC9
211
+#define EXP1_02_PIN                         PA8
212
+#define EXP1_03_PIN                         PC11
213
+#define EXP1_04_PIN                         PD2
214
+#define EXP1_05_PIN                         PC10
215
+#define EXP1_06_PIN                         PC12
216
+#define EXP1_07_PIN                         PD0
217
+#define EXP1_08_PIN                         PD1
218 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 219
 #define EXP2_01_PIN                         PA6
220
+#define EXP2_02_PIN                         PA5
221
+#define EXP2_03_PIN                         PC6
222
+#define EXP2_04_PIN                         PA4
223
+#define EXP2_05_PIN                         PC7
224
+#define EXP2_06_PIN                         PA7
225
+#define EXP2_07_PIN                         PB10
226
+#define EXP2_08_PIN                         -1    // RESET
227 227
 
228 228
 //
229 229
 // SPI / SD Card

+ 14
- 14
Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h Visa fil

@@ -221,23 +221,23 @@
221 221
  *                  ------                                      ------
222 222
  *                   EXP1                                        EXP2
223 223
  */
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 224
 #define EXP1_01_PIN                         PB2
225
+#define EXP1_02_PIN                         PE10
226
+#define EXP1_03_PIN                         PE11
227
+#define EXP1_04_PIN                         PD10
228
+#define EXP1_05_PIN                         PD9
229
+#define EXP1_06_PIN                         PD8
230
+#define EXP1_07_PIN                         PE15
231
+#define EXP1_08_PIN                         PE7
232 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 233
 #define EXP2_01_PIN                         PA6
234
+#define EXP2_02_PIN                         PA5
235
+#define EXP2_03_PIN                         PE9
236
+#define EXP2_04_PIN                         PA4
237
+#define EXP2_05_PIN                         PE8
238
+#define EXP2_06_PIN                         PA7
239
+#define EXP2_07_PIN                         PB11
240
+#define EXP2_08_PIN                         -1    // RESET
241 241
 
242 242
 #if ENABLED(SDSUPPORT)
243 243
   #ifndef SDCARD_CONNECTION

+ 14
- 14
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h Visa fil

@@ -244,23 +244,23 @@
244 244
  *                ------                                     ------
245 245
  *                 EXP1                                       EXP2
246 246
  */
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 247
 #define EXP1_01_PIN                         PC5
248
+#define EXP1_02_PIN                         PE13
249
+#define EXP1_03_PIN                         PD13
250
+#define EXP1_04_PIN                         PC6
251
+#define EXP1_05_PIN                         PE14
252
+#define EXP1_06_PIN                         PE15
253
+#define EXP1_07_PIN                         PD11
254
+#define EXP1_08_PIN                         PD10
255 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 256
 #define EXP2_01_PIN                         PA6
257
+#define EXP2_02_PIN                         PA5
258
+#define EXP2_03_PIN                         PE8
259
+#define EXP2_04_PIN                         PE10
260
+#define EXP2_05_PIN                         PE11
261
+#define EXP2_06_PIN                         PA7
262
+#define EXP2_07_PIN                         PE12
263
+#define EXP2_08_PIN                         -1    // RESET
264 264
 
265 265
 //
266 266
 // SPI SD Card

+ 14
- 14
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h Visa fil

@@ -238,23 +238,23 @@
238 238
  *                ------                                      ------
239 239
  *                 EXP1                                        EXP2
240 240
  */
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 241
 #define EXP1_01_PIN                     PC5
242
+#define EXP1_02_PIN                     PE13
243
+#define EXP1_03_PIN                     PD13
244
+#define EXP1_04_PIN                     PC6
245
+#define EXP1_05_PIN                     PE14
246
+#define EXP1_06_PIN                     PE15
247
+#define EXP1_07_PIN                     PD11
248
+#define EXP1_08_PIN                     PD10
249 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 250
 #define EXP2_01_PIN                     PA6
251
+#define EXP2_02_PIN                     PA5
252
+#define EXP2_03_PIN                     PE8
253
+#define EXP2_04_PIN                     PE10
254
+#define EXP2_05_PIN                     PE11
255
+#define EXP2_06_PIN                     PA7
256
+#define EXP2_07_PIN                     PE12
257
+#define EXP2_08_PIN                     -1    // RESET
258 258
 
259 259
 //
260 260
 // LCD SD

+ 7
- 7
Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h Visa fil

@@ -213,14 +213,14 @@
213 213
  * A remote SD card is currently not supported because the pins routed to the EXP2
214 214
  * connector are shared with the onboard SD card.
215 215
  */
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 216
 #define EXP1_01_PIN                         PA14
217
+#define EXP1_02_PIN                         PB0
218
+#define EXP1_03_PIN                         PC4
219
+//#define EXP1_04_PIN                       -1
220
+#define EXP1_05_PIN                         PC5
221
+#define EXP1_06_PIN                         PB13
222
+#define EXP1_07_PIN                         PB12
223
+#define EXP1_08_PIN                         PB15
224 224
 
225 225
 #if ENABLED(CR10_STOCKDISPLAY)
226 226
   /**          ------

+ 14
- 14
Marlin/src/pins/stm32f4/pins_VAKE403D.h Visa fil

@@ -175,23 +175,23 @@
175 175
  *        ------                  ------
176 176
  *         EXP1                    EXP2
177 177
  */
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 178
 #define EXP1_01_PIN                         PC9
179
+#define EXP1_02_PIN                         PB12
180
+#define EXP1_03_PIN                         PD7
181
+#define EXP1_04_PIN                         PC12
182
+#define EXP1_05_PIN                         PD1
183
+#define EXP1_06_PIN                         PD2
184
+#define EXP1_07_PIN                         PD3
185
+#define EXP1_08_PIN                         PD4
186 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 187
 //#define EXP2_01_PIN                       ?
188
+//#define EXP2_02_PIN                       ?
189
+#define EXP2_03_PIN                         PD6
190
+//#define EXP2_04_PIN                       ?
191
+#define EXP2_05_PIN                         PD0
192
+//#define EXP2_06_PIN                       ?
193
+#define EXP2_07_PIN                         PB7
194
+#define EXP2_08_PIN                         -1
195 195
 
196 196
 //
197 197
 // LCD / Controller

+ 47
- 47
Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h Visa fil

@@ -163,11 +163,11 @@
163 163
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
164 164
   /**
165 165
    *        ------                ------                ------
166
-   * (ENT) | 1  2 | (BEEP)       | 1  2 |              | 1  2 |
167
-   *  (RX) | 3  4 |         (RX) | 3  4 | (TX)      RX | 3  4 | TX
168
-   *  (TX)   5  6 |        (ENT)   5  6 | (BEEP)   ENT | 5  6 | BEEP
169
-   *   (B) | 7  8 | (A)      (B) | 7  8 | (A)        B | 7  8 | A
170
-   *   GND | 9 10 | (VCC)    GND | 9 10 | VCC      GND | 9 10 | VCC
166
+   * (ENT) | 1  2 | (BEEP)       |10  9 |              |10  9 |
167
+   *  (RX) | 3  4 |         (RX) | 8  7 | (TX)      RX | 8  7 | TX
168
+   *  (TX)   5  6 |        (ENT)   6  5 | (BEEP)   ENT | 6  5 | BEEP
169
+   *   (B) | 7  8 | (A)      (B) | 4  3 | (A)        B | 4  3 | A
170
+   *   GND | 9 10 | (VCC)    GND | 2  1 | VCC      GND | 2  1 | VCC
171 171
    *        ------                ------                ------
172 172
    *         EXP1                  DWIN               DWIN (plug)
173 173
    *
@@ -280,11 +280,11 @@
280 280
          *
281 281
          *                 Board                               Display
282 282
          *                 ------                               ------
283
-         * (BEEPER) PB6  | 1  2 | PB5  (SD_DET)             5V | 1  2 | GND
284
-         *         RESET | 3  4 | PA9  (MOD_RESET)          -- | 3  4 | (SD_DET)
285
-         *          PB9    5  6 | PA10 (SD_CS)         (MOSI)  | 5  6 | --
286
-         *          PB7  | 7  8 | PB8  (LCD_CS)        (SD_CS) | 7  8 | (LCD_CS)
287
-         *           GND | 9 10 | 5V                   (SCK)   | 9 10 | (MISO)
283
+         * (BEEPER) PB6  | 1  2 | PB5  (SD_DET)             5V |10  9 | GND
284
+         *         RESET | 3  4 | PA9  (MOD_RESET)          -- | 8  7 | (SD_DET)
285
+         *          PB9    5  6 | PA10 (SD_CS)         (MOSI)  | 6  5 | --
286
+         *          PB7  | 7  8 | PB8  (LCD_CS)        (SD_CS) | 4  3 | (LCD_CS)
287
+         *           GND | 9 10 | 5V                   (SCK)   | 2  1 | (MISO)
288 288
          *                 ------                               ------
289 289
          *                  EXP1                                 EXP1
290 290
          *
@@ -292,16 +292,16 @@
292 292
          *
293 293
          *    Board             Display
294 294
          *
295
-         *   EXP1-1 ----------- EXP1-10
296
-         *   EXP1-2 ----------- EXP1-9
297
-         *   SPI1-4 ----------- EXP1-6
298
-         *   EXP1-4 ----------- FREE
299
-         *   SPI1-3 ----------- EXP1-2
300
-         *   EXP1-6 ----------- EXP1-4
301
-         *   EXP1-7 ----------- FREE
302
-         *   EXP1-8 ----------- EXP1-3
303
-         *   SPI1-1 ----------- EXP1-1
304
-         *  EXP1-10 ----------- EXP1-7
295
+         *  EXP1-10 ----------- EXP1-10  5V
296
+         *  EXP1-9 ------------ EXP1-9   GND
297
+         *  SPI1-4 ------------ EXP1-6   MOSI
298
+         *  EXP1-7 ------------ n/c
299
+         *  SPI1-3 ------------ EXP1-2   SCK
300
+         *  EXP1-5 ------------ EXP1-4   SD_CS
301
+         *  EXP1-4 ------------ n/c
302
+         *  EXP1-3 ------------ EXP1-3   LCD_CS
303
+         *  SPI1-1 ------------ EXP1-1   MISO
304
+         *  EXP1-1 ------------ EXP1-7   SD_DET
305 305
          */
306 306
 
307 307
         #define TFTGLCD_CS           EXP1_03_PIN
@@ -318,26 +318,26 @@
318 318
        *
319 319
        *                 Board                               Display
320 320
        *                 ------                               ------
321
-       *    (EN2)  PB5  | 1  2 | PA15(BTN_ENC)            5V | 1  2 | GND
322
-       *  (LCD_CS) PA9  | 3  4 | RST (RESET)              -- | 3  4 | --
323
-       *  (LCD_A0) PA10 |#6  5 | PB9 (EN1)            (DIN)  | 6  5#| (RESET)
324
-       *  (LCD_SCK)PB8  | 7  8 | PD6 (MOSI)         (LCD_A0) | 7  8 | (LCD_CS)
325
-       *            GND | 9 10 | 5V                (BTN_ENC) | 9 10 | --
321
+       *    (EN2)  PB5  | 1  2 | PA15(BTN_ENC)            5V |10  9 | GND
322
+       *  (LCD_CS) PA9  | 3  4 | RST (RESET)              -- | 8  7 | --
323
+       *  (LCD_A0) PA10   5  6 | PB9 (EN1)            (DIN)  | 6  5   (RESET)
324
+       *  (LCD_SCK)PB8  | 7  8 | PD6 (MOSI)         (LCD_A0) | 4  3 | (LCD_CS)
325
+       *            GND | 9 10 | 5V                (BTN_ENC) | 2  1 | --
326 326
        *                 ------                               ------
327 327
        *                  EXP1                                 EXP1
328 328
        *
329 329
        *                                                      ------
330
-       *                                                  -- | 1  2 | --
331
-       *                   ---                       (RESET) | 3  4 | --
332
-       *                  | 3 |                      (MOSI)  | 6  5#| (EN2)
333
-       *                  | 2 | (DIN)                     -- | 7  8 | (EN1)
334
-       *                  | 1 |                     (LCD_SCK)| 9 10 | --
330
+       *                                                  -- |10  9 | --
331
+       *                   ---                       (RESET) | 8  7 | --
332
+       *                  | 3 |                      (MOSI)  | 6  5   (EN2)
333
+       *                  | 2 | (DIN)                     -- | 4  3 | (EN1)
334
+       *                  | 1 |                     (LCD_SCK)| 2  1 | --
335 335
        *                   ---                                ------
336 336
        *                Neopixel                               EXP2
337 337
        *
338 338
        * Needs custom cable. Connect EN2-EN2, LCD_CS-LCD_CS and so on.
339 339
        *
340
-       * Check twice index position!!! (marked as # here)
340
+       * Check the index/notch position twice!!!
341 341
        * On BTT boards pins from IDC10 connector are numbered in unusual order.
342 342
        */
343 343
       #define BTN_ENC                EXP1_02_PIN
@@ -372,28 +372,28 @@
372 372
    *
373 373
    *                   Board                             Display
374 374
    *                   ------                            ------
375
-   * (SD_DET)    PB5  | 1  2 | PB6 (BEEPER)          5V | 1  2 | GND
376
-   * (MOD_RESET) PA9  | 3  4 | RESET            (RESET) | 3  4 | (SD_DET)
377
-   * (SD_CS)     PA10   5  6 | PB9 (FREE)       (MOSI)  | 5  6 | (LCD_CS)
378
-   * (LCD_CS)    PB8  | 7  8 | PB7 (FREE)       (SD_CS) | 7  8 | (MOD_RESET)
379
-   *               5V | 9 10 | GND              (SCK)   | 9 10 | (MISO)
375
+   * (SD_DET)    PB5  | 1  2 | PB6 (BEEPER)          5V |10  9 | GND
376
+   * (MOD_RESET) PA9  | 3  4 | RESET            (RESET) | 8  7 | (SD_DET)
377
+   * (SD_CS)     PA10   5  6 | PB9 (FREE)       (MOSI)  | 6  5 | (LCD_CS)
378
+   * (LCD_CS)    PB8  | 7  8 | PB7 (FREE)       (SD_CS) | 4  3 | (MOD_RESET)
379
+   *               5V | 9 10 | GND              (SCK)   | 2  1 | (MISO)
380 380
    *                   ------                            ------
381 381
    *                    EXP1                              EXP1
382 382
    *
383 383
    * Needs custom cable:
384 384
    *
385 385
    *    Board   Adapter   Display
386
-   *           _________
387
-   *   EXP1-1 ----------- EXP1-10
388
-   *   EXP1-2 ----------- EXP1-9
389
-   *   SPI1-4 ----------- EXP1-6
390
-   *   EXP1-4 ----------- EXP1-5
391
-   *   SPI1-3 ----------- EXP1-2
392
-   *   EXP1-6 ----------- EXP1-4
393
-   *   EXP1-7 ----------- EXP1-8
394
-   *   EXP1-8 ----------- EXP1-3
395
-   *   SPI1-1 ----------- EXP1-1
396
-   *  EXP1-10 ----------- EXP1-7
386
+   *   ----------------------------------
387
+   *   EXP1-10 ----------- EXP1-10  5V
388
+   *   EXP1-9 ------------ EXP1-9   GND
389
+   *   SPI1-4 ------------ EXP1-6   MOSI
390
+   *   EXP1-7 ------------ EXP1-5   LCD_CS
391
+   *   SPI1-3 ------------ EXP1-2   SCK
392
+   *   EXP1-5 ------------ EXP1-4   SD_CS
393
+   *   EXP1-4 ------------ EXP1-8   RESET
394
+   *   EXP1-3 ------------ EXP1-3   MOD_RST
395
+   *   SPI1-1 ------------ EXP1-1   MISO
396
+   *   EXP1-1 ------------ EXP1-7   SD_DET
397 397
    */
398 398
 
399 399
   #define CLCD_SPI_BUS                         1  // SPI1 connector

+ 22
- 22
Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h Visa fil

@@ -334,23 +334,23 @@
334 334
  *                ------                                   ------
335 335
  *                 EXP1                                     EXP2
336 336
  */
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 337
 #define EXP1_01_PIN                         PC5
338
+#define EXP1_02_PIN                         PB0
339
+#define EXP1_03_PIN                         PB1
340
+#define EXP1_04_PIN                         PE8
341
+#define EXP1_05_PIN                         PE9
342
+#define EXP1_06_PIN                         PE10
343
+#define EXP1_07_PIN                         PE11
344
+#define EXP1_08_PIN                         PE12
345 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 346
 #define EXP2_01_PIN                         PA6
347
+#define EXP2_02_PIN                         PA5
348
+#define EXP2_03_PIN                         PE7
349
+#define EXP2_04_PIN                         PA4
350
+#define EXP2_05_PIN                         PB2
351
+#define EXP2_06_PIN                         PA7
352
+#define EXP2_07_PIN                         PC4
353
+#define EXP2_08_PIN                         -1
354 354
 
355 355
 //
356 356
 // Onboard SD card
@@ -371,14 +371,14 @@
371 371
 #endif
372 372
 
373 373
 #if ENABLED(BTT_MOTOR_EXPANSION)
374
-  /**       -----                        -----
375
-   *    -- | . . | GND               -- | . . | GND
376
-   *    -- | . . | M1EN            M2EN | . . | M3EN
377
-   * M1STP | . .   M1DIR           M1RX | . .   M1DIAG
378
-   * M2DIR | . . | M2STP           M2RX | . . | M2DIAG
379
-   * M3DIR | . . | M3STP           M3RX | . . | M3DIAG
380
-   *        -----                        -----
381
-   *        EXP2                         EXP1
374
+  /**        ------                  ------
375
+   * M3DIAG | 1  2 | M3RX     M3STP | 1  2 | M3DIR
376
+   * M2DIAG | 3  4 | M2RX     M2STP | 3  4 | M2DIR
377
+   * M1DIAG   5  6 | M1RX     M1DIR   5  6 | M1STP
378
+   * M3EN   | 7  8 | M2EN     M1EN  | 7  8 |    --
379
+   * GND    | 9 10 |   --     GND   | 9 10 |    --
380
+   *         ------                  ------
381
+   *          EXP1                    EXP2
382 382
    *
383 383
    * NB In EXP_MOT_USE_EXP2_ONLY mode EXP1 is not used and M2EN and M3EN need to be jumpered to M1EN
384 384
    */

Laddar…
Avbryt
Spara