Scott Lahteine 4 лет назад
Родитель
Сommit
3949d246df

+ 1
- 1
Marlin/src/core/boards.h Просмотреть файл

@@ -310,7 +310,7 @@
310 310
 //
311 311
 // Espressif ESP32 WiFi
312 312
 //
313
-#define BOARD_ESP32                   6000
313
+#define BOARD_ESPRESSIF_ESP32         6000
314 314
 
315 315
 //
316 316
 // Simulations

+ 4
- 0
Marlin/src/inc/SanityCheck.h Просмотреть файл

@@ -417,6 +417,7 @@
417 417
 #define BOARD_BIQU_SKR_V1_1 -1004
418 418
 #define BOARD_STM32F1R      -1005
419 419
 #define BOARD_STM32F103R    -1006
420
+#define BOARD_ESP32         -1007
420 421
 #if MB(MKS_13)
421 422
   #error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration."
422 423
 #elif MB(TRIGORILLA)
@@ -431,6 +432,8 @@
431 432
   #error "BOARD_STM32F1R has been renamed BOARD_STM32F103RE. Please update your configuration."
432 433
 #elif MB(STM32F103R)
433 434
   #error "BOARD_STM32F103R has been renamed BOARD_STM32F103RE. Please update your configuration."
435
+#elif MOTHERBOARD == BOARD_ESP32
436
+  #error "BOARD_ESP32 has been renamed BOARD_ESPRESSIF_ESP32. Please update your configuration."
434 437
 #endif
435 438
 #undef BOARD_MKS_13
436 439
 #undef BOARD_TRIGORILLA
@@ -439,6 +442,7 @@
439 442
 #undef BOARD_BIQU_SKR_V1_1
440 443
 #undef BOARD_STM32F1R
441 444
 #undef BOARD_STM32F103R
445
+#undef BOARD_ESP32
442 446
 
443 447
 /**
444 448
  * Marlin release, version and default string

+ 4
- 1
Marlin/src/pins/pins.h Просмотреть файл

@@ -21,6 +21,8 @@
21 21
  */
22 22
 #pragma once
23 23
 
24
+#include "../core/boards.h"
25
+
24 26
 /**
25 27
  * Include pins definitions
26 28
  *
@@ -528,7 +530,8 @@
528 530
 // Espressif ESP32
529 531
 //
530 532
 
531
-#elif MB(ESP32)
533
+#elif MB(ESPRESSIF_ESP32)
534
+
532 535
   #include "esp32/pins_ESP32.h"                 // ESP32                                  env:esp32
533 536
 
534 537
 //

+ 2
- 2
buildroot/share/tests/esp32-tests Просмотреть файл

@@ -1,6 +1,6 @@
1 1
 #!/usr/bin/env bash
2 2
 #
3
-# Build tests for esp32
3
+# Build tests for ESP32
4 4
 #
5 5
 
6 6
 # exit on first failure
@@ -10,7 +10,7 @@ set -e
10 10
 # Build with the default configurations
11 11
 #
12 12
 restore_configs
13
-opt_set MOTHERBOARD BOARD_ESP32
13
+opt_set MOTHERBOARD BOARD_ESPRESSIF_ESP32
14 14
 opt_enable WIFISUPPORT GCODE_MACROS BAUD_RATE_GCODE
15 15
 opt_set "WIFI_SSID \"ssid\""
16 16
 opt_set "WIFI_PWD \"password\""

Загрузка…
Отмена
Сохранить