Browse Source

🎨 EXP1/2 headers and pins cleanup (#22628)

Scott Lahteine 4 years ago
parent
commit
4f35858c9e
No account linked to committer's email address
40 changed files with 591 additions and 494 deletions
  1. 1
    1
      Marlin/src/HAL/STM32F1/onboard_sd.cpp
  2. 1
    1
      Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
  3. 1
    2
      Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
  4. 4
    4
      Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
  5. 30
    42
      Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
  6. 2
    3
      Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
  7. 1
    2
      Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
  8. 1
    2
      Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
  9. 92
    75
      Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
  10. 1
    2
      Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
  11. 1
    2
      Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
  12. 2
    2
      Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
  13. 1
    2
      Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
  14. 70
    53
      Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
  15. 3
    3
      Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
  16. 2
    2
      Marlin/src/pins/ramps/pins_RAMPS.h
  17. 1
    1
      Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
  18. 0
    2
      Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
  19. 3
    3
      Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
  20. 4
    4
      Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
  21. 1
    1
      Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
  22. 1
    1
      Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
  23. 0
    1
      Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
  24. 57
    26
      Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
  25. 2
    2
      Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
  26. 1
    1
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
  27. 10
    8
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
  28. 3
    3
      Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
  29. 3
    3
      Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
  30. 3
    3
      Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
  31. 3
    3
      Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
  32. 2
    2
      Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
  33. 1
    1
      Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
  34. 1
    1
      Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
  35. 67
    42
      Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
  36. 3
    3
      Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
  37. 15
    9
      Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
  38. 88
    80
      Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
  39. 104
    85
      Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
  40. 5
    11
      Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h

+ 1
- 1
Marlin/src/HAL/STM32F1/onboard_sd.cpp View File

158
   ONBOARD_SD_SPI.begin();
158
   ONBOARD_SD_SPI.begin();
159
   ONBOARD_SD_SPI.setBitOrder(MSBFIRST);
159
   ONBOARD_SD_SPI.setBitOrder(MSBFIRST);
160
   ONBOARD_SD_SPI.setDataMode(SPI_MODE0);
160
   ONBOARD_SD_SPI.setDataMode(SPI_MODE0);
161
-  OUT_WRITE(ONBOARD_SD_CS_PIN, HIGH); // Set CS# high
161
+  CS_HIGH();
162
 }
162
 }
163
 
163
 
164
 // Disable SPI function
164
 // Disable SPI function

+ 1
- 1
Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h View File

85
 #define FAN1_PIN                           P0_26
85
 #define FAN1_PIN                           P0_26
86
 
86
 
87
 #define LCD_SDSS                           P0_16  // LCD SD chip select
87
 #define LCD_SDSS                           P0_16  // LCD SD chip select
88
-#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
89
 
88
 
90
 #if ENABLED(AZSMZ_12864)
89
 #if ENABLED(AZSMZ_12864)
91
   #define BEEPER_PIN                       P1_30
90
   #define BEEPER_PIN                       P1_30
109
   #define SD_SCK_PIN                       P0_07
108
   #define SD_SCK_PIN                       P0_07
110
   #define SD_MISO_PIN                      P0_08
109
   #define SD_MISO_PIN                      P0_08
111
   #define SD_MOSI_PIN                      P0_09
110
   #define SD_MOSI_PIN                      P0_09
111
+  #define ONBOARD_SD_CS_PIN                P0_06  // Chip select for "System" SD card
112
   #define SD_SS_PIN            ONBOARD_SD_CS_PIN
112
   #define SD_SS_PIN            ONBOARD_SD_CS_PIN
113
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
113
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
114
   #error "No custom SD drive cable defined for this board."
114
   #error "No custom SD drive cable defined for this board."

+ 1
- 2
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h View File

54
 
54
 
55
 
55
 
56
 /**
56
 /**
57
- *          ______                    ______
57
+ *          ------                    ------
58
  *      NC | 1  2 | GND           5V | 1  2 | GND
58
  *      NC | 1  2 | GND           5V | 1  2 | GND
59
  *   RESET | 3  4 | 1.31          NC | 3  4 | NC
59
  *   RESET | 3  4 | 1.31          NC | 3  4 | NC
60
  *    0.18 | 5  6   3.25          NC | 5  6   0.15
60
  *    0.18 | 5  6   3.25          NC | 5  6   0.15
82
 #define EXP2_09_PIN                        P0_15
82
 #define EXP2_09_PIN                        P0_15
83
 #define EXP2_10_PIN                        P0_17
83
 #define EXP2_10_PIN                        P0_17
84
 
84
 
85
-
86
 /**
85
 /**
87
  * LCD / Controller
86
  * LCD / Controller
88
  *
87
  *

+ 4
- 4
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h View File

184
 #endif
184
 #endif
185
 
185
 
186
 /**
186
 /**
187
- *               ______                                             ______
187
+ *               ------                                             ------
188
  *           NC | 1  2 | GND                                    5V | 1  2 | GND
188
  *           NC | 1  2 | GND                                    5V | 1  2 | GND
189
  *        RESET | 3  4 | 1.31 (SD_DETECT)            (LCD_D7) 1.23 | 3  4 | 1.22 (LCD_D6)
189
  *        RESET | 3  4 | 1.31 (SD_DETECT)            (LCD_D7) 1.23 | 3  4 | 1.22 (LCD_D6)
190
  *  (MOSI) 0.18 | 5  6   3.25 (BTN_EN2)              (LCD_D5) 1.21 | 5  6   1.20 (LCD_D4)
190
  *  (MOSI) 0.18 | 5  6   3.25 (BTN_EN2)              (LCD_D5) 1.21 | 5  6   1.20 (LCD_D4)
230
     * The ANET_FULL_GRAPHICS_LCD connector plug:
230
     * The ANET_FULL_GRAPHICS_LCD connector plug:
231
     *
231
     *
232
     *                  BEFORE                          AFTER
232
     *                  BEFORE                          AFTER
233
-    *                  ______                          ______
233
+    *                  ------                          ------
234
     *           GND 1 | 1  2 |  2 5V             5V 1 | 1  2 |  2 GND
234
     *           GND 1 | 1  2 |  2 5V             5V 1 | 1  2 |  2 GND
235
     *            CS 3 | 3  4 |  4 BTN_EN2        CS 3 | 3  4 |  4 BTN_EN2
235
     *            CS 3 | 3  4 |  4 BTN_EN2        CS 3 | 3  4 |  4 BTN_EN2
236
     *           SID 5 | 5  6    6 BTN_EN1       SID 5 | 5  6    6 BTN_EN1
236
     *           SID 5 | 5  6    6 BTN_EN1       SID 5 | 5  6    6 BTN_EN1
386
 
386
 
387
         /**
387
         /**
388
          * Creality Ender-2 display pinout
388
          * Creality Ender-2 display pinout
389
-         *                   _____
389
+         *                   -----
390
          *               5V | 1 2 | GND
390
          *               5V | 1 2 | GND
391
          *     (MOSI) P1_23 | 3 4 | P1_22 (LCD_CS)
391
          *     (MOSI) P1_23 | 3 4 | P1_22 (LCD_CS)
392
          *   (LCD_A0) P1_21 | 5 6   P1_20 (BTN_EN2)
392
          *   (LCD_A0) P1_21 | 5 6   P1_20 (BTN_EN2)
393
-         *      RESET P1_19 | 7 8 | P1_18 (BTN_EN1)
393
+         *    (RESET) P1_19 | 7 8 | P1_18 (BTN_EN1)
394
          *  (BTN_ENC) P0_28 | 9 10| P1_30 (SCK)
394
          *  (BTN_ENC) P0_28 | 9 10| P1_30 (SCK)
395
          *                   -----
395
          *                   -----
396
          *                    EXP1
396
          *                    EXP1

+ 30
- 42
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h View File

239
   #define TMC_BAUD_RATE                    19200
239
   #define TMC_BAUD_RATE                    19200
240
 #endif
240
 #endif
241
 
241
 
242
-/*               _____                        _____
243
- *           NC | 1 2 | GND               5V | 1 2 | GND
244
- *        RESET | 3 4 | 1.31            1.23 | 3 4 | 1.22
245
- *         0.18 | 5 6   3.25            1.21 | 5 6   1.20
246
- *         0.16 | 7 8 | 3.26            1.19 | 7 8 | 1.18
247
- *         0.15 | 9 10| 0.17            0.28 | 9 10| 1.30
248
- *               -----                        -----
249
- *               EXP2                         EXP1
242
+/**       ------                        ------
243
+ *    NC | 1  2 | GND               5V | 1  2 | GND
244
+ * RESET | 3  4 | 1.31            1.23 | 3  4 | 1.22
245
+ *  0.18 | 5  6   3.25            1.21 | 5  6   1.20
246
+ *  0.16 | 7  8 | 3.26            1.19 | 7  8 | 1.18
247
+ *  0.15 | 9  10| 0.17            0.28 | 9  10| 1.30
248
+ *        ------                        ------
249
+ *         EXP2                          EXP1
250
  */
250
  */
251
 
251
 
252
 #define EXP1_03_PIN                        P1_23
252
 #define EXP1_03_PIN                        P1_23
267
 #define EXP2_09_PIN                        P0_15
267
 #define EXP2_09_PIN                        P0_15
268
 #define EXP2_10_PIN                        P0_17
268
 #define EXP2_10_PIN                        P0_17
269
 
269
 
270
-/**
271
- *               _____                                             _____
272
- *           NC | · · | GND                                    5V | · · | GND
273
- *        RESET | · · | 1.31 (SD_DETECT)            (LCD_D7) 1.23 | · · | 1.22 (LCD_D6)
274
- *  (MOSI) 0.18 | · ·   3.25 (BTN_EN2)              (LCD_D5) 1.21 | · ·   1.20 (LCD_D4)
275
- * (SD_SS) 0.16 | · · | 3.26 (BTN_EN1)              (LCD_RS) 1.19 | · · | 1.18 (LCD_EN)
276
- *   (SCK) 0.15 | · · | 0.17 (MISO)                (BTN_ENC) 0.28 | · · | 1.30 (BEEPER)
277
- *               -----                                             -----
278
- *               EXP2                                              EXP1
279
- */
280
-
281
-#if ENABLED(DWIN_CREALITY_LCD)
270
+#if EITHER(DWIN_CREALITY_LCD, IS_DWIN_MARLINUI)
282
 
271
 
283
   // RET6 DWIN ENCODER LCD
272
   // RET6 DWIN ENCODER LCD
284
-  #define BTN_ENC                          P1_20
285
-  #define BTN_EN1                          P1_23
286
-  #define BTN_EN2                          P1_22
273
+  #define BTN_ENC                    EXP1_06_PIN
274
+  #define BTN_EN1                    EXP1_03_PIN
275
+  #define BTN_EN2                    EXP1_04_PIN
287
 
276
 
288
   #ifndef BEEPER_PIN
277
   #ifndef BEEPER_PIN
289
-    #define BEEPER_PIN                     P1_21
290
-    #undef SPEAKER
278
+    #define BEEPER_PIN               EXP1_05_PIN
291
   #endif
279
   #endif
292
 
280
 
293
 #elif HAS_WIRED_LCD && !BTT_MOTOR_EXPANSION
281
 #elif HAS_WIRED_LCD && !BTT_MOTOR_EXPANSION
304
      * The ANET_FULL_GRAPHICS_LCD_ALT_WIRING connector plug:
292
      * The ANET_FULL_GRAPHICS_LCD_ALT_WIRING connector plug:
305
      *
293
      *
306
      *                BEFORE                     AFTER
294
      *                BEFORE                     AFTER
307
-     *                _____                      _____
308
-     *           GND | 1 2 | 5V              5V | 1 2 | GND
309
-     *            CS | 3 4 | BTN_EN2         CS | 3 4 | BTN_EN2
310
-     *           SID | 5 6   BTN_EN1        SID | 5 6   BTN_EN1
311
-     *          open | 7 8 | BTN_ENC       open | 7 8 | BTN_ENC
312
-     *           CLK | 9 10| Beeper         CLK | 9 10| Beeper
313
-     *                -----                      -----
295
+     *                ------                     ------
296
+     *           GND | 1  2 | 5V             5V | 1  2 | GND
297
+     *            CS | 3  4 | BTN_EN2        CS | 3  4 | BTN_EN2
298
+     *           SID | 5  6   BTN_EN1       SID | 5  6   BTN_EN1
299
+     *          open | 7  8 | BTN_ENC      open | 7  8 | BTN_ENC
300
+     *           CLK | 9  10| BEEPER        CLK | 9  10| BEEPER
301
+     *                ------                     ------
314
      *                 LCD                        LCD
302
      *                 LCD                        LCD
315
      */
303
      */
316
 
304
 
337
     *
325
     *
338
     * The ANET_FULL_GRAPHICS_LCD connector plug:
326
     * The ANET_FULL_GRAPHICS_LCD connector plug:
339
     *
327
     *
340
-    *                BEFORE                     AFTER
341
-    *                ______                     ______
342
-    *           GND | 1  2 | 5V             5V | 1  2 | GND
343
-    *            CS | 3  4 | BTN_EN2        CS | 3  4 | BTN_EN2
344
-    *           SID | 5  6   BTN_EN1       SID | 5  6   BTN_EN1
345
-    *          open | 7  8 | BTN_ENC       CLK | 7  8 | BTN_ENC
346
-    *           CLK | 9 10 | Beeper       open | 9 10 | Beeper
347
-    *                ------                     ------
348
-    *                 LCD                        LCD
328
+    *         BEFORE                     AFTER
329
+    *         ------                     ------
330
+    *    GND | 1  2 | 5V             5V | 1  2 | GND
331
+    *     CS | 3  4 | BTN_EN2        CS | 3  4 | BTN_EN2
332
+    *    SID | 5  6   BTN_EN1       SID | 5  6   BTN_EN1
333
+    *   open | 7  8 | BTN_ENC       CLK | 7  8 | BTN_ENC
334
+    *    CLK | 9 10 | BEEPER       open | 9 10 | BEEPER
335
+    *         ------                     ------
336
+    *          LCD                        LCD
349
     */
337
     */
350
 
338
 
351
     #define LCD_PINS_RS              EXP1_03_PIN
339
     #define LCD_PINS_RS              EXP1_03_PIN
372
   #elif ENABLED(ENDER2_STOCKDISPLAY)
360
   #elif ENABLED(ENDER2_STOCKDISPLAY)
373
 
361
 
