Procházet zdrojové kódy

🎨 Update more EXP Headers

Scott Lahteine před 2 roky
rodič
revize
6d3dec8b63

+ 6
- 5
Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h Zobrazit soubor

27
 
27
 
28
 #include "env_validate.h"
28
 #include "env_validate.h"
29
 
29
 
30
-#define BOARD_INFO_NAME "AZSMZ MINI"
30
+#define BOARD_INFO_NAME "AZSMZ Mini"
31
 
31
 
32
 //
32
 //
33
 // Servos
33
 // Servos
76
 //
76
 //
77
 // Heaters / Fans
77
 // Heaters / Fans
78
 //
78
 //
79
+
79
 // EFB
80
 // EFB
80
 #define HEATER_0_PIN                       P2_04
81
 #define HEATER_0_PIN                       P2_04
81
 #define HEATER_BED_PIN                     P2_05
82
 #define HEATER_BED_PIN                     P2_05
117
 //
118
 //
118
 // Ethernet pins
119
 // Ethernet pins
119
 //
120
 //
121
+#define REF_CLK                            P1_15
120
 #define ENET_MDIO                          P1_17
122
 #define ENET_MDIO                          P1_17
121
-#define ENET_RX_ER                         P1_14
122
-#define ENET_RXD1                          P1_10
123
 #define ENET_MOC                           P1_16
123
 #define ENET_MOC                           P1_16
124
-#define REF_CLK                            P1_15
125
-#define ENET_RXD0                          P1_09
126
 #define ENET_CRS                           P1_08
124
 #define ENET_CRS                           P1_08
125
+#define ENET_RX_ER                         P1_14
127
 #define ENET_TX_EN                         P1_04
126
 #define ENET_TX_EN                         P1_04
127
+#define ENET_RXD0                          P1_09
128
+#define ENET_RXD1                          P1_10
128
 #define ENET_TXD0                          P1_00
129
 #define ENET_TXD0                          P1_00
129
 #define ENET_TXD1                          P1_01
130
 #define ENET_TXD1                          P1_01
130
 
131
 

+ 12
- 13
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h Zobrazit soubor

53
 #define E0_ENABLE_PIN                      P2_12
53
 #define E0_ENABLE_PIN                      P2_12
54
 
54
 
55
 
55
 
56
-/**
57
- *          ------                    ------
58
- *      NC | 1  2 | GND           5V | 1  2 | GND
59
- *   RESET | 3  4 | 1.31          NC | 3  4 | NC
60
- *    0.18 | 5  6   3.25          NC | 5  6   0.15
61
- *    1.23 | 7  8 | 3.26        0.16 | 7  8 | 0.18
62
- *    0.15 | 9 10 | 0.17        2.11 | 9 10 | 1.30
63
- *          ------                    ------
64
- *           EXP2                      EXP1
56
+/**        ------                  ------
57
+ *   1.30 |10  9 | 2.11      0.17 |10  9 | 0.15
58
+ *   0.18 | 8  7 | 0.16      3.26 | 8  7 | 1.23
59
+ *   0.15   6  5 | NC        3.25   6  5 | 0.18
60
+ *     NC | 4  3 | NC        1.31 | 4  3 | RESET
61
+ *    GND | 2  1 | 5V         GND | 2  1 | NC
62
+ *         ------                  ------
63
+ *          EXP1                    EXP2
65
  */
64
  */
66
-#define EXP1_03_PIN                        -1
67
-#define EXP1_04_PIN                        -1
68
-#define EXP1_05_PIN                        -1
65
+#define EXP1_03_PIN                        -1     // NC
66
+#define EXP1_04_PIN                        -1     // NC
67
+#define EXP1_05_PIN                        -1     // NC
69
 #define EXP1_06_PIN                        P0_15
68
 #define EXP1_06_PIN                        P0_15
70
 #define EXP1_07_PIN                        P0_16
69
 #define EXP1_07_PIN                        P0_16
71
 #define EXP1_08_PIN                        P0_18
70
 #define EXP1_08_PIN                        P0_18
72
 #define EXP1_09_PIN                        P2_11
71
 #define EXP1_09_PIN                        P2_11
73
 #define EXP1_10_PIN                        P1_30
72
 #define EXP1_10_PIN                        P1_30
74
 
73
 
75
-#define EXP2_03_PIN                        -1
74
+#define EXP2_03_PIN                        -1     // RESET
76
 #define EXP2_04_PIN                        P1_31
