Upstream
/
esphome
mirror of https://github.com/esphome/esphome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update ESP-IDF and platform version (#3565) 

Co-authored-by: Otto Winter <otto@otto-winter.com>
This commit is contained in:
Jesse Hills 2022-11-23 09:54:55 +13:00 committed by GitHub
parent 1f33ad037d
commit 91925b1826
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
esphome/components/esp32/__init__.py
View File

@ -138,11 +138,11 @@ ARDUINO_PLATFORM_VERSION = cv.Version(5, 2, 0)
# The default/recommended esp-idf framework version # The default/recommended esp-idf framework version
# - https://github.com/espressif/esp-idf/releases # - https://github.com/espressif/esp-idf/releases
# - https://api.registry.platformio.org/v3/packages/platformio/tool/framework-espidf # - https://api.registry.platformio.org/v3/packages/platformio/tool/framework-espidf
RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION = cv.Version(4, 3, 2) RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION = cv.Version(4, 4, 2)
# The platformio/espressif32 version to use for esp-idf frameworks # The platformio/espressif32 version to use for esp-idf frameworks
# - https://github.com/platformio/platform-espressif32/releases # - https://github.com/platformio/platform-espressif32/releases
# - https://api.registry.platformio.org/v3/packages/platformio/platform/espressif32 # - https://api.registry.platformio.org/v3/packages/platformio/platform/espressif32
ESP_IDF_PLATFORM_VERSION = cv.Version(3, 5, 0) ESP_IDF_PLATFORM_VERSION = cv.Version(5, 2, 0)
def _arduino_check_versions(value): def _arduino_check_versions(value):
@ -184,7 +184,7 @@ def _esp_idf_check_versions(value):
value = value.copy() value = value.copy()
lookups = { lookups = {
"dev": (cv.Version(5, 0, 0), "https://github.com/espressif/esp-idf.git"), "dev": (cv.Version(5, 0, 0), "https://github.com/espressif/esp-idf.git"),
"latest": (cv.Version(4, 3, 2), None), "latest": (cv.Version(4, 4, 2), None),
"recommended": (RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION, None), "recommended": (RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION, None),
} }

1
esphome/components/ethernet/__init__.py
View File

@ -90,7 +90,6 @@ CONFIG_SCHEMA = cv.All(
} }
).extend(cv.COMPONENT_SCHEMA), ).extend(cv.COMPONENT_SCHEMA),
_validate, _validate,
cv.only_with_arduino,
) )

4
esphome/components/ethernet/ethernet_component.cpp
View File

@ -3,7 +3,7 @@
#include "esphome/core/util.h" #include "esphome/core/util.h"
#include "esphome/core/application.h" #include "esphome/core/application.h"
#ifdef USE_ESP32_FRAMEWORK_ARDUINO #ifdef USE_ESP32
#include <lwip/dns.h> #include <lwip/dns.h>
#include "esp_event.h" #include "esp_event.h"
@ -326,4 +326,4 @@ void EthernetComponent::set_use_address(const std::string &use_address) { this->
} // namespace ethernet } // namespace ethernet
} // namespace esphome } // namespace esphome
#endif // USE_ESP32_FRAMEWORK_ARDUINO #endif // USE_ESP32

4
esphome/components/ethernet/ethernet_component.h
View File

@ -4,7 +4,7 @@
#include "esphome/core/hal.h" #include "esphome/core/hal.h"
#include "esphome/components/network/ip_address.h" #include "esphome/components/network/ip_address.h"
#ifdef USE_ESP32_FRAMEWORK_ARDUINO #ifdef USE_ESP32
#include "esp_eth.h" #include "esp_eth.h"
#include "esp_eth_mac.h" #include "esp_eth_mac.h"
@ -86,4 +86,4 @@ extern EthernetComponent *global_eth_component;
} // namespace ethernet } // namespace ethernet
} // namespace esphome } // namespace esphome
#endif // USE_ESP32_FRAMEWORK_ARDUINO #endif // USE_ESP32

3
esphome/core/defines.h
View File

@ -79,8 +79,7 @@
#endif #endif
#ifdef USE_ESP_IDF #ifdef USE_ESP_IDF
#define USE_ARDUINO_VERSION_CODE VERSION_CODE(4, 3, 0) #define USE_ESP_IDF_VERSION_CODE VERSION_CODE(4, 4, 2)
#define USE_ESP32_IGNORE_EFUSE_MAC_CRC
#endif #endif
#endif #endif

2
esphome/core/helpers.cpp
View File

@ -422,7 +422,7 @@ void HighFrequencyLoopRequester::stop() {
} }
bool HighFrequencyLoopRequester::is_high_frequency() { return num_requests > 0; } bool HighFrequencyLoopRequester::is_high_frequency() { return num_requests > 0; }
void get_mac_address_raw(uint8_t *mac) { void get_mac_address_raw(uint8_t *mac) { // NOLINT(readability-non-const-parameter)
#if defined(USE_ESP32) #if defined(USE_ESP32)
#if defined(USE_ESP32_IGNORE_EFUSE_MAC_CRC) #if defined(USE_ESP32_IGNORE_EFUSE_MAC_CRC)
// On some devices, the MAC address that is burnt into EFuse does not // On some devices, the MAC address that is burnt into EFuse does not

2
esphome/core/helpers.h
View File

@ -568,7 +568,7 @@ class HighFrequencyLoopRequester {
}; };
/// Get the device MAC address as raw bytes, written into the provided byte array (6 bytes). /// Get the device MAC address as raw bytes, written into the provided byte array (6 bytes).
void get_mac_address_raw(uint8_t *mac); void get_mac_address_raw(uint8_t *mac); // NOLINT(readability-non-const-parameter)
/// Get the device MAC address as a string, in lowercase hex notation. /// Get the device MAC address as a string, in lowercase hex notation.
std::string get_mac_address(); std::string get_mac_address();

4
platformio.ini
View File

@ -133,9 +133,9 @@ extra_scripts = post:esphome/components/esp32/post_build.py.script
; This are common settings for the ESP32 (all variants) using IDF. ; This are common settings for the ESP32 (all variants) using IDF.
[common:esp32-idf] [common:esp32-idf]
extends = common:idf extends = common:idf
platform = platformio/espressif32 @ 3.5.0 platform = platformio/espressif32 @ 5.2.0
platform_packages = platform_packages =
platformio/framework-espidf @ ~3.40302.0 platformio/framework-espidf @ ~3.40402.0
framework = espidf framework = espidf
lib_deps = lib_deps =