374
     /** Creality Ender-2 display pinout
362
     /** Creality Ender-2 display pinout
375
-     *                   ______
363
+     *                   ------
376
      *               5V | 1  2 | GND
364
      *               5V | 1  2 | GND
377
      *      (MOSI) 1.23 | 3  4 | 1.22 (LCD_RS)
365
      *      (MOSI) 1.23 | 3  4 | 1.22 (LCD_RS)
378
      *    (LCD_A0) 1.21 | 5  6   1.20 (BTN_EN2)
366
      *    (LCD_A0) 1.21 | 5  6   1.20 (BTN_EN2)

+ 2
- 3
Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h View File

126
   #endif
126
   #endif
127
 #endif
127
 #endif
128
 
128
 
129
-#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
130
-
131
 #if SD_CONNECTION_IS(LCD) && ENABLED(SKR_USE_LCD_SD_CARD_PINS_FOR_CS)
129
 #if SD_CONNECTION_IS(LCD) && ENABLED(SKR_USE_LCD_SD_CARD_PINS_FOR_CS)
132
   #error "SDCARD_CONNECTION must not be 'LCD' with SKR_USE_LCD_SD_CARD_PINS_FOR_CS."
130
   #error "SDCARD_CONNECTION must not be 'LCD' with SKR_USE_LCD_SD_CARD_PINS_FOR_CS."
133
 #endif
131
 #endif
145
   #define SD_SCK_PIN                       P0_07
143
   #define SD_SCK_PIN                       P0_07
146
   #define SD_MISO_PIN                      P0_08
144
   #define SD_MISO_PIN                      P0_08
147
   #define SD_MOSI_PIN                      P0_09
145
   #define SD_MOSI_PIN                      P0_09
146
+  #define ONBOARD_SD_CS_PIN                P0_06  // Chip select for "System" SD card
148
   #define SD_SS_PIN            ONBOARD_SD_CS_PIN
147
   #define SD_SS_PIN            ONBOARD_SD_CS_PIN
149
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
148
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
150
   #error "No custom SD drive cable defined for this board."
149
   #error "No custom SD drive cable defined for this board."
151
 #endif
150
 #endif
152
 
151
 
153
 #if ENABLED(BTT_MOTOR_EXPANSION)
152
 #if ENABLED(BTT_MOTOR_EXPANSION)
154
-  /**       ______                       ______
153
+  /**       ------                       ------
155
    *    NC | 1  2 | GND              NC | 1  2 | GND
154
    *    NC | 1  2 | GND              NC | 1  2 | GND
156
    *    NC | 3  4 | M1EN           M2EN | 3  4 | M3EN
155
    *    NC | 3  4 | M1EN           M2EN | 3  4 | M3EN
157
    * M1STP | 5  6   M1DIR          M1RX | 5  6   M1DIAG
156
    * M1STP | 5  6   M1DIR          M1RX | 5  6   M1DIAG

+ 1
- 2
Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h View File

155
   #define SDCARD_CONNECTION                  LCD
155
   #define SDCARD_CONNECTION                  LCD
156
 #endif
156
 #endif
157
 
157
 
158
-#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
159
-
160
 #if SD_CONNECTION_IS(LCD)
158
 #if SD_CONNECTION_IS(LCD)
161
   #define SD_SCK_PIN                       P0_15
159
   #define SD_SCK_PIN                       P0_15
162
   #define SD_MISO_PIN                      P0_17
160
   #define SD_MISO_PIN                      P0_17
167
   #define SD_SCK_PIN                       P0_07
165
   #define SD_SCK_PIN                       P0_07
168
   #define SD_MISO_PIN                      P0_08
166
   #define SD_MISO_PIN                      P0_08
169
   #define SD_MOSI_PIN                      P0_09
167
   #define SD_MOSI_PIN                      P0_09
168
+  #define ONBOARD_SD_CS_PIN                P0_06  // Chip select for "System" SD card
170
   #define SD_SS_PIN            ONBOARD_SD_CS_PIN
169
   #define SD_SS_PIN            ONBOARD_SD_CS_PIN
171
 #endif
170
 #endif

+ 1
- 2
Marlin/src/pins/lpc1768/pins_MKS_SBASE.h View File

165
   #define SDCARD_CONNECTION              ONBOARD
165
   #define SDCARD_CONNECTION              ONBOARD
166
 #endif
166
 #endif
167
 
167
 
168
-#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
169
-
170
 #if SD_CONNECTION_IS(CUSTOM_CABLE)
168
 #if SD_CONNECTION_IS(CUSTOM_CABLE)
171
 
169
 
172
   /**
170
   /**
199
     #define SD_SS_PIN                      P0_28
197
     #define SD_SS_PIN                      P0_28
200
   #else
198
   #else
201
     #define SD_DETECT_PIN                  P0_27
199
     #define SD_DETECT_PIN                  P0_27
200
+    #define ONBOARD_SD_CS_PIN              P0_06  // Chip select for "System" SD card
202
     #define SD_SS_PIN          ONBOARD_SD_CS_PIN
201
     #define SD_SS_PIN          ONBOARD_SD_CS_PIN
203
   #endif
202
   #endif
204
 #endif
203
 #endif

+ 92
- 75
Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h View File

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

+ 1
- 2
Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h View File

455
   #define SDCARD_CONNECTION              ONBOARD
455
   #define SDCARD_CONNECTION              ONBOARD
456
 #endif
456
 #endif
457
 
457
 
458
-#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
459
-
460
 #if SD_CONNECTION_IS(LCD)
458
 #if SD_CONNECTION_IS(LCD)
461
   #define SD_SCK_PIN                       P0_15  // (52)  system defined J3-9 & AUX-3
459
   #define SD_SCK_PIN                       P0_15  // (52)  system defined J3-9 & AUX-3
462
   #define SD_MISO_PIN                      P0_17  // (50)  system defined J3-10 & AUX-3
460
   #define SD_MISO_PIN                      P0_17  // (50)  system defined J3-10 & AUX-3
467
   #define SD_SCK_PIN                       P0_07
465
   #define SD_SCK_PIN                       P0_07
468
   #define SD_MISO_PIN                      P0_08
466
   #define SD_MISO_PIN                      P0_08
469
   #define SD_MOSI_PIN                      P0_09
467
   #define SD_MOSI_PIN                      P0_09
468
+  #define ONBOARD_SD_CS_PIN                P0_06  // Chip select for "System" SD card
470
   #define SD_SS_PIN            ONBOARD_SD_CS_PIN
469
   #define SD_SS_PIN            ONBOARD_SD_CS_PIN
471
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
470
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
472
   #error "No custom SD drive cable defined for this board."
471
   #error "No custom SD drive cable defined for this board."

+ 1
- 2
Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h View File

198
   #define SDCARD_CONNECTION              ONBOARD
198
   #define SDCARD_CONNECTION              ONBOARD
199
 #endif
199
 #endif
200
 
200
 
201
-#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
202
-
203
 #if SD_CONNECTION_IS(LCD)
201
 #if SD_CONNECTION_IS(LCD)
204
   #define SD_SCK_PIN                       P0_15
202
   #define SD_SCK_PIN                       P0_15
205
   #define SD_MISO_PIN                      P0_17
203
   #define SD_MISO_PIN                      P0_17
210
   #define SD_SCK_PIN                       P0_07
208
   #define SD_SCK_PIN                       P0_07
211
   #define SD_MISO_PIN                      P0_08
209
   #define SD_MISO_PIN                      P0_08
212
   #define SD_MOSI_PIN                      P0_09
210
   #define SD_MOSI_PIN                      P0_09
211
+  #define ONBOARD_SD_CS_PIN                P0_06  // Chip select for "System" SD card
213
   #define SD_SS_PIN            ONBOARD_SD_CS_PIN
212
   #define SD_SS_PIN            ONBOARD_SD_CS_PIN
214
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
213
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
215
   #error "No custom SD drive cable defined for this board."
214
   #error "No custom SD drive cable defined for this board."

+ 2
- 2
Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h View File

179
 #endif
179
 #endif
180
 
180
 
181
 /**
181
 /**
182
- *                  ______
182
+ *                  ------
183
  *              5V | 1  2 | GND
183
  *              5V | 1  2 | GND
184
  *  (LCD_EN) P0_18 | 3  4 | P0_17 (LCD_RS)
184
  *  (LCD_EN) P0_18 | 3  4 | P0_17 (LCD_RS)
185
  *  (LCD_D4) P0_15 | 5  6   P0_20 (BTN_EN2)
185
  *  (LCD_D4) P0_15 | 5  6   P0_20 (BTN_EN2)
203
 
203
 
204
  /**
204
  /**
205
   *          Ender 3 V2 display                       SKR E3 Turbo (EXP1)                Ender 3 V2 display --> SKR E3 Turbo
205
   *          Ender 3 V2 display                       SKR E3 Turbo (EXP1)                Ender 3 V2 display --> SKR E3 Turbo
206
-  *                ______                                     ______                                  RX  8 -->  5  P0_15
206
+  *                ------                                     ------                                  RX  8 -->  5  P0_15
207
   *            5V | 1  2 | GND                            5V | 1  2 | GND                             TX  7 -->  9  P0_16
207
   *            5V | 1  2 | GND                            5V | 1  2 | GND                             TX  7 -->  9  P0_16
208
   *   (BTN_E1)  A | 3  4 | B   (BTN_E2)       (LCD_EN) P0_18 | 3  4 | P0_17 (LCD_RS)              BEEPER  5 --> 10  P2_08
208
   *   (BTN_E1)  A | 3  4 | B   (BTN_E2)       (LCD_EN) P0_18 | 3  4 | P0_17 (LCD_RS)              BEEPER  5 --> 10  P2_08
209
   *        BEEPER | 5  6   ENT (BTN_ENC)      (LCD_D4) P0_15 | 5  6   P0_20 (BTN_EN2)
209
   *        BEEPER | 5  6   ENT (BTN_ENC)      (LCD_D4) P0_15 | 5  6   P0_20 (BTN_EN2)

+ 1
- 2
Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h View File

229
   #define SDCARD_CONNECTION              ONBOARD
229
   #define SDCARD_CONNECTION              ONBOARD
230
 #endif
230
 #endif
231
 
231
 
232
-#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
233
-
234
 #if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
232
 #if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
235
   #define SD_SCK_PIN                       P0_07  // (52)  system defined J3-9 & AUX-3
233
   #define SD_SCK_PIN                       P0_07  // (52)  system defined J3-9 & AUX-3
236
   #define SD_MISO_PIN                      P0_08  // (50)  system defined J3-10 & AUX-3
234
   #define SD_MISO_PIN                      P0_08  // (50)  system defined J3-10 & AUX-3
239
     #define SD_SS_PIN                      P1_23  // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
237
     #define SD_SS_PIN                      P1_23  // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
240
   #else
238
   #else
241
     #undef SD_DETECT_PIN
239
     #undef SD_DETECT_PIN
240
+    #define ONBOARD_SD_CS_PIN              P0_06  // Chip select for "System" SD card
242
     #define SD_SS_PIN          ONBOARD_SD_CS_PIN
241
     #define SD_SS_PIN          ONBOARD_SD_CS_PIN
243
   #endif
242
   #endif
244
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
243
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)

+ 70
- 53
Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h View File

231
 // Power Supply Control
231
 // Power Supply Control
232
 //
232
 //
233
 #if ENABLED(MKS_PWC)
233
 #if ENABLED(MKS_PWC)
234
-  #define PS_ON_PIN                        P2_00  // SERVO
234
+  #define PS_ON_PIN                        P2_00  // SERVO1
235
   #define KILL_PIN                         P1_24  // Z+
235
   #define KILL_PIN                         P1_24  // Z+
236
   #define KILL_PIN_STATE                    HIGH
236
   #define KILL_PIN_STATE                    HIGH
237
 #endif
237
 #endif
256
 #endif
256
 #endif
257
 
257
 
258
 /**
258
 /**
259
- *                _____                                            _____
259
+ *                -----                                            -----
260
  * (BEEPER) 1.31 | · · | 1.30 (BTN_ENC)               (MISO) 0.8  | · · | 0.7  (SD_SCK)
260
  * (BEEPER) 1.31 | · · | 1.30 (BTN_ENC)               (MISO) 0.8  | · · | 0.7  (SD_SCK)
261
  * (LCD_EN) 0.18 | · · | 0.16 (LCD_RS)             (BTN_EN1) 3.25 | · · | 0.28 (SD_CS2)
261
  * (LCD_EN) 0.18 | · · | 0.16 (LCD_RS)             (BTN_EN1) 3.25 | · · | 0.28 (SD_CS2)
262
  * (LCD_D4) 0.15 | · · | 0.17 (LCD_D5)             (BTN_EN2) 3.26 | · · | 0.9  (SD_MOSI)
262
  * (LCD_D4) 0.15 | · · | 0.17 (LCD_D5)             (BTN_EN2) 3.26 | · · | 0.9  (SD_MOSI)
265
  *                -----                                            -----
265
  *                -----                                            -----
266
  *                EXP1                                             EXP2
266
  *                EXP1                                             EXP2
267
  */
267
  */
268
+#define EXP1_03_PIN                        P1_22
269
+#define EXP1_04_PIN                        P1_00
270
+#define EXP1_05_PIN                        P0_17
271
+#define EXP1_06_PIN                        P0_15
272
+#define EXP1_07_PIN                        P0_16
273
+#define EXP1_08_PIN                        P0_18
274
+#define EXP1_09_PIN                        P1_30
275
+#define EXP1_10_PIN                        P1_31
276
+
277
+#define EXP2_03_PIN                        -1     // RESET
278
+#define EXP2_04_PIN                        P0_27
279
+#define EXP2_05_PIN                        P0_09
280
+#define EXP2_06_PIN                        P3_26
281
+#define EXP2_07_PIN                        P0_28
282
+#define EXP2_08_PIN                        P3_25
283
+#define EXP2_09_PIN                        P0_07
284
+#define EXP2_10_PIN                        P0_08
285
+
268
 #if IS_TFTGLCD_PANEL
286
 #if IS_TFTGLCD_PANEL
269
 
287
 
270
   #if ENABLED(TFTGLCD_PANEL_SPI)
288
   #if ENABLED(TFTGLCD_PANEL_SPI)
271
-    #define TFTGLCD_CS                     P3_25
289
+    #define TFTGLCD_CS               EXP2_08_PIN
272
   #endif
290
   #endif
273
 
291
 
274
-  #define SD_DETECT_PIN                    P0_27
292
+  #define SD_DETECT_PIN              EXP2_04_PIN
275
 