75
 #define EXP2_04_PIN                        P1_31
77
 #define EXP2_05_PIN                        P0_18
76
 #define EXP2_05_PIN                        P0_18
78
 #define EXP2_06_PIN                        P3_25
77
 #define EXP2_06_PIN                        P3_25

+ 5
- 4
Marlin/src/pins/lpc1768/pins_MKS_SBASE.h Zobrazit soubor

215
  * that the garbage/lines are erased immediately after the SD card accesses are completed.
215
  * that the garbage/lines are erased immediately after the SD card accesses are completed.
216
  */
216
  */
217
 
217
 
218
+//
219
+// LCD / Controller
220
+//
218
 #if IS_TFTGLCD_PANEL
221
 #if IS_TFTGLCD_PANEL
219
 
222
 
220
   #if ENABLED(TFTGLCD_PANEL_SPI)
223
   #if ENABLED(TFTGLCD_PANEL_SPI)
341
 #endif
344
 #endif
342
 
345
 
343
 // UNUSED
346
 // UNUSED
344
-#define PIN_P0_27                          P0_27  // EXP2/Onboard SD
345
-#define PIN_P0_28                          P0_28  // EXP2
346
-#define PIN_P0_02                          P0_02  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
347
-#define PIN_P0_03                          P0_03  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
347
+//#define PIN_P0_02                        P0_02  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
348
+//#define PIN_P0_03                        P0_03  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
348
 
349
 
349
 /**
350
 /**
350
  *  PWMs
351
  *  PWMs

+ 8
- 9
Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h Zobrazit soubor

255
   #define LED4_PIN                         P1_21
255
   #define LED4_PIN                         P1_21
256
 #endif
256
 #endif
257
 
257
 
258
-/**
259
- *                -----                                            -----
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)
262
- * (LCD_D4) 0.15 | · · | 0.17 (LCD_D5)             (BTN_EN2) 3.26 | · · | 0.9  (SD_MOSI)
263
- * (LCD_D6)  1.0 | · · | 1.22 (LCD_D7)           (SD_DETECT) 0.27 | · · | RST
264
- *           GND | · · | 5V                                   GND | · · | NC
265
- *                -----                                            -----
266
- *                EXP1                                             EXP2
258
+/**                ------                                     ------
259
+ *  (BEEPER) 1.31 |10  9 | 1.30 (BTN_ENC)        (MISO) 0.8  |10  9 | 0.7  (SD_SCK)
260
+ *  (LCD_EN) 0.18 | 8  7 | 0.16 (LCD_RS)      (BTN_EN1) 3.25 | 8  7 | 0.28 (SD_CS2)
261
+ *  (LCD_D4) 0.15 | 6  5 | 0.17 (LCD_D5)      (BTN_EN2) 3.26 | 6  5 | 0.9  (SD_MOSI)
262
+ *  (LCD_D6)  1.0 | 4  3 | 1.22 (LCD_D7)    (SD_DETECT) 0.27 | 4  3 | RST
263
+ *            GND | 2  1 | 5V                            GND | 2  1 | NC
264
+ *                 ------                                     ------
265
+ *                  EXP1                                       EXP2
267
  */
266
  */
268
 #define EXP1_03_PIN                        P1_22
267
 #define EXP1_03_PIN                        P1_22
269
 #define EXP1_04_PIN                        P1_00
268
 #define EXP1_04_PIN                        P1_00

+ 1
- 1
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h Zobrazit soubor

