Fix ESP32 name conflict
This commit is contained in:
parent
b7b303f4bf
commit
3949d246df
4 changed files with 11 additions and 4 deletions
|
@ -310,7 +310,7 @@
|
|||
//
|
||||
// Espressif ESP32 WiFi
|
||||
//
|
||||
#define BOARD_ESP32 6000
|
||||
#define BOARD_ESPRESSIF_ESP32 6000
|
||||
|
||||
//
|
||||
// Simulations
|
||||
|
|
|
@ -417,6 +417,7 @@
|
|||
#define BOARD_BIQU_SKR_V1_1 -1004
|
||||
#define BOARD_STM32F1R -1005
|
||||
#define BOARD_STM32F103R -1006
|
||||
#define BOARD_ESP32 -1007
|
||||
#if MB(MKS_13)
|
||||
#error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration."
|
||||
#elif MB(TRIGORILLA)
|
||||
|
@ -431,6 +432,8 @@
|
|||
#error "BOARD_STM32F1R has been renamed BOARD_STM32F103RE. Please update your configuration."
|
||||
#elif MB(STM32F103R)
|
||||
#error "BOARD_STM32F103R has been renamed BOARD_STM32F103RE. Please update your configuration."
|
||||
#elif MOTHERBOARD == BOARD_ESP32
|
||||
#error "BOARD_ESP32 has been renamed BOARD_ESPRESSIF_ESP32. Please update your configuration."
|
||||
#endif
|
||||
#undef BOARD_MKS_13
|
||||
#undef BOARD_TRIGORILLA
|
||||
|
@ -439,6 +442,7 @@
|
|||
#undef BOARD_BIQU_SKR_V1_1
|
||||
#undef BOARD_STM32F1R
|
||||
#undef BOARD_STM32F103R
|
||||
#undef BOARD_ESP32
|
||||
|
||||
/**
|
||||
* Marlin release, version and default string
|
||||
|
|
|
@ -21,6 +21,8 @@
|
|||
*/
|
||||
#pragma once
|
||||
|
||||
#include "../core/boards.h"
|
||||
|
||||
/**
|
||||
* Include pins definitions
|
||||
*
|
||||
|
@ -528,7 +530,8 @@
|
|||
// Espressif ESP32
|
||||
//
|
||||
|
||||
#elif MB(ESP32)
|
||||
#elif MB(ESPRESSIF_ESP32)
|
||||
|
||||
#include "esp32/pins_ESP32.h" // ESP32 env:esp32
|
||||
|
||||
//
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env bash
|
||||
#
|
||||
# Build tests for esp32
|
||||
# Build tests for ESP32
|
||||
#
|
||||
|
||||
# exit on first failure
|
||||
|
@ -10,7 +10,7 @@ set -e
|
|||
# Build with the default configurations
|
||||
#
|
||||
restore_configs
|
||||
opt_set MOTHERBOARD BOARD_ESP32
|
||||
opt_set MOTHERBOARD BOARD_ESPRESSIF_ESP32
|
||||
opt_enable WIFISUPPORT GCODE_MACROS BAUD_RATE_GCODE
|
||||
opt_set "WIFI_SSID \"ssid\""
|
||||
opt_set "WIFI_PWD \"password\""
|
||||
|
|
Reference in a new issue