293
 
276
 #elif HAS_WIRED_LCD
294
 #elif HAS_WIRED_LCD
277
 
295
 
278
-  #define BEEPER_PIN                       P1_31
279
-  #define BTN_ENC                          P1_30
296
+  #define BEEPER_PIN                 EXP1_10_PIN
297
+  #define BTN_ENC                    EXP1_09_PIN
280
 
298
 
281
   #if ENABLED(CR10_STOCKDISPLAY)
299
   #if ENABLED(CR10_STOCKDISPLAY)
282
 
300
 
283
-    #define LCD_PINS_RS                    P1_00
301
+    #define LCD_PINS_RS              EXP1_04_PIN
284
 
302
 
285
-    #define BTN_EN1                        P0_18
286
-    #define BTN_EN2                        P0_15
303
+    #define BTN_EN1                  EXP1_08_PIN
304
+    #define BTN_EN2                  EXP1_06_PIN
287
 
305
 
288
-    #define LCD_PINS_ENABLE                P1_22
289
-    #define LCD_PINS_D4                    P0_17
306
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
307
+    #define LCD_PINS_D4              EXP1_05_PIN
290
 
308
 
291
   #else
309
   #else
292
 
310
 
293
-    #define BTN_EN1                        P3_25
294
-    #define BTN_EN2                        P3_26
311
+    #define BTN_EN1                  EXP2_08_PIN
312
+    #define BTN_EN2                  EXP2_06_PIN
295
 
313
 
296
-    #define LCD_SDSS                       P0_28
314
+    #define LCD_SDSS                 EXP2_07_PIN
297
 
315
 
298
     #if ENABLED(MKS_12864OLED_SSD1306)
316
     #if ENABLED(MKS_12864OLED_SSD1306)
299
 
317
 
300
-      #define LCD_PINS_DC                  P0_17
301
-      #define DOGLCD_CS                    P0_16
318
+      #define LCD_PINS_DC            EXP1_05_PIN
319
+      #define DOGLCD_CS              EXP1_07_PIN
302
       #define DOGLCD_A0              LCD_PINS_DC
320
       #define DOGLCD_A0              LCD_PINS_DC
303
-      #define DOGLCD_SCK                   P0_15
304
-      #define DOGLCD_MOSI                  P0_18
321
+      #define DOGLCD_SCK             EXP1_06_PIN
322
+      #define DOGLCD_MOSI            EXP1_08_PIN
305
 
323
 
306
-      #define LCD_PINS_RS                  P1_00
307
-      #define LCD_PINS_D7                  P1_22
324
+      #define LCD_PINS_RS            EXP1_04_PIN
325
+      #define LCD_PINS_D7            EXP1_03_PIN
308
       #define KILL_PIN                     -1     // NC
326
       #define KILL_PIN                     -1     // NC
309
 
327
 
310
     #elif HAS_SPI_TFT                             // Config for Classic UI (emulated DOGM) and Color UI
328
     #elif HAS_SPI_TFT                             // Config for Classic UI (emulated DOGM) and Color UI
311
-      #define TFT_CS_PIN                   P1_00
312
-      #define TFT_A0_PIN                   P1_22
313
-      #define TFT_DC_PIN                   P1_22
314
-      #define TFT_MISO_PIN                 P0_08
315
-      #define TFT_BACKLIGHT_PIN            P0_18
316
-      #define TFT_RESET_PIN                P0_16
329
+      #define TFT_CS_PIN             EXP1_04_PIN
330
+      #define TFT_A0_PIN             EXP1_03_PIN
331
+      #define TFT_DC_PIN             EXP1_03_PIN
332
+      #define TFT_MISO_PIN           EXP2_10_PIN
333
+      #define TFT_BACKLIGHT_PIN      EXP1_08_PIN
334
+      #define TFT_RESET_PIN          EXP1_07_PIN
317
 
335
 
318
       #define LCD_USE_DMA_SPI
336
       #define LCD_USE_DMA_SPI
319
 
337
 
320
-      #define TOUCH_INT_PIN                P0_17
321
-      #define TOUCH_CS_PIN                 P0_15
338
+      #define TOUCH_INT_PIN          EXP1_05_PIN
339
+      #define TOUCH_CS_PIN           EXP1_06_PIN
322
       #define TOUCH_BUTTONS_HW_SPI
340
       #define TOUCH_BUTTONS_HW_SPI
323
       #define TOUCH_BUTTONS_HW_SPI_DEVICE      2
341
       #define TOUCH_BUTTONS_HW_SPI_DEVICE      2
324
 
342
 
335
 
353
 
336
     #else                                         // !MKS_12864OLED_SSD1306
354
     #else                                         // !MKS_12864OLED_SSD1306
337
 
355
 
338
-      #define LCD_PINS_RS                  P0_16
356
+      #define LCD_PINS_RS            EXP1_07_PIN
339
 
357
 
340
-      #define LCD_PINS_ENABLE              P0_18
341
-      #define LCD_PINS_D4                  P0_15
358
+      #define LCD_PINS_ENABLE        EXP1_08_PIN
359
+      #define LCD_PINS_D4            EXP1_06_PIN
342
 
360
 
343
       #if ENABLED(FYSETC_MINI_12864)
361
       #if ENABLED(FYSETC_MINI_12864)
344
 
362
 
345
-        #define DOGLCD_CS                  P0_18
346
-        #define DOGLCD_A0                  P0_16
347
-        #define DOGLCD_SCK                 P0_07
348
-        #define DOGLCD_MOSI                P0_09
363
+        #define DOGLCD_CS            EXP1_08_PIN
364
+        #define DOGLCD_A0            EXP1_07_PIN
365
+        #define DOGLCD_SCK           EXP2_09_PIN
366
+        #define DOGLCD_MOSI          EXP2_05_PIN
349
 
367
 
350
         #define LCD_BACKLIGHT_PIN          -1
368
         #define LCD_BACKLIGHT_PIN          -1
351
 
369
 
352
         #define FORCE_SOFT_SPI                    // Use this if default of hardware SPI causes display problems
370
         #define FORCE_SOFT_SPI                    // Use this if default of hardware SPI causes display problems
353
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
371
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
354
 
372
 
355
-        #define LCD_RESET_PIN              P0_15  // Must be high or open for LCD to operate normally.
373
+        #define LCD_RESET_PIN        EXP1_06_PIN  // Must be high or open for LCD to operate normally.
356
 
374
 
357
         #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
375
         #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
358
           #ifndef RGB_LED_R_PIN
376
           #ifndef RGB_LED_R_PIN
359
-            #define RGB_LED_R_PIN          P0_17
377
+            #define RGB_LED_R_PIN    EXP1_05_PIN
360
           #endif
378
           #endif
361
           #ifndef RGB_LED_G_PIN
379
           #ifndef RGB_LED_G_PIN
362
-            #define RGB_LED_G_PIN          P1_00
380
+            #define RGB_LED_G_PIN    EXP1_04_PIN
363
           #endif
381
           #endif
364
           #ifndef RGB_LED_B_PIN
382
           #ifndef RGB_LED_B_PIN
365
-            #define RGB_LED_B_PIN          P1_22
383
+            #define RGB_LED_B_PIN    EXP1_03_PIN
366
           #endif
384
           #endif
367
         #elif ENABLED(FYSETC_MINI_12864_2_1)
385
         #elif ENABLED(FYSETC_MINI_12864_2_1)
368
-          #define NEOPIXEL_PIN             P0_17
386
+          #define NEOPIXEL_PIN       EXP1_05_PIN
369
         #endif
387
         #endif
370
 
388
 
371
       #else                                       // !FYSETC_MINI_12864
389
       #else                                       // !FYSETC_MINI_12864
372
 
390
 
373
         #if ENABLED(MKS_MINI_12864)
391
         #if ENABLED(MKS_MINI_12864)
374
-          #define DOGLCD_CS                P0_17
375
-          #define DOGLCD_A0                P1_00
392
+          #define DOGLCD_CS          EXP1_05_PIN
393
+          #define DOGLCD_A0          EXP1_04_PIN
376
         #endif
394
         #endif
377
 
395
 
378
         #if IS_ULTIPANEL
396
         #if IS_ULTIPANEL
379
-          #define LCD_PINS_D5              P0_17
380
-          #define LCD_PINS_D6              P1_00
381
-          #define LCD_PINS_D7              P1_22
397
+          #define LCD_PINS_D5        EXP1_05_PIN
398
+          #define LCD_PINS_D6        EXP1_04_PIN
399
+          #define LCD_PINS_D7        EXP1_03_PIN
382
 
400
 
383
           #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
401
           #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
384
             #define BTN_ENC_EN       LCD_PINS_D7  // Detect the presence of the encoder
402
             #define BTN_ENC_EN       LCD_PINS_D7  // Detect the presence of the encoder
398
   #define SDCARD_CONNECTION              ONBOARD
416
   #define SDCARD_CONNECTION              ONBOARD
399
 #endif
417
 #endif
400
 
418
 
401
-#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
402
-
403
 #if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
419
 #if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
404
-  #define SD_DETECT_PIN                    P0_27
405
-  #define SD_SCK_PIN                       P0_07
406
-  #define SD_MISO_PIN                      P0_08
407
-  #define SD_MOSI_PIN                      P0_09
420
+  #define SD_DETECT_PIN              EXP2_04_PIN
421
+  #define SD_SCK_PIN                 EXP2_09_PIN
422
+  #define SD_MISO_PIN                EXP2_10_PIN
423
+  #define SD_MOSI_PIN                EXP2_05_PIN
408
   #if SD_CONNECTION_IS(ONBOARD)
424
   #if SD_CONNECTION_IS(ONBOARD)
425
+    #define ONBOARD_SD_CS_PIN              P0_06  // Chip select for "System" SD card
409
     #define SD_SS_PIN          ONBOARD_SD_CS_PIN
426
     #define SD_SS_PIN          ONBOARD_SD_CS_PIN
410
   #else
427
   #else
411
-    #define SD_SS_PIN                      P0_28
428
+    #define SD_SS_PIN                EXP2_07_PIN
412
   #endif
429
   #endif
413
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
430
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
414
   #error "No custom SD drive cable defined for this board."
431
   #error "No custom SD drive cable defined for this board."
419
 //
436
 //
420
 //#define PIN_P0_02                        P0_02  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
437
 //#define PIN_P0_02                        P0_02  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
421
 //#define PIN_P0_03                        P0_03  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
438
 //#define PIN_P0_03                        P0_03  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
422
-//#define PS_ON_PIN                        P1_23  // SERVO P1.23
439
+//#define PS_ON_PIN                        P1_23  // SERVO0 P1.23

+ 3
- 3
Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h View File

156
 //
156
 //
157
 
157
 
