|
@@ -38,6 +38,9 @@
|
38
|
38
|
#define BOARD_NO_NATIVE_USB
|
39
|
39
|
#define MKS_HARDWARE_TEST_ONLY_E0
|
40
|
40
|
|
|
41
|
+// Avoid conflict with TIMER_SERVO when using the STM32 HAL
|
|
42
|
+#define TEMP_TIMER 5
|
|
43
|
+
|
41
|
44
|
//
|
42
|
45
|
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
|
43
|
46
|
//
|
|
@@ -214,17 +217,23 @@
|
214
|
217
|
#define SDCARD_CONNECTION ONBOARD
|
215
|
218
|
#endif
|
216
|
219
|
|
217
|
|
-#define SDIO_SUPPORT
|
218
|
|
-#define SDIO_CLOCK 4500000 // 4.5 MHz
|
219
|
|
-#define SD_DETECT_PIN PD12
|
220
|
|
-#define ONBOARD_SD_CS_PIN PC11
|
|
220
|
+#if SD_CONNECTION_IS(ONBOARD)
|
|
221
|
+ #define SDIO_SUPPORT
|
|
222
|
+ #define SDIO_CLOCK 4500000 // 4.5 MHz
|
|
223
|
+ #define SD_DETECT_PIN PD12
|
|
224
|
+ #define ONBOARD_SD_CS_PIN PC11
|
|
225
|
+#elif SD_CONNECTION_IS(LCD)
|
|
226
|
+ #define ENABLE_SPI1
|
|
227
|
+ #define SDSS PE10
|
|
228
|
+ #define SD_SCK_PIN PA5
|
|
229
|
+ #define SD_MISO_PIN PA6
|
|
230
|
+ #define SD_MOSI_PIN PA7
|
|
231
|
+ #define SD_DETECT_PIN PE12
|
|
232
|
+#endif
|
221
|
233
|
|
222
|
234
|
//
|
223
|
235
|
// LCD / Controller
|
224
|
236
|
//
|
225
|
|
-#ifndef BEEPER_PIN
|
226
|
|
- #define BEEPER_PIN PC5
|
227
|
|
-#endif
|
228
|
237
|
|
229
|
238
|
/**
|
230
|
239
|
* Note: MKS Robin TFT screens use various TFT controllers.
|
|
@@ -261,33 +270,29 @@
|
261
|
270
|
#define TOUCH_BUTTONS_HW_SPI
|
262
|
271
|
#define TOUCH_BUTTONS_HW_SPI_DEVICE 1
|
263
|
272
|
|
264
|
|
- #ifndef TFT_WIDTH
|
265
|
|
- #define TFT_WIDTH 480
|
266
|
|
- #endif
|
267
|
|
- #ifndef TFT_HEIGHT
|
268
|
|
- #define TFT_HEIGHT 320
|
269
|
|
- #endif
|
270
|
|
-
|
271
|
|
- #define LCD_READ_ID 0xD3
|
272
|
273
|
#define LCD_USE_DMA_SPI
|
273
|
274
|
|
274
|
275
|
#endif
|
275
|
276
|
|
276
|
|
-#if HAS_SPI_GRAPHICAL_TFT
|
|
277
|
+#if ENABLED(TFT_CLASSIC_UI)
|
277
|
278
|
// Emulated DOGM SPI
|
278
|
279
|
#define LCD_PINS_ENABLE PD13
|
279
|
280
|
#define LCD_PINS_RS PC6
|
280
|
281
|
#define BTN_ENC PE13
|
281
|
282
|
#define BTN_EN1 PE8
|
282
|
283
|
#define BTN_EN2 PE11
|
283
|
|
-#elif ENABLED(TFT_480x320_SPI)
|
284
|
|
- #define TFT_DRIVER ST7796
|
|
284
|
+#elif ENABLED(TFT_COLOR_UI)
|
285
|
285
|
#define TFT_BUFFER_SIZE 14400
|
286
|
286
|
#endif
|
287
|
287
|
|
288
|
288
|
#if HAS_WIRED_LCD && !HAS_SPI_TFT
|
289
|
|
-
|
290
|
|
- // NON TFT Displays
|
|
289
|
+ #define BEEPER_PIN PC5
|
|
290
|
+ #define BTN_ENC PE13
|
|
291
|
+ #define LCD_PINS_ENABLE PD13
|
|
292
|
+ #define LCD_PINS_RS PC6
|
|
293
|
+ #define BTN_EN1 PE8
|
|
294
|
+ #define BTN_EN2 PE11
|
|
295
|
+ #define LCD_BACKLIGHT_PIN -1
|
291
|
296
|
|
292
|
297
|
#if ENABLED(MKS_MINI_12864)
|
293
|
298
|
|
|
@@ -301,9 +306,32 @@
|
301
|
306
|
#define DOGLCD_SCK PA5
|
302
|
307
|
#define DOGLCD_MOSI PA7
|
303
|
308
|
|
304
|
|
- // Required for MKS_MINI_12864 with this board
|
305
|
|
- #define MKS_LCD12864B
|
306
|
|
- #undef SHOW_BOOTSCREEN
|
|
309
|
+ #elif IS_TFTGLCD_PANEL
|
|
310
|
+
|
|
311
|
+ #if ENABLED(TFTGLCD_PANEL_SPI)
|
|
312
|
+ #define PIN_SPI_SCK PA5
|
|
313
|
+ #define PIN_TFT_MISO PA6
|
|
314
|
+ #define PIN_TFT_MOSI PA7
|
|
315
|
+ #define TFTGLCD_CS PE8
|
|
316
|
+ #endif
|
|
317
|
+
|
|
318
|
+ #ifndef BEEPER_PIN
|
|
319
|
+ #define BEEPER_PIN -1
|
|
320
|
+ #endif
|
|
321
|
+
|
|
322
|
+ #elif ENABLED(MKS_MINI_12864_V3)
|
|
323
|
+ #define DOGLCD_CS PD13
|
|
324
|
+ #define DOGLCD_A0 PC6
|
|
325
|
+ #define LCD_PINS_DC DOGLCD_A0
|
|
326
|
+ #define LCD_BACKLIGHT_PIN -1
|
|
327
|
+ #define LCD_RESET_PIN PE14
|
|
328
|
+ #define NEOPIXEL_PIN PE15
|
|
329
|
+ #define DOGLCD_MOSI PA7
|
|
330
|
+ #define DOGLCD_SCK PA5
|
|
331
|
+ #if SD_CONNECTION_IS(ONBOARD)
|
|
332
|
+ #define FORCE_SOFT_SPI
|
|
333
|
+ #endif
|
|
334
|
+ //#define LCD_SCREEN_ROT_180
|
307
|
335
|
|
308
|
336
|
#else // !MKS_MINI_12864
|
309
|
337
|
|
|
@@ -342,6 +370,10 @@
|
342
|
370
|
#define W25QXX_SCK_PIN PB13
|
343
|
371
|
#endif
|
344
|
372
|
|
|
373
|
+#ifndef BEEPER_PIN
|
|
374
|
+ #define BEEPER_PIN PC5
|
|
375
|
+#endif
|
|
376
|
+
|
345
|
377
|
#if ENABLED(SPEAKER) && BEEPER_PIN == PC5
|
346
|
378
|
#error "MKS Robin nano default BEEPER_PIN is not a SPEAKER."
|
347
|
379
|
#endif
|