96
 /**                ------                                    ------
96
 /**                ------                                    ------
97
  *  (BEEPER) PC10 |10  9 | PC11 (BTN_ENC)        (MISO) PB4 |10  9 | PB3   (SCK)
97
  *  (BEEPER) PC10 |10  9 | PC11 (BTN_ENC)        (MISO) PB4 |10  9 | PB3   (SCK)
98
  *  (LCD_EN) PB6  | 8  7 | PC12  (LCD_RS)     (BTN_EN1) PD2 | 8  7 | PA15  (SD_SS)
98
  *  (LCD_EN) PB6  | 8  7 | PC12  (LCD_RS)     (BTN_EN1) PD2 | 8  7 | PA15  (SD_SS)
99
- *  (LCD_D4) PC13 | 6  5 | PB7   (LCD_D5)     (BTN_EN2) PB8 | 6  5 | PB5   (MOSI)
99
+ *  (LCD_D4) PC13   6  5 | PB7   (LCD_D5)     (BTN_EN2) PB8   6  5 | PB5   (MOSI)
100
  *  (LCD_D6) PC15 | 4  3 | PC14  (LCD_D7)   (SD_DETECT) PB9 | 4  3 | RESET
100
  *  (LCD_D6) PC15 | 4  3 | PC14  (LCD_D7)   (SD_DETECT) PB9 | 4  3 | RESET
101
  *           GND  | 2  1 | 5V                           GND | 2  1 | NC
101
  *           GND  | 2  1 | 5V                           GND | 2  1 | NC
102
  *                 ------                                    ------
102
  *                 ------                                    ------

+ 2
- 2
Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h Zobrazit soubor

165
      *        ------
165
      *        ------
166
      *  PC6  |10  9 | PB2
166
      *  PC6  |10  9 | PB2
167
      *  PB10 | 8  7 | PE8
167
      *  PB10 | 8  7 | PE8
168
-     *  PB14 | 6  5 | PB13
168
+     *  PB14   6  5 | PB13
169
      *  PB12 | 4  3 | PB15
169
      *  PB12 | 4  3 | PB15
170
      *  GND  | 2  1 | 5V
170
      *  GND  | 2  1 | 5V
171
      *        ------
171
      *        ------
189
      *        ------
189
      *        ------
190
      *  ?    |10  9 | PC5
190
      *  ?    |10  9 | PC5
191
      *  PB10 | 8  7 | ?
191
      *  PB10 | 8  7 | ?
192
-     *  PA6  | 6  5 | PA5
192
+     *  PA6    6  5 | PA5
193
      *  PA4  | 4  3 | PA7
193
      *  PA4  | 4  3 | PA7
194
      *  GND  | 2  1 | 5V
194
      *  GND  | 2  1 | 5V
195
      *        ------
195
      *        ------

+ 8
- 4
Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h Zobrazit soubor

294
   #define TFT_BACKLIGHT_PIN                 PD13
294
   #define TFT_BACKLIGHT_PIN                 PD13
295
 
295
 
296
   #define LCD_USE_DMA_FSMC                        // Use DMA transfers to send data to the TFT
296
   #define LCD_USE_DMA_FSMC                        // Use DMA transfers to send data to the TFT
297
-  #define FSMC_CS_PIN                       PD7   // NE4
298
-  #define FSMC_RS_PIN                       PD11  // A0
299
   #define FSMC_DMA_DEV                      DMA2
297
   #define FSMC_DMA_DEV                      DMA2
300
   #define FSMC_DMA_CHANNEL               DMA_CH5
298
   #define FSMC_DMA_CHANNEL               DMA_CH5
301
 
299
 
302
-  #define TFT_CS_PIN                  TFT_CS_PIN
303
-  #define TFT_RS_PIN                  TFT_RS_PIN
300
+  #define FSMC_CS_PIN                       PD7   // NE4
301
+  #define FSMC_RS_PIN                       PD11  // A0
302
+
303
+  #define TFT_CS_PIN                 FSMC_CS_PIN
304
+  #define TFT_RS_PIN                 FSMC_RS_PIN
304
 
305
 
305
   #ifdef TFT_CLASSIC_UI
306
   #ifdef TFT_CLASSIC_UI
306
     #define TFT_MARLINBG_COLOR            0x3186  // Grey
307
     #define TFT_MARLINBG_COLOR            0x3186  // Grey
309
     #define TFT_BTOKMENU_COLOR            0x145F  // Cyan
310
     #define TFT_BTOKMENU_COLOR            0x145F  // Cyan
310
   #endif
311
   #endif
311
   #define TFT_BUFFER_SIZE                  14400
312
   #define TFT_BUFFER_SIZE                  14400
313
+
312
 #elif HAS_GRAPHICAL_TFT
314
 #elif HAS_GRAPHICAL_TFT
315
+
313
   #define TFT_RESET_PIN                     PC6
316
   #define TFT_RESET_PIN                     PC6
314
   #define TFT_BACKLIGHT_PIN                 PD13
317
   #define TFT_BACKLIGHT_PIN                 PD13
315
   #define TFT_CS_PIN                        PD7   // NE4
318
   #define TFT_CS_PIN                        PD7   // NE4
316
   #define TFT_RS_PIN                        PD11  // A0
319
   #define TFT_RS_PIN                        PD11  // A0
320
+
317
 #endif
321
 #endif
318
 
322
 
319
 #if NEED_TOUCH_PINS
323
 #if NEED_TOUCH_PINS

+ 41
- 31
Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h Zobrazit soubor

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

+ 1
- 1
Marlin/src/pins/stm32f4/pins_FYSETC_S6.h Zobrazit soubor

195
  *         ------                 ------
195
  *         ------                 ------
196
  *   PC9  |10  9 | PA8      PA6  |10  9 | PA5
196
  *   PC9  |10  9 | PA8      PA6  |10  9 | PA5
197
  *   PC11 | 8  7 | PD2      PC6  | 8  7 | PA4
197
  *   PC11 | 8  7 | PD2      PC6  | 8  7 | PA4
198
- *   PC10 | 6  5   PC12     PC7  | 6  5   PA7
198
+ *   PC10   6  5 | PC12     PC7    6  5 | PA7
199
  *   PD0  | 4  3 | PD1      PB10 | 4  3 | RESET
199
  *   PD0  | 4  3 | PD1      PB10 | 4  3 | RESET
200
  *   GND  | 2  1 | 5V       GND  | 2  1 | 5V
200
  *   GND  | 2  1 | 5V       GND  | 2  1 | 5V
201
  *         ------                 ------
201
  *         ------                 ------

+ 1
- 1
Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h Zobrazit soubor

237
  *                  ------                                      ------
237
  *                  ------                                      ------
238
  *   (BEEPER) PB2  |10  9 | PE10 (BTN_ENC)    (SPI1 MISO) PA6  |10  9 | PA5 (SPI1 SCK)
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)
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)
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
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
242
  *            GND  | 2  1 | 5V                             GND | 2  1 | 3.3V
243
  *                  ------                                      ------
243
  *                  ------                                      ------

+ 69
- 53
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h Zobrazit soubor

215
 // Onboard SD card
215
 // Onboard SD card
216
 // NOT compatible with LCD
216
 // NOT compatible with LCD
217
 //
217
 //
218
-// detect pin doesn't work when ONBOARD and NO_SD_HOST_DRIVE disabled
219
-#if !defined(SDCARD_CONNECTION) || SDCARD_CONNECTION == ONBOARD
218
+// Detect pin doesn't work when ONBOARD and NO_SD_HOST_DRIVE disabled
219
+#if SD_CONNECTION_IS(ONBOARD)
220
   #if USE_NEW_SPI_API
220
   #if USE_NEW_SPI_API
221
     #define SD_SPI MARLIN_SPI(HardwareSPI3, PC9)
221
     #define SD_SPI MARLIN_SPI(HardwareSPI3, PC9)
222
   #else
222
   #else
230
   #define SD_DETECT_PIN                     PD12
230
   #define SD_DETECT_PIN                     PD12
231
 #endif
231
 #endif
232
 
232
 
233
-/*
233
+/**               ------                                      ------
234
+ * (BEEPER) PC5  |10  9 | PE13 (BTN_ENC)    (SPI1 MISO) PA6  |10  9 | PA5  (SPI1 SCK)
235
+ * (LCD_EN) PD13 | 8  7 | PC6  (LCD_RS)       (BTN_EN1) PE8  | 8  7 | PE10 (SPI1 CS)
236
+ * (LCD_D4) PE14   6  5 | PE15 (LCD_D5)       (BTN_EN2) PE11   6  5 | PA7  (SPI1 MOSI)
237
+ * (LCD_D6) PD11 | 4  3 | PD10 (LCD_D7)       (SPI DET) PE12 | 4  3 | RESET
238
+ *           GND | 2  1 | 5V                             GND | 2  1 | 3.3V
239
+ *                ------                                      ------
240
+ *                 EXP1                                        EXP2
241
+ */
242
+#define EXP1_03_PIN                     PD10
243
+#define EXP1_04_PIN                     PD11
244
+#define EXP1_05_PIN                     PE15
245
+#define EXP1_06_PIN                     PE14
246
+#define EXP1_07_PIN                     PC6
247
+#define EXP1_08_PIN                     PD13
248
+#define EXP1_09_PIN                     PE13
249
+#define EXP1_10_PIN                     PC5
250
+
251
+#define EXP2_03_PIN                     -1    // RESET
252
+#define EXP2_04_PIN                     PE12
253
+#define EXP2_05_PIN                     PA7
254
+#define EXP2_06_PIN                     PE11
255
+#define EXP2_07_PIN                     PE10
256
+#define EXP2_08_PIN                     PE8
257
+#define EXP2_09_PIN                     PA5
258
+#define EXP2_10_PIN                     PA6
259
+
234
 //