158
 /**
158
 /**
159
- *         ______
159
+ *         ------
160
  *     5V | 1  2 | GND
160
  *     5V | 1  2 | GND
161
  *  P0_18 | 3  4 | P0_16
161
  *  P0_18 | 3  4 | P0_16
162
  *  P0_15 | 5  6   P3_25
162
  *  P0_15 | 5  6   P3_25
181
 #define EXP1_10_PIN                        P1_31
181
 #define EXP1_10_PIN                        P1_31
182
 
182
 
183
 #if ENABLED(CR10_STOCKDISPLAY)
183
 #if ENABLED(CR10_STOCKDISPLAY)
184
-  /**          ______
184
+  /**          ------
185
    *       5V | 1  2 | GND
185
    *       5V | 1  2 | GND
186
    *   LCD_EN | 3  4 | LCD_RS
186
    *   LCD_EN | 3  4 | LCD_RS
187
    *   LCD_D4 | 5  6   EN2
187
    *   LCD_D4 | 5  6   EN2
196
   #define KILL_PIN                   EXP1_07_PIN
196
   #define KILL_PIN                   EXP1_07_PIN
197
 
197
 
198
 #elif ENABLED(MKS_MINI_12864)
198
 #elif ENABLED(MKS_MINI_12864)
199
-  /**          ______
199
+  /**          ------
200
    *       5V | 1  2 | GND
200
    *       5V | 1  2 | GND
201
    * SPI-MOSI | 3  4 | SPI-CS
201
    * SPI-MOSI | 3  4 | SPI-CS
202
    *       A0 | 5  6   EN2
202
    *       A0 | 5  6   EN2

+ 2
- 2
Marlin/src/pins/ramps/pins_RAMPS.h View File

434
 /**
434
 /**
435
  * LCD adapter. Please note: These comes in two variants. The socket keys can be
435
  * LCD adapter. Please note: These comes in two variants. The socket keys can be
436
  * on either side, and may be backwards on some boards / displays.
436
  * on either side, and may be backwards on some boards / displays.
437
- *         _____                           _____
437
+ *         -----                           -----
438
  *    D37 |10 9 | D35          (MISO) D50 |10 9 | D52 (SCK)
438
  *    D37 |10 9 | D35          (MISO) D50 |10 9 | D52 (SCK)
439
  *    D17 | 8 7 | D16                 D31 | 8 7 | D53
439
  *    D17 | 8 7 | D16                 D31 | 8 7 | D53
440
  *    D23   6 5   D25                 D33   6 5   D51 (MOSI)
440
  *    D23   6 5   D25                 D33   6 5   D51 (MOSI)
778
    * FYSETC TFT-81050 display pinout
778
    * FYSETC TFT-81050 display pinout
779
    *
779
    *
780
    *               Board                                     Display
780
    *               Board                                     Display
781
-   *               _____                                     _____
781
+   *               -----                                     -----
782
    *  (SCK)   D52 | 1 2 | D50    (MISO)                MISO | 1 2 | SCK
782
    *  (SCK)   D52 | 1 2 | D50    (MISO)                MISO | 1 2 | SCK
783
    *  (SD_CS) D53 | 3 4 | D33 (BNT_EN2) (BNT_EN2) MOD_RESET | 3 4 | SD_CS
783
    *  (SD_CS) D53 | 3 4 | D33 (BNT_EN2) (BNT_EN2) MOD_RESET | 3 4 | SD_CS
784
    *  (MOSI)  D51 | 5 6   D31 (BNT_EN1) (BNT_EN1)    LCD_CS | 5 6   MOSI
784
    *  (MOSI)  D51 | 5 6   D31 (BNT_EN1) (BNT_EN1)    LCD_CS | 5 6   MOSI

+ 1
- 1
Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h View File

137
 
137
 
138
 /**
138
 /**
139
  *    EXP1 Connector                      EXP1 as CR10 STOCKDISPLAY
139
  *    EXP1 Connector                      EXP1 as CR10 STOCKDISPLAY
140
- *        _____                                      _____
140
+ *        -----                                      -----
141
  *   PA4 | 6 5 | PC0                     BEEPER_PIN | 6 5 | BTN_ENC
141
  *   PA4 | 6 5 | PC0                     BEEPER_PIN | 6 5 | BTN_ENC
142
  *   PD3 | 7 4 | RESET                      BTN_EN1 | 7 4 | RESET
142
  *   PD3 | 7 4 | RESET                      BTN_EN1 | 7 4 | RESET
143
  *   PD2   8 3 | PA1                        BTN_EN2   8 3 | LCD_PINS_D4 (ST9720 CLK)
143
  *   PD2   8 3 | PA1                        BTN_EN2   8 3 | LCD_PINS_D4 (ST9720 CLK)

+ 0
- 2
Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h View File

158
 // SD Card
158
 // SD Card
159
 //
159
 //
160
 
160
 
161
-#define HAS_ONBOARD_SD
162
-
163
 #ifndef SDCARD_CONNECTION
161
 #ifndef SDCARD_CONNECTION
164
   #define SDCARD_CONNECTION              ONBOARD
162
   #define SDCARD_CONNECTION              ONBOARD
165
 #endif
163
 #endif

+ 3
- 3
Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h View File

156
 #define USB_CONNECT_INVERTING              false
156
 #define USB_CONNECT_INVERTING              false
157
 
157
 
158
 /**
158
 /**
159
- *                 _____
159
+ *                 -----
160
  *             5V | 1 2 | GND
160
  *             5V | 1 2 | GND
161
  *  (LCD_EN) PB7  | 3 4 | PB8  (LCD_RS)
161
  *  (LCD_EN) PB7  | 3 4 | PB8  (LCD_RS)
162
  *  (LCD_D4) PB9  | 5 6   PA10 (BTN_EN2)
162
  *  (LCD_D4) PB9  | 5 6   PA10 (BTN_EN2)
195
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
195
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
196
 
196
 
197
     /** Creality Ender-2 display pinout
197
     /** Creality Ender-2 display pinout
198
-     *                   _____
198
+     *                   -----
199
      *               5V | 1 2 | GND
199
      *               5V | 1 2 | GND
200
      *      (MOSI) PB7  | 3 4 | PB8  (LCD_RS)
200
      *      (MOSI) PB7  | 3 4 | PB8  (LCD_RS)
201
      *    (LCD_A0) PB9  | 5 6   PA10 (BTN_EN2)
201
      *    (LCD_A0) PB9  | 5 6   PA10 (BTN_EN2)
229
   /** FYSETC TFT TFT81050 display pinout
229
   /** FYSETC TFT TFT81050 display pinout
230
    *
230
    *
231
    *               Board                                     Display
231
    *               Board                                     Display
232
-   *               _____                                      _____
232
+   *               -----                                      -----
233
    *           5V | 1 2 | GND               (SPI1-MISO) MISO | 1 2 | SCK   (SPI1-SCK)
233
    *           5V | 1 2 | GND               (SPI1-MISO) MISO | 1 2 | SCK   (SPI1-SCK)
234
    * (FREE)   PB7 | 3 4 | PB8  (LCD_CS)     (PA9)  MOD_RESET | 3 4 | SD_CS (PA10)
234
    * (FREE)   PB7 | 3 4 | PB8  (LCD_CS)     (PA9)  MOD_RESET | 3 4 | SD_CS (PA10)
235
    * (FREE)   PB9 | 5 6   PA10 (SD_CS)      (PB8)     LCD_CS | 5 6   MOSI  (SPI1-MOSI)
235
    * (FREE)   PB9 | 5 6   PA10 (SD_CS)      (PB8)     LCD_CS | 5 6   MOSI  (SPI1-MOSI)

+ 4
- 4
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h View File

117
 
117
 
118
 /**
118
 /**
119
  *        SKR Mini E3 V1.0, V1.2                      SKR Mini E3 V2.0
119
  *        SKR Mini E3 V1.0, V1.2                      SKR Mini E3 V2.0
120
- *                ______                                    ______
120
+ *                ------                                    ------
121
  *            5V | 1  2 | GND                           5V | 1  2 | GND
121
  *            5V | 1  2 | GND                           5V | 1  2 | GND
122
  *  (LCD_EN) PB7 | 3  4 | PB8  (LCD_RS)      (LCD_EN) PB15 | 3  4 | PB8  (LCD_RS)
122
  *  (LCD_EN) PB7 | 3  4 | PB8  (LCD_RS)      (LCD_EN) PB15 | 3  4 | PB8  (LCD_RS)
123
  *  (LCD_D4) PB9 | 5  6   PA10 (BTN_EN2)     (LCD_D4) PB9  | 5  6   PA10 (BTN_EN2)
123
  *  (LCD_D4) PB9 | 5  6   PA10 (BTN_EN2)     (LCD_D4) PB9  | 5  6   PA10 (BTN_EN2)
134
   #define EXP1_3                            PB7
134
   #define EXP1_3                            PB7
135
 #endif
135
 #endif
136
 
136
 
137
-#if ENABLED(DWIN_CREALITY_LCD)
137
+#if EITHER(DWIN_CREALITY_LCD, IS_DWIN_MARLINUI)
138
   /**
138
   /**
139
    *        ------              ------              ------
139
    *        ------              ------              ------
140
    *   VCC | 1  2 | GND    VCC | 1  2 | GND    GND |  2 1 | VCC
140
    *   VCC | 1  2 | GND    VCC | 1  2 | GND    GND |  2 1 | VCC
205
        * TFTGLCD_PANEL_SPI display pinout
205
        * TFTGLCD_PANEL_SPI display pinout
206
        *
206
        *
207
        *               Board                                      Display
207
        *               Board                                      Display
208
-       *               ______                                       ______
208
+       *               ------                                       ------
209
        *           5V | 1  2 | GND                (SPI1-MISO) MISO | 1  2 | SCK   (SPI1-SCK)
209
        *           5V | 1  2 | GND                (SPI1-MISO) MISO | 1  2 | SCK   (SPI1-SCK)
210
        * (FREE)   PB7 | 3  4 | PB8  (LCD_CS)      (PA9)     LCD_CS | 3  4 | SD_CS (PA10)
210
        * (FREE)   PB7 | 3  4 | PB8  (LCD_CS)      (PA9)     LCD_CS | 3  4 | SD_CS (PA10)
211
        * (FREE)   PB9 | 5  6 | PA10 (SD_CS)                 (FREE) | 5  6 | MOSI  (SPI1-MOSI)
211
        * (FREE)   PB9 | 5  6 | PA10 (SD_CS)                 (FREE) | 5  6 | MOSI  (SPI1-MOSI)
248
    * FYSETC TFT TFT81050 display pinout
248
    * FYSETC TFT TFT81050 display pinout
249
    *
249
    *
250
    *               Board                                      Display
250
    *               Board                                      Display
251
-   *               ______                                       ______
251
+   *               ------                                       ------
252
    *           5V | 1  2 | GND                (SPI1-MISO) MISO | 1  2 | SCK   (SPI1-SCK)
252
    *           5V | 1  2 | GND                (SPI1-MISO) MISO | 1  2 | SCK   (SPI1-SCK)
253
    * (FREE)   PB7 | 3  4 | PB8  (LCD_CS)      (PA9)  MOD_RESET | 3  4 | SD_CS (PA10)
253
    * (FREE)   PB7 | 3  4 | PB8  (LCD_CS)      (PA9)  MOD_RESET | 3  4 | SD_CS (PA10)
254
    * (FREE)   PB9 | 5  6 | PA10 (SD_CS)       (PB8)     LCD_CS | 5  6 | MOSI  (SPI1-MOSI)
254
    * (FREE)   PB9 | 5  6 | PA10 (SD_CS)       (PB8)     LCD_CS | 5  6 | MOSI  (SPI1-MOSI)

+ 1
- 1
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h View File

98
 //
98
 //
99
 
99
 
100
 /**
100
 /**
101
- *                _____                                             _____
101
+ *                -----                                             -----
102
  *            NC | · · | GND                                    5V | · · | GND
102
  *            NC | · · | GND                                    5V | · · | GND
103
  *         RESET | · · | PB9 (SD_DETECT)             (LCD_D7) PC14 | · · | PC15 (LCD_D6)
103
  *         RESET | · · | PB9 (SD_DETECT)             (LCD_D7) PC14 | · · | PC15 (LCD_D6)
104
  *  (MOSI)   PB5 | · · | PB8 (BTN_EN2)               (LCD_D5)  PB7 | · · | PC13 (LCD_D4)
104
  *  (MOSI)   PB5 | · · | PB8 (BTN_EN2)               (LCD_D5)  PB7 | · · | PC13 (LCD_D4)

+ 1
- 1
Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h View File

122
 #define NEOPIXEL_PIN                        PC7   // The NEOPIXEL LED driving pin
122
 #define NEOPIXEL_PIN                        PC7   // The NEOPIXEL LED driving pin
123
 
123
 
124
 /**
124
 /**
125
- *     1 _____ 2
125
+ *     1 ----- 2
126
  *  PB5 | · · | PB6
126
  *  PB5 | · · | PB6
127
  *  PA2 | · · | RESET
127
  *  PA2 | · · | RESET
128
  *  PA3 | · · | PB8
128
  *  PA3 | · · | PB8

+ 0
- 1
Marlin/src/pins/stm32f1/pins_CREALITY_V4.h View File

194
   //#define LCD_LED_PIN                     PB2
194
   //#define LCD_LED_PIN                     PB2
195
   #ifndef BEEPER_PIN
195
   #ifndef BEEPER_PIN
196
     #define BEEPER_PIN                      PB13
196
     #define BEEPER_PIN                      PB13
197
-    //#undef SPEAKER
198
   #endif
197
   #endif
199
 
198
 
200
 #elif ENABLED(DWIN_VET6_CREALITY_LCD)
199
 #elif ENABLED(DWIN_VET6_CREALITY_LCD)

+ 57
- 26
Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h View File

156
 #define SDIO_SUPPORT
156
 #define SDIO_SUPPORT
157
 #define NO_SD_HOST_DRIVE                          // This board's SD is only seen by the printer
157
 #define NO_SD_HOST_DRIVE                          // This board's SD is only seen by the printer
158
 
158
 
159
-#if ENABLED(CR10_STOCKDISPLAY) && NONE(RET6_12864_LCD, VET6_12864_LCD)
160
-  #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
161
-#endif
162
-
163
-#if ENABLED(RET6_12864_LCD)
164
-
165
-  // RET6 12864 LCD
166
-  #define LCD_PINS_RS                       PB12
167
-  #define LCD_PINS_ENABLE                   PB15
168
-  #define LCD_PINS_D4                       PB13
169
-
170
-  #define BTN_ENC                           PB2
171
-  #define BTN_EN1                           PB10
172
-  #define BTN_EN2                           PB14
159
+#if ENABLED(CR10_STOCKDISPLAY)
160
+
161
+  #if ENABLED(RET6_12864_LCD)
162
+
163
+    /**
164
+     *    RET6 12864 LCD
165
+     *        ------
166
+     *  PC6  |10  9 | PB2
167
+     *  PB10 | 8  7 | PE8
168
+     *  PB14 | 6  5 | PB13
169
+     *  PB12 | 4  3 | PB15
170
+     *  GND  | 2  1 | 5V
171
+     *        ------
172
+     *         EXP1
173
+     */
174
+    #define EXP1_03_PIN                     PB15
175
+    #define EXP1_04_PIN                     PB12
176
+    #define EXP1_05_PIN                     PB13
177
+    #define EXP1_06_PIN                     PB14
178
+    #define EXP1_07_PIN                     PE8
179
+    #define EXP1_08_PIN                     PB10
180
+    #define EXP1_09_PIN                     PB2
181
+    #define EXP1_10_PIN                     PC6
182
+
183
+    #define BEEPER_PIN               EXP1_10_PIN
184
+
185
+  #elif ENABLED(VET6_12864_LCD)
186
+
187
+    /**
188
+     *    VET6 12864 LCD
189
+     *        ------
190
+     *  ?    |10  9 | PC5
191
+     *  PB10 | 8  7 | ?
192
+     *  PA6  | 6  5 | PA5
193
+     *  PA4  | 4  3 | PA7
194
+     *  GND  | 2  1 | 5V
195
+     *        ------
196
+     *         EXP1
197
+     */
198
+    #define EXP1_03_PIN                     PA7
199
+    #define EXP1_04_PIN                     PA4
200
+    #define EXP1_05_PIN                     PA5
201
+    #define EXP1_06_PIN                     PA6
202
+    #define EXP1_07_PIN                     -1
203
+    #define EXP1_08_PIN                     PB10
204
+    #define EXP1_09_PIN                     PC5
205
+    #define EXP1_10_PIN                     -1
173
 
206
 
174
-  #define BEEPER_PIN                        PC6
175
-
176
-#elif ENABLED(VET6_12864_LCD)
207
+  #else
208
+    #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
209
+  #endif
177
 
210
 
178
-  // VET6 12864 LCD
179
-  #define LCD_PINS_RS                       PA4
180
-  #define LCD_PINS_ENABLE                   PA7
181
-  #define LCD_PINS_D4                       PA5
211
+  #define LCD_PINS_RS                EXP1_04_PIN
212
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
213
+  #define LCD_PINS_D4                EXP1_05_PIN
182
 
214
 
183
-  #define BTN_ENC                           PC5
184
-  #define BTN_EN1                           PB10
185
-  #define BTN_EN2                           PA6
215
+  #define BTN_ENC                    EXP1_09_PIN
216
+  #define BTN_EN1                    EXP1_08_PIN
217
+  #define BTN_EN2                    EXP1_06_PIN
186
 
218
 
187
-#elif ENABLED(DWIN_CREALITY_LCD)
219
+#elif EITHER(DWIN_CREALITY_LCD, IS_DWIN_MARLINUI)
188
 
220
 
189
   // RET6 DWIN ENCODER LCD
221
   // RET6 DWIN ENCODER LCD
190
   #define BTN_ENC                           PB14
222
   #define BTN_ENC                           PB14
194
   //#define LCD_LED_PIN                     PB2
226
   //#define LCD_LED_PIN                     PB2
195
   #ifndef BEEPER_PIN
