Browse Source

Fix ESP32 name conflict

Scott Lahteine 5 years ago
parent
commit
3949d246df

+ 1
- 1
Marlin/src/core/boards.h View File

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

+ 4
- 0
Marlin/src/inc/SanityCheck.h View File

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

+ 4
- 1
Marlin/src/pins/pins.h View File

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

+ 2
- 2
buildroot/share/tests/esp32-tests View File

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

Loading…
Cancel
Save