260
 //
235
 // LCD SD
261
 // LCD SD
236
 //
262
 //
237
-#if SDCARD_CONNECTION == LCD
263
+/*
264
+#if SD_CONNECTION_IS(LCD)
238
   #define ENABLE_SPI1
265
   #define ENABLE_SPI1
239
-  #define SDSS                              PE10
240
-  #define SD_SCK_PIN                        PA5
241
-  #define SD_MISO_PIN                       PA6
242
-  #define SD_MOSI_PIN                       PA7
243
-  #define SD_DETECT_PIN                     PE12
266
+  #define SDSS                       EXP2_07_PIN
267
+  #define SD_SCK_PIN                 EXP2_09_PIN
268
+  #define SD_MISO_PIN                EXP2_10_PIN
269
+  #define SD_MOSI_PIN                EXP2_05_PIN
270
+  #define SD_DETECT_PIN              EXP2_04_PIN
244
 #endif
271
 #endif
245
 */
272
 */
246
 
273
 
257
   #define SPI_FLASH_SCK_PIN                 PB13
284
   #define SPI_FLASH_SCK_PIN                 PB13
258
 #endif
285
 #endif
259
 
286
 
260
-/**
261
- *                -----                                             -----
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)
264
- *  (LCD_D4)PE14 | · · | PE15(LCD_D5)               (BTN_EN2) PE11 | · · | PA7 (SPI1 MOSI)
265
- *  (LCD_D6)PD11 | · · | PD10(LCD_D7)               (SPI DET) PE12 | · · | RESET
266
- *           GND | · · | 5V                                    GND | · · | 3.3V
267
- *                -----                                             -----
268
- *                EXP1                                               EXP2
269
- */
270
-
271
 #if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI)