227
   #ifndef BEEPER_PIN
196
     #define BEEPER_PIN                      PB13
228
     #define BEEPER_PIN                      PB13
197
-    #undef SPEAKER
198
   #endif
229
   #endif
199
 
230
 
200
 #elif ENABLED(DWIN_VET6_CREALITY_LCD)
231
 #elif ENABLED(DWIN_VET6_CREALITY_LCD)

+ 2
- 2
Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h View File

132
 
132
 
133
 /*
133
 /*
134
 * EXP1 pinout for the LCD according to Fysetcs schematic for the Cheetah board
134
 * EXP1 pinout for the LCD according to Fysetcs schematic for the Cheetah board
135
-*                 _____
136
-*  (Beeper) PC9  | 1 2 | PC12 (BTN_ENC)
135
+*                 -----
136
+*  (BEEPER) PC9  | 1 2 | PC12 (BTN_ENC)
137
 * (BTN_EN2) PC11 | 3 4 | PB14 (LCD_RS / MISO)
137
 * (BTN_EN2) PC11 | 3 4 | PB14 (LCD_RS / MISO)
138
 * (BTN_EN1) PC10   5 6 | PB13 (SCK)
138
 * (BTN_EN1) PC10   5 6 | PB13 (SCK)
139
 *  (LCD_EN) PB12 | 7 8 | PB15 (MOSI)
139
 *  (LCD_EN) PB12 | 7 8 | PB15 (MOSI)

+ 1
- 1
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h View File

133
 #endif
133
 #endif
134
 
134
 
135
 /**
135
 /**
136
- *                _____                                      _____                                     _____
136
+ *                -----                                      -----                                     -----
137
  *  (BEEPER) PC1 | 1 2 | PC3 (BTN_ENC)          (MISO) PB14 | 1 2 | PB13 (SD_SCK)                  5V | 1 2 | GND
137
  *  (BEEPER) PC1 | 1 2 | PC3 (BTN_ENC)          (MISO) PB14 | 1 2 | PB13 (SD_SCK)                  5V | 1 2 | GND
138
  *  (LCD_EN) PA4 | 3 4 | PA5 (LCD_RS)        (BTN_EN1) PB11 | 3 4 | PA15 (SD_SS)         (LCD_EN) PA4 | 3 4 | PA5  (LCD_RS)
138
  *  (LCD_EN) PA4 | 3 4 | PA5 (LCD_RS)        (BTN_EN1) PB11 | 3 4 | PA15 (SD_SS)         (LCD_EN) PA4 | 3 4 | PA5  (LCD_RS)
139
  *  (LCD_D4) PA6 | 5 6   PA7 (LCD_D5)        (BTN_EN2)  PB0 | 5 6   PB15 (SD_MOSI)       (LCD_D4) PA6 | 5 6   PB0  (BTN_EN2)
139
  *  (LCD_D4) PA6 | 5 6   PA7 (LCD_D5)        (BTN_EN2)  PB0 | 5 6   PB15 (SD_MOSI)       (LCD_D4) PA6 | 5 6   PB0  (BTN_EN2)

+ 10
- 8
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h View File

299
 
299
 
300
 #endif
300
 #endif
301
 
301
 
302
-#ifndef BOARD_ST7920_DELAY_1
303
-  #define BOARD_ST7920_DELAY_1              DELAY_NS(125)
304
-#endif
305
-#ifndef BOARD_ST7920_DELAY_2
306
-  #define BOARD_ST7920_DELAY_2              DELAY_NS(125)
307
-#endif
308
-#ifndef BOARD_ST7920_DELAY_3
309
-  #define BOARD_ST7920_DELAY_3              DELAY_NS(125)
302
+#if HAS_MARLINUI_U8GLIB
303
+  #ifndef BOARD_ST7920_DELAY_1
304
+    #define BOARD_ST7920_DELAY_1   DELAY_NS(125)
305
+  #endif
306
+  #ifndef BOARD_ST7920_DELAY_2
307
+    #define BOARD_ST7920_DELAY_2   DELAY_NS(125)
308
+  #endif
309
+  #ifndef BOARD_ST7920_DELAY_3
310
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(125)
311
+  #endif
310
 #endif
312
 #endif
311
 
313
 
312
 #define HAS_SPI_FLASH                          1
314
 #define HAS_SPI_FLASH                          1

+ 3
- 3
Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h View File

201
   #define BTN_EN1                    EXP1_03_PIN
201
   #define BTN_EN1                    EXP1_03_PIN
202
   #define BTN_EN2                    EXP1_06_PIN
202
   #define BTN_EN2                    EXP1_06_PIN
203
   #define BTN_ENC                    EXP1_04_PIN
203
   #define BTN_ENC                    EXP1_04_PIN
204
-  #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
205
-  #define BOARD_ST7920_DELAY_2 DELAY_NS(200)
206
-  #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
204
+  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
205
+  #define BOARD_ST7920_DELAY_2     DELAY_NS(200)
206
+  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
207
 
207
 
208
 #elif EITHER(ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306)
208
 #elif EITHER(ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306)
209
 
209
 

+ 3
- 3
Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h View File

332
 #endif
332
 #endif
333
 
333
 
334
 #if HAS_MARLINUI_U8GLIB
334
 #if HAS_MARLINUI_U8GLIB
335
-  #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
336
-  #define BOARD_ST7920_DELAY_2 DELAY_NS(250)
337
-  #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
335
+  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
336
+  #define BOARD_ST7920_DELAY_2     DELAY_NS(250)
337
+  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
338
 #endif
338
 #endif
339
 
339
 
340
 // Remap SERVO0 PIN for BLTouch
340
 // Remap SERVO0 PIN for BLTouch

+ 3
- 3
Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h View File

305
 #endif
305
 #endif
306
 
306
 
307
 #if HAS_MARLINUI_U8GLIB
307
 #if HAS_MARLINUI_U8GLIB
308
-  #define BOARD_ST7920_DELAY_1 DELAY_NS(200)    // Tclk_fall <200ns
309
-  #define BOARD_ST7920_DELAY_2 DELAY_NS(250)    // Tdata_width >200ns
310
-  #define BOARD_ST7920_DELAY_3 DELAY_NS(200)    // Tclk_rise <200ns
308
+  #define BOARD_ST7920_DELAY_1     DELAY_NS(200)  // Tclk_fall <200ns
309
+  #define BOARD_ST7920_DELAY_2     DELAY_NS(250)  // Tdata_width >200ns
310
+  #define BOARD_ST7920_DELAY_3     DELAY_NS(200)  // Tclk_rise <200ns
311
 #endif
311
 #endif
312
 
312
 
313
 // Remap SERVO0 PIN for BLTouch
313
 // Remap SERVO0 PIN for BLTouch

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

183
 
183
 
184
 /**
184
 /**
185
  *               BTT E3 RRF
185
  *               BTT E3 RRF
186
- *                 _____
186
+ *                 -----
187
  *             5V | 1 2 | GND
187
  *             5V | 1 2 | GND
188
  *  (LCD_EN) PE11 | 3 4 | PB1  (LCD_RS)
188
  *  (LCD_EN) PE11 | 3 4 | PB1  (LCD_RS)
189
  *  (LCD_D4) PE10 | 5 6   PB2  (BTN_EN2)
189
  *  (LCD_D4) PE10 | 5 6   PB2  (BTN_EN2)
248
        * TFTGLCD_PANEL_SPI display pinout
248
        * TFTGLCD_PANEL_SPI display pinout
249
        *
249
        *
250
        *               Board                                      Display
250
        *               Board                                      Display
251
-       *               _____                                       _____
251
+       *               -----                                       -----
252
        *           5V | 1 2 | GND                (SPI1-MISO) MISO | 1 2 | SCK   (SPI1-SCK)
252
        *           5V | 1 2 | GND                (SPI1-MISO) MISO | 1 2 | SCK   (SPI1-SCK)
253
        * (FREE)  PE11 | 3 4 | PB1  (LCD_CS)      (PE7)     LCD_CS | 3 4 | SD_CS (PB2)
253
        * (FREE)  PE11 | 3 4 | PB1  (LCD_CS)      (PE7)     LCD_CS | 3 4 | SD_CS (PB2)
254
        * (FREE)  PE10 | 5 6 | PB2  (SD_CS)                 (FREE) | 5 6 | MOSI  (SPI1-MOSI)
254
        * (FREE)  PE10 | 5 6 | PB2  (SD_CS)                 (FREE) | 5 6 | MOSI  (SPI1-MOSI)
303
   /** FYSETC TFT TFT81050 display pinout
303
   /** FYSETC TFT TFT81050 display pinout
304
    *
304
    *
305
    *               Board                                      Display
305
    *               Board                                      Display
306
-   *               _____                                       _____
306
+   *               -----                                       -----
307
    *           5V | 1 2 | GND                (SPI1-MISO) MISO | 1 2 | SCK   (SPI1-SCK)
307
    *           5V | 1 2 | GND                (SPI1-MISO) MISO | 1 2 | SCK   (SPI1-SCK)
308
    * (FREE)  PE11 | 3 4 | PB1  (LCD_CS)      (PE7)  MOD_RESET | 3 4 | SD_CS (PB2)
308
    * (FREE)  PE11 | 3 4 | PB1  (LCD_CS)      (PE7)  MOD_RESET | 3 4 | SD_CS (PB2)
309
    * (FREE)  PE10 | 5 6 | PB2  (SD_CS)       (PB1)     LCD_CS | 5 6 | MOSI  (SPI1-MOSI)
309
    * (FREE)  PE10 | 5 6 | PB2  (SD_CS)       (PB1)     LCD_CS | 5 6 | MOSI  (SPI1-MOSI)

+ 2
- 2
Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h View File

311
 #endif
311
 #endif
312
 
312
 
313
 /**
313
 /**
314
- *               ______                                              ______
314
+ *               ------                                              ------
315
  *           NC | 1  2 | GND                                     5V | 1  2 | GND
315
  *           NC | 1  2 | GND                                     5V | 1  2 | GND
316
  *        RESET | 3  4 | PC15 (SD_DETECT)             (LCD_D7) PE15 | 3  4 | PE14 (LCD_D6)
316
  *        RESET | 3  4 | PC15 (SD_DETECT)             (LCD_D7) PE15 | 3  4 | PE14 (LCD_D6)
317
  *   (MOSI) PA7 | 5  6   PB1  (BTN_EN2)               (LCD_D5) PE13 | 5  6   PE12 (LCD_D4)
317
  *   (MOSI) PA7 | 5  6   PB1  (BTN_EN2)               (LCD_D5) PE13 | 5  6   PE12 (LCD_D4)
366
 
366
 
367
 #if ENABLED(BTT_MOTOR_EXPANSION)
367
 #if ENABLED(BTT_MOTOR_EXPANSION)
368
   /**
368
   /**
369
-   *         ______                        ______
369
+   *         ------                        ------
370
    *     NC | 1  2 | GND               NC | 1  2 | GND
370
    *     NC | 1  2 | GND               NC | 1  2 | GND
371
    *     NC | 3  4 | M1EN            M2EN | 3  4 | M3EN
371
    *     NC | 3  4 | M1EN            M2EN | 3  4 | M3EN
372
    *  M1STP | 5  6   M1DIR           M1RX | 5  6   M1DIAG
372
    *  M1STP | 5  6   M1DIR           M1RX | 5  6   M1DIAG

+ 1
- 1
Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h View File

367
 #endif
367
 #endif
368
 
368
 
369
 #if ENABLED(BTT_MOTOR_EXPANSION)
369
 #if ENABLED(BTT_MOTOR_EXPANSION)
370
-  /**       _____                        _____
370
+  /**       -----                        -----
371
    *    NC | . . | GND               NC | . . | GND
371
    *    NC | . . | GND               NC | . . | GND
372
    *    NC | . . | M1EN            M2EN | . . | M3EN
372
    *    NC | . . | M1EN            M2EN | . . | M3EN
373
    * M1STP | . .   M1DIR           M1RX | . .   M1DIAG
373
    * M1STP | . .   M1DIR           M1RX | . .   M1DIAG

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

350
 #endif
350
 #endif
351
 
351
 
352
 #if ENABLED(BTT_MOTOR_EXPANSION)
352
 #if ENABLED(BTT_MOTOR_EXPANSION)
353
-  /**       _____                        _____
353
+  /**       -----                        -----
354
    *    NC | . . | GND               NC | . . | GND
354
    *    NC | . . | GND               NC | . . | GND
355
    *    NC | . . | M1EN            M2EN | . . | M3EN
355
    *    NC | . . | M1EN            M2EN | . . | M3EN
356
    * M1STP | . .   M1DIR           M1RX | . .   M1DIAG
356
    * M1STP | . .   M1DIR           M1RX | . .   M1DIAG

+ 67
- 42
Marlin/src/pins/stm32f4/pins_FLYF407ZG.h View File

175
 #define FAN4_PIN                            PE13
175
 #define FAN4_PIN                            PE13
176
 #define FAN5_PIN                            PB11
176
 #define FAN5_PIN                            PB11
177
 
177
 
178
+/**
179
+ *        ------                ------
180
+ *  PB10 |10  9 | PE15    PB14 |10  9 | PB13
181
+ *  PE14 | 8  7 | PE12    PC5  | 8  7 | PF11
182
+ *  PE10   6  5 | PE9     PC4    6  5 | PB15
183
+ *  PE8  | 4  3 | PE7     PB2  | 4  3 | RESET
184
+ *  GND  | 2  1 | 5V      GND  | 2  1 | NC
185
+ *        ------                ------
186
+ *         EXP1                  EXP2
187
+ */
188
+
189
+#define EXP1_03_PIN                         PE7
190
+#define EXP1_04_PIN                         PE8
191
+#define EXP1_05_PIN                         PE9
192
+#define EXP1_06_PIN                         PE10
193
+#define EXP1_07_PIN                         PE12
194
+#define EXP1_08_PIN                         PE14
195
+#define EXP1_09_PIN                         PE15
196
+#define EXP1_10_PIN                         PB10
197
+
198
+#define EXP2_03_PIN                         -1    // RESET
199
+#define EXP2_04_PIN                         PB2
200
+#define EXP2_05_PIN                         PB15
201
+#define EXP2_06_PIN                         PC4
202
+#define EXP2_07_PIN                         PF11
203
+#define EXP2_08_PIN                         PC5
204
+#define EXP2_09_PIN                         PB13
205
+#define EXP2_10_PIN                         PB14
206
+
178
 //
207
 //
179
 // Onboard SD support
208
 // Onboard SD support
180
 //
209
 //
181
-
182
-#define SDIO_D0_PIN                         PC8
183
-#define SDIO_D1_PIN                         PC9
184
 //#define SD_CARD_DETECT_PIN                PC13
210
 //#define SD_CARD_DETECT_PIN                PC13
185
-#define SDIO_D2_PIN                         PC10
186
-#define SDIO_D3_PIN                         PC11
187
-#define SDIO_CK_PIN                         PC12
188
-#define SDIO_CMD_PIN                        PD2
189
 
211
 
190
 #ifndef SDCARD_CONNECTION
212
 #ifndef SDCARD_CONNECTION
191
   #define SDCARD_CONNECTION              ONBOARD
213
   #define SDCARD_CONNECTION              ONBOARD
194
 #if SD_CONNECTION_IS(ONBOARD)
216
 #if SD_CONNECTION_IS(ONBOARD)
195
 
217
 
196
   #define SDIO_SUPPORT                            // Use SDIO for onboard SD
218
   #define SDIO_SUPPORT                            // Use SDIO for onboard SD
197
-  #ifndef SDIO_SUPPORT
219
+
220
+  #if DISABLED(SDIO_SUPPORT)
198
     #define SOFTWARE_SPI                          // Use soft SPI for onboard SD
221
     #define SOFTWARE_SPI                          // Use soft SPI for onboard SD
199
-    #define SDSS                     SDIO_D3_PIN
200
-    #define SD_SCK_PIN               SDIO_CK_PIN
201
-    #define SD_MISO_PIN              SDIO_D0_PIN
202
-    #define SD_MOSI_PIN             SDIO_CMD_PIN
222
+    #define SDSS                            PC11
223
+    #define SD_SCK_PIN                      PC12
224
+    #define SD_MISO_PIN                     PC8
225
+    #define SD_MOSI_PIN                     PD2
203
   #endif
226
   #endif
204
 
227
 
205
 #elif SD_CONNECTION_IS(LCD)
228
 #elif SD_CONNECTION_IS(LCD)
206
 
229
 
207
-  #define SD_SCK_PIN                        PB13
208
-  #define SD_MISO_PIN                       PB14
209
-  #define SD_MOSI_PIN                       PB15
210
-  #define SDSS                              PF11
211
-  #define SD_DETECT_PIN                     PB2
230
+  #define SD_SCK_PIN                 EXP2_09_PIN
231
+  #define SD_MISO_PIN                EXP2_10_PIN
232
+  #define SD_MOSI_PIN                EXP2_05_PIN
233
+  #define SDSS                       EXP2_07_PIN
234
+  #define SD_DETECT_PIN              EXP2_04_PIN
212
 
235
 
213
 #endif
236
 #endif
214
 
237
 
215
 //
238
 //
216
 // Trinamic Software SPI
239
 // Trinamic Software SPI
217
 //
240
 //
218
-
219
 #if ENABLED(TMC_USE_SW_SPI)
241
 #if ENABLED(TMC_USE_SW_SPI)
220
-  #ifndef TMC_SW_MOSI
221
-    #define TMC_SW_MOSI                     PB15
242
+  #ifndef TMC_SW_SCK
243
+    #define TMC_SW_SCK               EXP2_09_PIN
222
   #endif
244
   #endif
223
   #ifndef TMC_SW_MISO
245
   #ifndef TMC_SW_MISO
224
-    #define TMC_SW_MISO                     PB14
246
+    #define TMC_SW_MISO              EXP2_10_PIN
225
   #endif
247
   #endif
226
-  #ifndef TMC_SW_SCK
227
-    #define TMC_SW_SCK                      PB13
248
+  #ifndef TMC_SW_MOSI
249
+    #define TMC_SW_MOSI              EXP2_05_PIN
228
   #endif
250
   #endif
229
 #endif
251
 #endif
230
 
252
 
264
 //
286
 //
265
 // LCD / Controller
287
 // LCD / Controller
266
 //
288
 //
267
-
268
-#define BEEPER_PIN                          PB10
269
-#define LCD_PINS_RS                         PE12
270
-#define LCD_PINS_ENABLE                     PE14
271
-#define LCD_PINS_D4                         PE10
272
-#define LCD_PINS_D5                         PE9
273
-#define LCD_PINS_D6                         PE8
274
-#define LCD_PINS_D7                         PE7
275
-#define BTN_EN1                             PC4
276
-#define BTN_EN2                             PC5
277
-#define BTN_ENC                             PE15
289
+#if IS_RRD_SC
290
+  #define BEEPER_PIN                 EXP1_10_PIN
291
+  #define LCD_PINS_RS                EXP1_07_PIN
292
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
293
+  #define LCD_PINS_D4                EXP1_06_PIN
294
+  #define LCD_PINS_D5                EXP1_05_PIN
295
+  #define LCD_PINS_D6                EXP1_04_PIN
296
+  #define LCD_PINS_D7                EXP1_03_PIN
297
+  #define BTN_EN1                    EXP2_06_PIN
298
+  #define BTN_EN2                    EXP2_08_PIN
299
+  #define BTN_ENC                    EXP1_09_PIN
300
+#endif
278
 
301
 
279
 //
302
 //
280
 // Filament runout
303
 // Filament runout
285
 //
308
 //
286
 // ST7920 Delays
309
 // ST7920 Delays
287
 //
310
 //
288
-#ifndef BOARD_ST7920_DELAY_1
289
-  #define BOARD_ST7920_DELAY_1      DELAY_NS(96)
290
-#endif
291
-#ifndef BOARD_ST7920_DELAY_2
292
-  #define BOARD_ST7920_DELAY_2      DELAY_NS(48)
293
-#endif
294
-#ifndef BOARD_ST7920_DELAY_3
295
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(715)
311
+#if HAS_MARLINUI_U8GLIB
312
+  #ifndef BOARD_ST7920_DELAY_1
313
+    #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
314
+  #endif
315
+  #ifndef BOARD_ST7920_DELAY_2
316
+    #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
317
+  #endif
318
+  #ifndef BOARD_ST7920_DELAY_3
319
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(715)
320
+  #endif
296
 #endif
321
 #endif

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

138
 #endif
138
 #endif
139
 
139
 
140
 /**
140
 /**
141
- *                _____                                              _____
141
+ *                -----                                              -----
142
  *            5V | 1 2 | GND                                     5V | 1 2 | GND
142
  *            5V | 1 2 | GND                                     5V | 1 2 | GND
143
  *         RESET | 3 4 | PC3  (SD_DETECT)             (LCD_D7)  PB7 | 3 4 | PB6  (LCD_D6)
143
  *         RESET | 3 4 | PC3  (SD_DETECT)             (LCD_D7)  PB7 | 3 4 | PB6  (LCD_D6)
144
  * (SD_MOSI) PA7   5 6 | PC11 (BTN_EN2)               (LCD_D5) PB14   5 6 | PB13 (LCD_D4)
144
  * (SD_MOSI) PA7   5 6 | PC11 (BTN_EN2)               (LCD_D5) PB14   5 6 | PB13 (LCD_D4)
149
  */
149
  */
150
 
150
 
151
 /**
151
 /**
152
-*                 _____
152
+*                 -----
153
 *  (BEEPER) PC9  | 1 2 | PC12 (BTN_ENC)
153
 *  (BEEPER) PC9  | 1 2 | PC12 (BTN_ENC)
154
 * (BTN_EN1) PC10 | 3 4 | PB14 (LCD_D5/MISO)
154
 * (BTN_EN1) PC10 | 3 4 | PB14 (LCD_D5/MISO)
155
 * (BTN_EN2) PC11   5 6 | PB13 (LCD_D4/SCK)
155
 * (BTN_EN2) PC11   5 6 | PB13 (LCD_D4/SCK)
258
     #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
258
     #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
259
   #endif
259
   #endif
260
   #ifndef BOARD_ST7920_DELAY_3
260
   #ifndef BOARD_ST7920_DELAY_3
261
-    #define BOARD_ST7920_DELAY_3    DELAY_NS(600)
261
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
262
   #endif
262
   #endif
263
 #endif
263
 #endif
264
 
264
 

+ 15
- 9
Marlin/src/pins/stm32f4/pins_FYSETC_S6.h View File

192
 //#define KILL_PIN                          PC5
192
 //#define KILL_PIN                          PC5
193
 
193
 
194
 /**
194
 /**
195
- *         ______                 ______
196
- *     5V | 1  2 | GND        5V | 1  2 | GND
197
- *    PD1 | 3  4 | PD0     RESET | 3  4 | PB10
198
- *   PC12 | 5  6   PC10      PA7 | 5  6   PC7
199
- *    PD2 | 7  8 | PC11      PA4 | 7  8 | PC6
200
- *    PA8 | 9 10 | PC9       PA5 | 9 10 | PA6
195
+ *         ------                 ------
196
+ *   PC9  |10  9 | PA8      PA6  |10  9 | PA5
197
+ *   PC11 | 8  7 | PD2      PC6  | 8  7 | PA4
198
+ *   PC10 | 6  5   PC12     PC7  | 6  5   PA7
199
+ *   PD0  | 4  3 | PD1      PB10 | 4  3 | RESET
200
+ *   GND  | 2  1 | 5V       GND  | 2  1 | 5V
201
  *         ------                 ------
201
  *         ------                 ------
202
  *          EXP1                   EXP2
202
  *          EXP1                   EXP2
203
  */
203
  */
315
 
315
 
316
 // Alter timing for graphical display
316
 // Alter timing for graphical display
317
 #if HAS_MARLINUI_U8GLIB
317
 #if HAS_MARLINUI_U8GLIB
318
-  #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
319
-  #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
320
-  #define BOARD_ST7920_DELAY_3   DELAY_NS(640)
318
+  #ifndef BOARD_ST7920_DELAY_1
319
+    #define BOARD_ST7920_DELAY_1  DELAY_NS(96)
320
+  #endif
321
+  #ifndef BOARD_ST7920_DELAY_2
322
+    #define BOARD_ST7920_DELAY_2  DELAY_NS(48)
323
+  #endif
324
+  #ifndef BOARD_ST7920_DELAY_3
325
+    #define BOARD_ST7920_DELAY_3 DELAY_NS(640)
326
+  #endif
321
 #endif
327
 #endif
322
 
328
 
323
 #ifndef RGB_LED_R_PIN
329
 #ifndef RGB_LED_R_PIN

+ 88
- 80
Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h View File

225
 // Power Supply Control
225
 // Power Supply Control
226
 //
226
 //
227
 #if ENABLED(MKS_PWC)
227
 #if ENABLED(MKS_PWC)
228
-  #define PS_ON_PIN                         PW_OFF
229
-  #define KILL_PIN                          PW_DET
228
+  #define PS_ON_PIN                       PW_OFF
229
+  #define KILL_PIN                        PW_DET
230
   #define KILL_PIN_STATE                    HIGH
230
   #define KILL_PIN_STATE                    HIGH
231
 #endif
231
 #endif
232
 
232
 
233
 // Random Info
233
 // Random Info
234
 #define USB_SERIAL                          -1    // USB Serial
234
 #define USB_SERIAL                          -1    // USB Serial
235
 
235
 
236
+/**
237
+ *                  ------                                      ------
238
+ *   (BEEPER) PB2  |10  9 | PE10 (BTN_ENC)    (SPI1 MISO) PA6  |10  9 | PA5 (SPI1 SCK)
239
+ *   (LCD_EN) PE11 | 8  7 | PD10 (LCD_RS)       (BTN_EN1) PE9  | 8  7 | PA4 (SPI1 CS)
240
+ *   (LCD_D4) PD9  | 6  5   PD8  (LCD_D5)       (BTN_EN2) PE8  | 6  5   PA7 (SPI1 MOSI)
241
+ *   (LCD_D6) PE15 | 4  3 | PE7  (LCD_D7)       (SPI1_RS) PB11 | 4  3 | RESET
242
+ *            GND  | 2  1 | 5V                             GND | 2  1 | 3.3V
243
+ *                  ------                                      ------
244
+ *                   EXP1                                        EXP2
245
+ */
246
+#define EXP1_03_PIN                         PE7
247
+#define EXP1_04_PIN                         PE15
248
+#define EXP1_05_PIN                         PD8
249
+#define EXP1_06_PIN                         PD9
250
+#define EXP1_07_PIN                         PD10
251
+#define EXP1_08_PIN                         PE11
252
+#define EXP1_09_PIN                         PE10
253
+#define EXP1_10_PIN                         PB2
254
+
255
+#define EXP2_03_PIN                         -1    // RESET
256
+#define EXP2_04_PIN                         PB11
257
+#define EXP2_05_PIN                         PA7
258
+#define EXP2_06_PIN                         PE8
259
+#define EXP2_07_PIN                         PA4
260
+#define EXP2_08_PIN                         PE9
261
+#define EXP2_09_PIN                         PA5
262
+#define EXP2_10_PIN                         PA6
263
+
236
 #ifndef SDCARD_CONNECTION
264
 #ifndef SDCARD_CONNECTION
237
   #define SDCARD_CONNECTION              ONBOARD
265
   #define SDCARD_CONNECTION              ONBOARD
238
 #endif
266
 #endif
239
 
267
 
240
-//
241
-// Onboard SD card
242
-//
243
-// detect pin doesn't work when ONBOARD and NO_SD_HOST_DRIVE disabled
244
 #if SD_CONNECTION_IS(ONBOARD)
268
 #if SD_CONNECTION_IS(ONBOARD)
245
   #define ENABLE_SPI3
269
   #define ENABLE_SPI3
246
   #define SD_SS_PIN                         -1
270
   #define SD_SS_PIN                         -1
248
   #define SD_SCK_PIN                        PC10
272
   #define SD_SCK_PIN                        PC10
249
   #define SD_MISO_PIN                       PC11
273
   #define SD_MISO_PIN                       PC11
250
   #define SD_MOSI_PIN                       PC12
274
   #define SD_MOSI_PIN                       PC12
251
-  #define SD_DETECT_PIN                     PC4
252
-//
253
-// LCD SD
254
-//
275
+  #define SD_DETECT_PIN                     PC4   // SD_DETECT_PIN doesn't work with NO_SD_HOST_DRIVE disabled
255
 #elif SD_CONNECTION_IS(LCD)
276
 #elif SD_CONNECTION_IS(LCD)
256
   #define ENABLE_SPI1