287
 #if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI)
272
   #ifndef TOUCH_CALIBRATION_X
288
   #ifndef TOUCH_CALIBRATION_X
273
     #define TOUCH_CALIBRATION_X           -17253
289
     #define TOUCH_CALIBRATION_X           -17253
285
     #define TOUCH_ORIENTATION    TOUCH_LANDSCAPE
301
     #define TOUCH_ORIENTATION    TOUCH_LANDSCAPE
286
   #endif
302
   #endif
287
 
303
 
288
-  #define TFT_CS_PIN                        PD11
289
-  #define TFT_SCK_PIN                       PA5
290
-  #define TFT_MISO_PIN                      PA6
291
-  #define TFT_MOSI_PIN                      PA7
292
-  #define TFT_DC_PIN                        PD10
293
-  #define TFT_RST_PIN                       PC6
304
+  #define TFT_CS_PIN                 EXP1_04_PIN
305
+  #define TFT_SCK_PIN                EXP2_09_PIN
306
+  #define TFT_MISO_PIN               EXP2_10_PIN
307
+  #define TFT_MOSI_PIN               EXP2_05_PIN
308
+  #define TFT_DC_PIN                 EXP1_03_PIN
309
+  #define TFT_RST_PIN                EXP1_07_PIN
294
   #define TFT_A0_PIN                  TFT_DC_PIN
310
   #define TFT_A0_PIN                  TFT_DC_PIN
295
 
311
 
296
-  #define TFT_RESET_PIN                     PC6
297
-  #define TFT_BACKLIGHT_PIN                 PD13
312
+  #define TFT_RESET_PIN              EXP1_07_PIN
313
+  #define TFT_BACKLIGHT_PIN          EXP1_08_PIN
298
 
314
 
299
   #define TOUCH_BUTTONS_HW_SPI
315
   #define TOUCH_BUTTONS_HW_SPI
300
   #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
316
   #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
301
 
317
 
302
-  #define LCD_BACKLIGHT_PIN                 PD13
318
+  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
303
   #ifndef TFT_WIDTH
319
   #ifndef TFT_WIDTH
304
     #define TFT_WIDTH                        480
320
     #define TFT_WIDTH                        480
305
   #endif
321
   #endif
307
     #define TFT_HEIGHT                       320
323
     #define TFT_HEIGHT                       320
308
   #endif
324
   #endif
309
 
325
 
310
-  #define TOUCH_CS_PIN                      PE14  // SPI1_NSS
311
-  #define TOUCH_SCK_PIN                     PA5   // SPI1_SCK
312
-  #define TOUCH_MISO_PIN                    PA6   // SPI1_MISO
313
-  #define TOUCH_MOSI_PIN                    PA7   // SPI1_MOSI
326
+  #define TOUCH_CS_PIN               EXP1_06_PIN  // SPI1_NSS
327
+  #define TOUCH_SCK_PIN              EXP2_09_PIN  // SPI1_SCK
328
+  #define TOUCH_MISO_PIN             EXP2_10_PIN  // SPI1_MISO
329
+  #define TOUCH_MOSI_PIN             EXP2_05_PIN  // SPI1_MOSI
314
 
330
 
315
-  #define BTN_EN1                           PE8
316
-  #define BTN_EN2                           PE11
317
-  #define BEEPER_PIN                        PC5
318
-  #define BTN_ENC                           PE13
331
+  #define BTN_EN1                    EXP2_08_PIN
332
+  #define BTN_EN2                    EXP2_06_PIN
333
+  #define BEEPER_PIN                 EXP1_10_PIN
334
+  #define BTN_ENC                    EXP1_09_PIN
319
 
335
 
320
   #define LCD_READ_ID                       0xD3
336
   #define LCD_READ_ID                       0xD3
321
   #define LCD_USE_DMA_SPI
337
   #define LCD_USE_DMA_SPI
325
 
341
 
326
 #elif HAS_WIRED_LCD
342
 #elif HAS_WIRED_LCD
327
 
343
 
328
-  #define BEEPER_PIN                        PC5
329
-  #define BTN_ENC                           PE13
330
-  #define LCD_PINS_ENABLE                   PD13
331
-  #define LCD_PINS_RS                       PC6
332
-  #define BTN_EN1                           PE8
333
-  #define BTN_EN2                           PE11
344
+  #define BEEPER_PIN                 EXP1_10_PIN
345
+  #define BTN_ENC                    EXP1_09_PIN
346
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
347
+  #define LCD_PINS_RS                EXP1_07_PIN
348
+  #define BTN_EN1                    EXP2_08_PIN
349
+  #define BTN_EN2                    EXP2_06_PIN
334
   #define LCD_BACKLIGHT_PIN                 -1
350
   #define LCD_BACKLIGHT_PIN                 -1
335
 
351
 
336
   // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
352
   // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
337
   #if ENABLED(MKS_MINI_12864)
353
   #if ENABLED(MKS_MINI_12864)
338
     //#define LCD_BACKLIGHT_PIN             -1
354
     //#define LCD_BACKLIGHT_PIN             -1
339
     //#define LCD_RESET_PIN                 -1
355
     //#define LCD_RESET_PIN                 -1
340
-    #define DOGLCD_A0                       PD11
341
-    #define DOGLCD_CS                       PE15
342
-    //#define DOGLCD_SCK                    PA5
343
-    //#define DOGLCD_MOSI                   PA7
356
+    #define DOGLCD_A0                EXP1_04_PIN
357
+    #define DOGLCD_CS                EXP1_05_PIN
358
+    //#define DOGLCD_SCK             EXP2_09_PIN
359
+    //#define DOGLCD_MOSI            EXP2_05_PIN
344
 
360
 
345
     // Required for MKS_MINI_12864 with this board
361
     // Required for MKS_MINI_12864 with this board
346
     //#define MKS_LCD12864B
362
     //#define MKS_LCD12864B
348
 
364
 
349
   #else                                           // !MKS_MINI_12864
365
   #else                                           // !MKS_MINI_12864
350
 
366
 
351
-    #define LCD_PINS_D4                     PE14
367
+    #define LCD_PINS_D4              EXP1_06_PIN
352
     #if ENABLED(ULTIPANEL)
368
     #if ENABLED(ULTIPANEL)
353
-      #define LCD_PINS_D5                   PE15
354
-      #define LCD_PINS_D6                   PD11
355
-      #define LCD_PINS_D7                   PD10
369
+      #define LCD_PINS_D5            EXP1_05_PIN
370
+      #define LCD_PINS_D6            EXP1_04_PIN
371
+      #define LCD_PINS_D7            EXP1_03_PIN
356
     #endif
372
     #endif
357
 
373
 
358
-    #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
359
-    #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
374
+    #define BOARD_ST7920_DELAY_1   DELAY_NS( 96)
375
+    #define BOARD_ST7920_DELAY_2   DELAY_NS( 48)
360
     #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
376
     #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
361
 
377
 
362
   #endif // !MKS_MINI_12864
378
   #endif // !MKS_MINI_12864

Loading…
Zrušit
Uložit