277
   #define ENABLE_SPI1
257
-  #define SDSS                              PA4
258
-  #define SD_SCK_PIN                        PA5
259
-  #define SD_MISO_PIN                       PA6
260
-  #define SD_MOSI_PIN                       PA7
261
-  #define SD_DETECT_PIN                     PB11
278
+  #define SDSS                       EXP2_07_PIN
279
+  #define SD_SCK_PIN                 EXP2_09_PIN
280
+  #define SD_MISO_PIN                EXP2_10_PIN
281
+  #define SD_MOSI_PIN                EXP2_05_PIN
282
+  #define SD_DETECT_PIN              EXP2_04_PIN
262
 #endif
283
 #endif
263
 
284
 
264
-/**
265
- *                _____                                             _____
266
- *   (BEEPER)PB2 | · · | PE10(BTN_ENC)             (SPI1 MISO) PA6 | · · | PA5 (SPI1 SCK)
267
- *  (LCD_EN)PE11 | · · | PD10(LCD_RS)                (BTN_EN1) PE9 | · · | PA4 (SPI1 CS)
268
- *  (LCD_D4)PD9  | · ·   PD8(LCD_D5)                 (BTN_EN2) PE8 | · ·   PA7 (SPI1 MOSI)
269
- *  (LCD_D6)PE15 | · · | PE7(LCD_D7)                (SPI1_RS) PB11 | · · | RESET
270
- *           GND | · · | 5V                                    GND | · · | 3.3V
271
- *                 ̄ ̄ ̄                                              ̄ ̄ ̄
272
- *                EXP1                                               EXP2
273
- */
274
-
275
 #if ANY(TFT_COLOR_UI, TFT_CLASSIC_UI)
285
 #if ANY(TFT_COLOR_UI, TFT_CLASSIC_UI)
276
-  #ifndef TOUCH_CALIBRATION_X
277
-    #define TOUCH_CALIBRATION_X           -17253
278
-  #endif
279
-  #ifndef TOUCH_CALIBRATION_Y
280
-    #define TOUCH_CALIBRATION_Y            11579
281
-  #endif
282
-  #ifndef TOUCH_OFFSET_X
283
-    #define TOUCH_OFFSET_X                   514
284
-  #endif
285
-  #ifndef TOUCH_OFFSET_Y
286
-    #define TOUCH_OFFSET_Y                   -24
287
-  #endif
288
-  #ifndef TOUCH_ORIENTATION
289
-    #define TOUCH_ORIENTATION    TOUCH_LANDSCAPE
290
-  #endif
291
-
292
-  #define TFT_CS_PIN                        PE15
293
-  #define TFT_SCK_PIN                       PA5
294
-  #define TFT_MISO_PIN                      PA6
295
-  #define TFT_MOSI_PIN                      PA7
296
-  #define TFT_DC_PIN                        PE7
297
-  #define TFT_RST_PIN                       PD10
286
+  #define TFT_CS_PIN                 EXP1_04_PIN
287
+  #define TFT_SCK_PIN                EXP2_09_PIN
288
+  #define TFT_MISO_PIN               EXP2_10_PIN
289
+  #define TFT_MOSI_PIN               EXP2_05_PIN
290
+  #define TFT_DC_PIN                 EXP1_03_PIN
291
+  #define TFT_RST_PIN                EXP1_07_PIN
298
   #define TFT_A0_PIN                  TFT_DC_PIN
292
   #define TFT_A0_PIN                  TFT_DC_PIN
299
 
293
 
300
-  #define TFT_RESET_PIN                     PD10
301
-  #define TFT_BACKLIGHT_PIN                 PE11
294
+  #define TFT_RESET_PIN              EXP1_07_PIN
295
+  #define TFT_BACKLIGHT_PIN          EXP1_08_PIN
302
 
296
 
303
   #define TOUCH_BUTTONS_HW_SPI
297
   #define TOUCH_BUTTONS_HW_SPI
304
   #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
298
   #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
305
 
299
 
306
-  #define LCD_BACKLIGHT_PIN                 PE11
300
+  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
307
   #ifndef TFT_WIDTH
301
   #ifndef TFT_WIDTH
308
     #define TFT_WIDTH                        480
302
     #define TFT_WIDTH                        480
309
   #endif
303
   #endif
311
     #define TFT_HEIGHT                       320
305
     #define TFT_HEIGHT                       320
312
   #endif
306
   #endif
313
 
307
 
314
-  #define TOUCH_CS_PIN                      PD9   // SPI1_NSS
315
-  #define TOUCH_SCK_PIN                     PA5   // SPI1_SCK
316
-  #define TOUCH_MISO_PIN                    PA6   // SPI1_MISO
317
-  #define TOUCH_MOSI_PIN                    PA7   // SPI1_MOSI
318
-
319
-  #define BTN_EN1                           PE9
320
-  #define BTN_EN2                           PE8
321
-  #define BEEPER_PIN                        PB2
322
-  #define BTN_ENC                           PE10
308
+  #define TOUCH_CS_PIN               EXP1_06_PIN  // SPI1_NSS
309
+  #define TOUCH_SCK_PIN              EXP2_09_PIN  // SPI1_SCK
310
+  #define TOUCH_MISO_PIN             EXP2_10_PIN  // SPI1_MISO
311
+  #define TOUCH_MOSI_PIN             EXP2_05_PIN  // SPI1_MOSI
323
 
312
 
324
   #define LCD_READ_ID                       0xD3
313
   #define LCD_READ_ID                       0xD3
325
   #define LCD_USE_DMA_SPI
314
   #define LCD_USE_DMA_SPI
326
 
315
 
327
   #define TFT_BUFFER_SIZE                  14400
316
   #define TFT_BUFFER_SIZE                  14400
328
 
317
 
318
+  #ifndef TOUCH_CALIBRATION_X
319
+    #define TOUCH_CALIBRATION_X           -17253
320
+  #endif
321
+  #ifndef TOUCH_CALIBRATION_Y
322
+    #define TOUCH_CALIBRATION_Y            11579
323
+  #endif
324
+  #ifndef TOUCH_OFFSET_X
325
+    #define TOUCH_OFFSET_X                   514
326
+  #endif
327
+  #ifndef TOUCH_OFFSET_Y
328
+    #define TOUCH_OFFSET_Y                   -24
329
+  #endif
330
+  #ifndef TOUCH_ORIENTATION
331
+    #define TOUCH_ORIENTATION    TOUCH_LANDSCAPE
332
+  #endif
333
+
329
 #elif HAS_WIRED_LCD
334
 #elif HAS_WIRED_LCD
330
 
335
 
331
-  #define BEEPER_PIN                        PB2
332
-  #define BTN_ENC                           PE10
333
-  #define LCD_PINS_ENABLE                   PE11
334
-  #define LCD_PINS_RS                       PD10
335
-  #define BTN_EN1                           PE9
336
-  #define BTN_EN2                           PE8
336
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
337
+  #define LCD_PINS_RS                EXP1_07_PIN
337
   #define LCD_BACKLIGHT_PIN                 -1
338
   #define LCD_BACKLIGHT_PIN                 -1
338
 
339
 
339
   // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
340
   // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
341
     //#define LCD_BACKLIGHT_PIN             -1
342
     //#define LCD_BACKLIGHT_PIN             -1
342
     //#define LCD_RESET_PIN                 -1
343
     //#define LCD_RESET_PIN                 -1
343
     #define DOGLCD_A0                       PD11
344
     #define DOGLCD_A0                       PD11
344
-    #define DOGLCD_CS                       PE15
345
-    //#define DOGLCD_SCK                    PA5
346
-    //#define DOGLCD_MOSI                   PA7
345
+    #define DOGLCD_CS                EXP1_04_PIN
346
+    //#define DOGLCD_SCK             EXP2_09_PIN
347
+    //#define DOGLCD_MOSI            EXP2_05_PIN
347
 
348
 
348
   #elif ENABLED(MKS_MINI_12864_V3)
349
   #elif ENABLED(MKS_MINI_12864_V3)
349
-    #define DOGLCD_CS                       PE11
350
-    #define DOGLCD_A0                       PD10
350
+    #define DOGLCD_CS                EXP1_08_PIN
351
+    #define DOGLCD_A0                EXP1_07_PIN
351
     #define LCD_PINS_DC                DOGLCD_A0
352
     #define LCD_PINS_DC                DOGLCD_A0
352
     #define LCD_BACKLIGHT_PIN               -1
353
     #define LCD_BACKLIGHT_PIN               -1
353
-    #define LCD_RESET_PIN                   PD9
354
-    #define NEOPIXEL_PIN                    PD8
355
-    #define DOGLCD_MOSI                     PA7
356
-    #define DOGLCD_SCK                      PA5
354
+    #define LCD_RESET_PIN            EXP1_06_PIN
355
+    #define NEOPIXEL_PIN             EXP1_05_PIN
356
+    #define DOGLCD_MOSI              EXP2_05_PIN
357
+    #define DOGLCD_SCK               EXP2_09_PIN
357
     #if SD_CONNECTION_IS(ONBOARD)
358
     #if SD_CONNECTION_IS(ONBOARD)
358
       #define FORCE_SOFT_SPI
359
       #define FORCE_SOFT_SPI
359
     #endif
360
     #endif
361
 
362
 
362
   #else
363
   #else
363
 
364
 
364
-    #define LCD_PINS_D4                     PD9
365
+    #define LCD_PINS_D4              EXP1_06_PIN
365
     #if ENABLED(ULTIPANEL)
366
     #if ENABLED(ULTIPANEL)
366
-      #define LCD_PINS_D5                   PD8
367
-      #define LCD_PINS_D6                   PE15
368
-      #define LCD_PINS_D7                   PE7
367
+      #define LCD_PINS_D5            EXP1_05_PIN
368
+      #define LCD_PINS_D6            EXP1_04_PIN
369
+      #define LCD_PINS_D7            EXP1_03_PIN
369
     #endif
370
     #endif
370
 
371
 
371
     #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
372
     #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
372
     #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
373
     #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
373
-    #define BOARD_ST7920_DELAY_3    DELAY_NS(600)
374
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
374
 
375
 
375
   #endif // !MKS_MINI_12864
376
   #endif // !MKS_MINI_12864
376
 
377
 
377
 #endif // HAS_WIRED_LCD
378
 #endif // HAS_WIRED_LCD
379
+
380
+#if ANY(TFT_COLOR_UI, TFT_CLASSIC_UI, HAS_WIRED_LCD)
381
+  #define BEEPER_PIN                 EXP1_10_PIN
382
+  #define BTN_EN1                    EXP2_08_PIN
383
+  #define BTN_EN2                    EXP2_06_PIN
384
+  #define BTN_ENC                    EXP1_09_PIN
385
+#endif

+ 104
- 85
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h View File

41
 // Use one of these or SDCard-based Emulation will be used
41
 // Use one of these or SDCard-based Emulation will be used
42
 //#define SRAM_EEPROM_EMULATION                   // Use BackSRAM-based EEPROM emulation
42
 //#define SRAM_EEPROM_EMULATION                   // Use BackSRAM-based EEPROM emulation
43
 //#define FLASH_EEPROM_EMULATION                  // Use Flash-based EEPROM emulation
43
 //#define FLASH_EEPROM_EMULATION                  // Use Flash-based EEPROM emulation
44
-#define I2C_EEPROM
45
-#define MARLIN_EEPROM_SIZE                0x1000  // 4KB
46
-#define I2C_SCL_PIN                         PB6
47
-#define I2C_SDA_PIN                         PB7
44
+#if EITHER(NO_EEPROM_SELECTED, I2C_EEPROM)
45
+  #define I2C_EEPROM
46
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
47
+  #define I2C_SCL_PIN                       PB6
48
+  #define I2C_SDA_PIN                       PB7
49
+#endif
48
 
50
 
49
 //
51
 //
50
 // Release PB4 (Z_DIR_PIN) from JTAG NRST role
52
 // Release PB4 (Z_DIR_PIN) from JTAG NRST role
253
   #define SD_DETECT_PIN                     PD12
255
   #define SD_DETECT_PIN                     PD12
254
 #endif
256
 #endif
255
 
257
 
256
-//
257
-// LCD SD
258
-//
259
-#if SD_CONNECTION_IS(LCD)
260
-  #define ENABLE_SPI1
261
-  #define SDSS                              PE10
262
-  #define SD_SCK_PIN                        PA5
263
-  #define SD_MISO_PIN                       PA6
264
-  #define SD_MOSI_PIN                       PA7
265
-  #define SD_DETECT_PIN                     PE12
266
-#endif
267
-
268
-//
269
-// LCD / Controller
270
 #define SPI_FLASH
258
 #define SPI_FLASH
271
-#define HAS_SPI_FLASH                          1
272
-#define SPI_DEVICE                             2
273
-#define SPI_FLASH_SIZE                 0x1000000
274
 #if ENABLED(SPI_FLASH)
259
 #if ENABLED(SPI_FLASH)
260
+  #define HAS_SPI_FLASH                        1
261
+  #define SPI_DEVICE                           2
262
+  #define SPI_FLASH_SIZE               0x1000000
275
   #define SPI_FLASH_CS_PIN                  PB12
263
   #define SPI_FLASH_CS_PIN                  PB12
276
   #define SPI_FLASH_MOSI_PIN                PC3
264
   #define SPI_FLASH_MOSI_PIN                PC3
277
   #define SPI_FLASH_MISO_PIN                PC2
265
   #define SPI_FLASH_MISO_PIN                PC2
279
 #endif
267
 #endif
280
 
268
 
281
 /**
269
 /**
282
- *                _____                                             _____
283
- *   (BEEPER)PC5 | · · | PE13(BTN_ENC)             (SPI1 MISO) PA6 | · · | PA5 (SPI1 SCK)
284
- *  (LCD_EN)PD13 | · · | PC6(LCD_RS)                 (BTN_EN1) PE8 | · · | PE10 (SPI1 CS)
285
- *  (LCD_D4)PE14 | · ·   PE15(LCD_D5)               (BTN_EN2) PE11 | · ·   PA7 (SPI1 MOSI)
286
- *  (LCD_D6)PD11 | · · | PD10(LCD_D7)               (SPI1_RS) PE12 | · · | RESET
287
- *           GND | · · | 5V                                    GND | · · | 3.3V
288
- *                 ̄ ̄ ̄                                              ̄ ̄ ̄
289
- *                EXP1                                               EXP2
270
+ *                ------                                     ------
271
+ * (BEEPER)  PC5 |10  9 | PE13 (BTN_ENC)   (SPI1 MISO)  PA6 |10  9 | PA5  (SPI1 SCK)
272
+ * (LCD_EN) PD13 | 8  7 | PC6  (LCD_RS)      (BTN_EN1)  PE8 | 8  7 | PE10 (SPI1 CS)
273
+ * (LCD_D4) PE14   6  5 | PE15 (LCD_D5)      (BTN_EN2) PE11   6  5 | PA7  (SPI1 MOSI)
274
+ * (LCD_D6) PD11 | 4  3 | PD10 (LCD_D7)      (SPI1_RS) PE12 | 4  3 | RESET
275
+ *           GND | 2  1 | 5V                            GND | 2  1 | 3.3V
276
+ *                ------                                     ------
277
+ *                 EXP1                                       EXP2
290
  */
278
  */
291
 
279
 
292
-#if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI)
293
-  #ifndef TOUCH_CALIBRATION_X
294
-    #define TOUCH_CALIBRATION_X           -17253
295
-  #endif
296
-  #ifndef TOUCH_CALIBRATION_Y
297
-    #define TOUCH_CALIBRATION_Y            11579
298
-  #endif
299
-  #ifndef TOUCH_OFFSET_X
300
-    #define TOUCH_OFFSET_X                   514
301
-  #endif
302
-  #ifndef TOUCH_OFFSET_Y
303
-    #define TOUCH_OFFSET_Y                   -24
304
-  #endif
305
-  #ifndef TOUCH_ORIENTATION
306
-    #define TOUCH_ORIENTATION    TOUCH_LANDSCAPE
307
-  #endif
280
+#define EXP1_03_PIN                         PD10
281
+#define EXP1_04_PIN                         PD11
282
+#define EXP1_05_PIN                         PE15
283
+#define EXP1_06_PIN                         PE14
284
+#define EXP1_07_PIN                         PC6
285
+#define EXP1_08_PIN                         PD13
286
+#define EXP1_09_PIN                         PE13
287
+#define EXP1_10_PIN                         PC5
288
+
289
+#define EXP2_03_PIN                         -1    // RESET
290
+#define EXP2_04_PIN                         PE12
291
+#define EXP2_05_PIN                         PA7
292
+#define EXP2_06_PIN                         PE11
293
+#define EXP2_07_PIN                         PE10
294
+#define EXP2_08_PIN                         PE8
295
+#define EXP2_09_PIN                         PA5
296
+#define EXP2_10_PIN                         PA6
297
+
298
+//
299
+// SPI SD Card
300
+//
301
+#if SD_CONNECTION_IS(LCD)
302
+  #define ENABLE_SPI1
303
+  #define SDSS                       EXP2_07_PIN
304
+  #define SD_SCK_PIN                 EXP2_09_PIN
305
+  #define SD_MISO_PIN                EXP2_10_PIN
306
+  #define SD_MOSI_PIN                EXP2_05_PIN
307
+  #define SD_DETECT_PIN              EXP2_04_PIN
308
+#endif
308
 
309
 
309
-  #define TFT_CS_PIN                        PD11
310
-  #define TFT_SCK_PIN                       PA5
311
-  #define TFT_MISO_PIN                      PA6
312
-  #define TFT_MOSI_PIN                      PA7
313
-  #define TFT_DC_PIN                        PD10
314
-  #define TFT_RST_PIN                       PC6
310
+//
311
+// LCD / Controller
312
+//
313
+#if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI)
314
+  #define TFT_CS_PIN                 EXP1_04_PIN
315
+  #define TFT_SCK_PIN                EXP2_09_PIN
316
+  #define TFT_MISO_PIN               EXP2_10_PIN
317
+  #define TFT_MOSI_PIN               EXP2_05_PIN
318
+  #define TFT_DC_PIN                 EXP1_03_PIN
319
+  #define TFT_RST_PIN                EXP1_07_PIN
315
   #define TFT_A0_PIN                  TFT_DC_PIN
320
   #define TFT_A0_PIN                  TFT_DC_PIN
316
 
321
 
317
-  #define TFT_RESET_PIN                     PC6
318
-  #define TFT_BACKLIGHT_PIN                 PD13
322
+  #define TFT_RESET_PIN              EXP1_07_PIN
323
+  #define TFT_BACKLIGHT_PIN          EXP1_08_PIN
319
 
324
 
320
   #define TOUCH_BUTTONS_HW_SPI
325
   #define TOUCH_BUTTONS_HW_SPI
321
   #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
326
   #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
322
 
327
 
323
-  #define LCD_BACKLIGHT_PIN                 PD13
328
+  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
324
   #ifndef TFT_WIDTH
329
   #ifndef TFT_WIDTH
325
     #define TFT_WIDTH                        480
330
     #define TFT_WIDTH                        480
326
   #endif
331
   #endif
328
     #define TFT_HEIGHT                       320
333
     #define TFT_HEIGHT                       320
329
   #endif
334
   #endif
330
 
335
 
331
-  #define TOUCH_CS_PIN                      PE14  // SPI1_NSS
332
-  #define TOUCH_SCK_PIN                     PA5   // SPI1_SCK
333
-  #define TOUCH_MISO_PIN                    PA6   // SPI1_MISO
334
-  #define TOUCH_MOSI_PIN                    PA7   // SPI1_MOSI
335
-
336
-  #define BTN_EN1                           PE8
337
-  #define BTN_EN2                           PE11
338
-  #define BEEPER_PIN                        PC5
339
-  #define BTN_ENC                           PE13
336
+  #define TOUCH_CS_PIN               EXP1_06_PIN  // SPI1_NSS
337
+  #define TOUCH_SCK_PIN              EXP2_09_PIN  // SPI1_SCK
338
+  #define TOUCH_MISO_PIN             EXP2_10_PIN  // SPI1_MISO
339
+  #define TOUCH_MOSI_PIN             EXP2_05_PIN  // SPI1_MOSI
340
 
340
 
341
   #define LCD_READ_ID                       0xD3
341
   #define LCD_READ_ID                       0xD3
342
   #define LCD_USE_DMA_SPI
342
   #define LCD_USE_DMA_SPI
343
 
343
 
344
   #define TFT_BUFFER_SIZE                  14400
344
   #define TFT_BUFFER_SIZE                  14400
345
 
345
 
346
+  #ifndef TOUCH_CALIBRATION_X
347
+    #define TOUCH_CALIBRATION_X           -17253
348
+  #endif
349
+  #ifndef TOUCH_CALIBRATION_Y
350
+    #define TOUCH_CALIBRATION_Y            11579
351
+  #endif
352
+  #ifndef TOUCH_OFFSET_X
353
+    #define TOUCH_OFFSET_X                   514
354
+  #endif
355
+  #ifndef TOUCH_OFFSET_Y
356
+    #define TOUCH_OFFSET_Y                   -24
357
+  #endif
358
+  #ifndef TOUCH_ORIENTATION
359
+    #define TOUCH_ORIENTATION    TOUCH_LANDSCAPE
360
+  #endif
361
+
346
 #elif HAS_WIRED_LCD
362
 #elif HAS_WIRED_LCD
347
 
363
 
348
-  #define BEEPER_PIN                        PC5
349
-  #define BTN_ENC                           PE13
350
-  #define LCD_PINS_ENABLE                   PD13
351
-  #define LCD_PINS_RS                       PC6
352
-  #define BTN_EN1                           PE8
353
-  #define BTN_EN2                           PE11
364
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
365
+  #define LCD_PINS_RS                EXP1_07_PIN
354
   #define LCD_BACKLIGHT_PIN                 -1
366
   #define LCD_BACKLIGHT_PIN                 -1
355
 
367
 
356
   // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
368
   // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
357
   #if ENABLED(MKS_MINI_12864)
369
   #if ENABLED(MKS_MINI_12864)
358
     //#define LCD_BACKLIGHT_PIN             -1
370
     //#define LCD_BACKLIGHT_PIN             -1
359
     //#define LCD_RESET_PIN                 -1
371
     //#define LCD_RESET_PIN                 -1
360
-    #define DOGLCD_A0                       PD11
361
-    #define DOGLCD_CS                       PE15
362
-    //#define DOGLCD_SCK                    PA5
363
-    //#define DOGLCD_MOSI                   PA7
372
+    #define DOGLCD_A0                EXP1_04_PIN
373
+    #define DOGLCD_CS                EXP1_05_PIN
374
+    //#define DOGLCD_SCK             EXP2_09_PIN
375
+    //#define DOGLCD_MOSI            EXP2_05_PIN
364
 
376
 
365
     // Required for MKS_MINI_12864 with this board
377
     // Required for MKS_MINI_12864 with this board
366
     //#define MKS_LCD12864B
378
     //#define MKS_LCD12864B
367
     //#undef SHOW_BOOTSCREEN
379
     //#undef SHOW_BOOTSCREEN
368
 
380
 
369
   #elif ENABLED(MKS_MINI_12864_V3)
381
   #elif ENABLED(MKS_MINI_12864_V3)
370
-    #define DOGLCD_CS                       PD13
371
-    #define DOGLCD_A0                       PC6
382
+    #define DOGLCD_CS                EXP1_08_PIN
383
+    #define DOGLCD_A0                EXP1_07_PIN
372
     #define LCD_PINS_DC                DOGLCD_A0
384
     #define LCD_PINS_DC                DOGLCD_A0
373
     #define LCD_BACKLIGHT_PIN               -1
385
     #define LCD_BACKLIGHT_PIN               -1
374
-    #define LCD_RESET_PIN                   PE14
375
-    #define NEOPIXEL_PIN                    PE15
376
-    #define DOGLCD_MOSI                     PA7
377
-    #define DOGLCD_SCK                      PA5
386
+    #define LCD_RESET_PIN            EXP1_06_PIN
387
+    #define NEOPIXEL_PIN             EXP1_05_PIN
388
+    #define DOGLCD_MOSI              EXP2_05_PIN
389
+    #define DOGLCD_SCK               EXP2_09_PIN
378
     #if SD_CONNECTION_IS(ONBOARD)
390
     #if SD_CONNECTION_IS(ONBOARD)
379
       #define FORCE_SOFT_SPI
391
       #define FORCE_SOFT_SPI
380
     #endif
392
     #endif
381
 	//#define LCD_SCREEN_ROT_180
393
 	//#define LCD_SCREEN_ROT_180
382
 
394
 
383
-  #else // !MKS_MINI_12864
395
+  #else                                           // !MKS_MINI_12864
384
 
396
 
385
-    #define LCD_PINS_D4                     PE14
397
+    #define LCD_PINS_D4              EXP1_06_PIN
386
     #if ENABLED(ULTIPANEL)
398
     #if ENABLED(ULTIPANEL)
387
-      #define LCD_PINS_D5                   PE15
388
-      #define LCD_PINS_D6                   PD11
389
-      #define LCD_PINS_D7                   PD10
399
+      #define LCD_PINS_D5            EXP1_05_PIN
400
+      #define LCD_PINS_D6            EXP1_04_PIN
401
+      #define LCD_PINS_D7            EXP1_03_PIN
390
     #endif
402
     #endif
391
 
403
 
392
     #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
404
     #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
393
     #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
405
     #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
394
-    #define BOARD_ST7920_DELAY_3    DELAY_NS(600)
406
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
395
 
407
 
396
   #endif // !MKS_MINI_12864
408
   #endif // !MKS_MINI_12864
397
 
409
 
398
 #endif // HAS_WIRED_LCD
410
 #endif // HAS_WIRED_LCD
411
+
412
+#if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI, HAS_WIRED_LCD)
413
+  #define BEEPER_PIN                 EXP1_10_PIN
414
+  #define BTN_EN1                    EXP2_08_PIN
415
+  #define BTN_EN2                    EXP2_06_PIN
416
+  #define BTN_ENC                    EXP1_09_PIN
417
+#endif

+ 5
- 11
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h View File

258
 #endif
258
 #endif
259
 
259
 
260
 /**
260
 /**
261
- *                _____                                             _____
261
+ *                -----                                             -----
262
  *   (BEEPER)PC5 | · · | PE13(BTN_ENC)             (SPI1 MISO) PA6 | · · | PA5 (SPI1 SCK)
262
  *   (BEEPER)PC5 | · · | PE13(BTN_ENC)             (SPI1 MISO) PA6 | · · | PA5 (SPI1 SCK)
263
  *  (LCD_EN)PD13 | · · | PC6(LCD_RS)                 (BTN_EN1) PE8 | · · | PE10 (SPI1 CS)
263
  *  (LCD_EN)PD13 | · · | PC6(LCD_RS)                 (BTN_EN1) PE8 | · · | PE10 (SPI1 CS)
264
  *  (LCD_D4)PE14 | · · | PE15(LCD_D5)               (BTN_EN2) PE11 | · · | PA7 (SPI1 MOSI)
264
  *  (LCD_D4)PE14 | · · | PE15(LCD_D5)               (BTN_EN2) PE11 | · · | PA7 (SPI1 MOSI)
265
  *  (LCD_D6)PD11 | · · | PD10(LCD_D7)               (SPI DET) PE12 | · · | RESET
265
  *  (LCD_D6)PD11 | · · | PD10(LCD_D7)               (SPI DET) PE12 | · · | RESET
266
  *           GND | · · | 5V                                    GND | · · | 3.3V
266
  *           GND | · · | 5V                                    GND | · · | 3.3V
267
- *                 ̄ ̄ ̄                                              ̄ ̄ ̄
267
+ *                -----                                             -----
268
  *                EXP1                                               EXP2
268
  *                EXP1                                               EXP2
269
  */
269
  */
270
 
270
 
355
       #define LCD_PINS_D7                   PD10
355
       #define LCD_PINS_D7                   PD10
356
     #endif
356
     #endif
357
 
357
 
358
-    #ifndef ST7920_DELAY_1
359
-    #define ST7920_DELAY_1          DELAY_NS(96)
360
-    #endif
361
-    #ifndef ST7920_DELAY_2
362
-      #define ST7920_DELAY_2        DELAY_NS(48)
363
-    #endif
364
-    #ifndef ST7920_DELAY_3
365
-      #define ST7920_DELAY_3       DELAY_NS(600)
366
-    #endif
358
+    #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
359
+    #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
360
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
367
 
361
 
368
   #endif // !MKS_MINI_12864
362
   #endif // !MKS_MINI_12864
369
 
363
 

Loading…
Cancel
Save