Mirrors_Framework/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-05-30 07:16:11 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

[esp32] Make esp-idf default framework for P4 (#11884)

Browse Source
This commit is contained in:
Clyde Stubbs
2025-11-14 00:55:48 +10:00
committed by GitHub
parent ed7e5cd325
commit 952bdfaac2
1 changed files with 74 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/esp32/__init__.py
+16 -31
View File
@@ -381,8 +381,9 @@ PLATFORM_VERSION_LOOKUP = {
} }
def _check_versions(value): def _check_versions(config):
value = value.copy() config = config.copy()
value = config[CONF_FRAMEWORK]
if value[CONF_VERSION] in PLATFORM_VERSION_LOOKUP: if value[CONF_VERSION] in PLATFORM_VERSION_LOOKUP:
if CONF_SOURCE in value or CONF_PLATFORM_VERSION in value: if CONF_SOURCE in value or CONF_PLATFORM_VERSION in value:
@@ -447,7 +448,7 @@ def _check_versions(value):
"If there are connectivity or build issues please remove the manual version." "If there are connectivity or build issues please remove the manual version."
) )
return value return config
def _parse_platform_version(value): def _parse_platform_version(value):
@@ -598,12 +599,9 @@ def _validate_idf_component(config: ConfigType) -> ConfigType:
FRAMEWORK_ESP_IDF = "esp-idf" FRAMEWORK_ESP_IDF = "esp-idf"
FRAMEWORK_ARDUINO = "arduino" FRAMEWORK_ARDUINO = "arduino"
FRAMEWORK_SCHEMA = cv.All( FRAMEWORK_SCHEMA = cv.Schema(
cv.Schema(
{ {
cv.Optional(CONF_TYPE, default=FRAMEWORK_ARDUINO): cv.one_of( cv.Optional(CONF_TYPE): cv.one_of(FRAMEWORK_ESP_IDF, FRAMEWORK_ARDUINO),
FRAMEWORK_ESP_IDF, FRAMEWORK_ARDUINO
),
cv.Optional(CONF_VERSION, default="recommended"): cv.string_strict, cv.Optional(CONF_VERSION, default="recommended"): cv.string_strict,
cv.Optional(CONF_RELEASE): cv.string_strict, cv.Optional(CONF_RELEASE): cv.string_strict,
cv.Optional(CONF_SOURCE): cv.string_strict, cv.Optional(CONF_SOURCE): cv.string_strict,
@@ -624,9 +622,7 @@ FRAMEWORK_SCHEMA = cv.All(
), ),
cv.Optional(CONF_ENABLE_IDF_EXPERIMENTAL_FEATURES): cv.boolean, cv.Optional(CONF_ENABLE_IDF_EXPERIMENTAL_FEATURES): cv.boolean,
cv.Optional(CONF_ENABLE_LWIP_ASSERT, default=True): cv.boolean, cv.Optional(CONF_ENABLE_LWIP_ASSERT, default=True): cv.boolean,
cv.Optional( cv.Optional(CONF_IGNORE_EFUSE_CUSTOM_MAC, default=False): cv.boolean,
CONF_IGNORE_EFUSE_CUSTOM_MAC, default=False
): cv.boolean,
cv.Optional(CONF_IGNORE_EFUSE_MAC_CRC): cv.boolean, cv.Optional(CONF_IGNORE_EFUSE_MAC_CRC): cv.boolean,
# DHCP server is needed for WiFi AP mode. When WiFi component is used, # DHCP server is needed for WiFi AP mode. When WiFi component is used,
# it will handle disabling DHCP server when AP is not configured. # it will handle disabling DHCP server when AP is not configured.
@@ -634,9 +630,7 @@ FRAMEWORK_SCHEMA = cv.All(
cv.OnlyWithout( cv.OnlyWithout(
CONF_ENABLE_LWIP_DHCP_SERVER, "wifi", default=False CONF_ENABLE_LWIP_DHCP_SERVER, "wifi", default=False
): cv.boolean, ): cv.boolean,
cv.Optional( cv.Optional(CONF_ENABLE_LWIP_MDNS_QUERIES, default=True): cv.boolean,
CONF_ENABLE_LWIP_MDNS_QUERIES, default=True
): cv.boolean,
cv.Optional( cv.Optional(
CONF_ENABLE_LWIP_BRIDGE_INTERFACE, default=False CONF_ENABLE_LWIP_BRIDGE_INTERFACE, default=False
): cv.boolean, ): cv.boolean,
@@ -646,15 +640,9 @@ FRAMEWORK_SCHEMA = cv.All(
cv.Optional( cv.Optional(
CONF_ENABLE_LWIP_CHECK_THREAD_SAFETY, default=True CONF_ENABLE_LWIP_CHECK_THREAD_SAFETY, default=True
): cv.boolean, ): cv.boolean,
cv.Optional( cv.Optional(CONF_DISABLE_LIBC_LOCKS_IN_IRAM, default=True): cv.boolean,
CONF_DISABLE_LIBC_LOCKS_IN_IRAM, default=True cv.Optional(CONF_DISABLE_VFS_SUPPORT_TERMIOS, default=True): cv.boolean,
): cv.boolean, cv.Optional(CONF_DISABLE_VFS_SUPPORT_SELECT, default=True): cv.boolean,
cv.Optional(
CONF_DISABLE_VFS_SUPPORT_TERMIOS, default=True
): cv.boolean,
cv.Optional(
CONF_DISABLE_VFS_SUPPORT_SELECT, default=True
): cv.boolean,
cv.Optional(CONF_DISABLE_VFS_SUPPORT_DIR, default=True): cv.boolean, cv.Optional(CONF_DISABLE_VFS_SUPPORT_DIR, default=True): cv.boolean,
cv.Optional(CONF_EXECUTE_FROM_PSRAM): cv.boolean, cv.Optional(CONF_EXECUTE_FROM_PSRAM): cv.boolean,
cv.Optional(CONF_LOOP_TASK_STACK_SIZE, default=8192): cv.int_range( cv.Optional(CONF_LOOP_TASK_STACK_SIZE, default=8192): cv.int_range(
@@ -670,17 +658,13 @@ FRAMEWORK_SCHEMA = cv.All(
cv.Optional(CONF_SOURCE): cv.git_ref, cv.Optional(CONF_SOURCE): cv.git_ref,
cv.Optional(CONF_REF): cv.string, cv.Optional(CONF_REF): cv.string,
cv.Optional(CONF_PATH): cv.string, cv.Optional(CONF_PATH): cv.string,
cv.Optional(CONF_REFRESH): cv.All( cv.Optional(CONF_REFRESH): cv.All(cv.string, cv.source_refresh),
cv.string, cv.source_refresh
),
} }
), ),
_validate_idf_component, _validate_idf_component,
) )
), ),
} }
),
_check_versions,
) )
@@ -743,11 +727,11 @@ def _show_framework_migration_message(name: str, variant: str) -> None:
def _set_default_framework(config): def _set_default_framework(config):
if CONF_FRAMEWORK not in config:
config = config.copy() config = config.copy()
if CONF_FRAMEWORK not in config:
variant = config[CONF_VARIANT]
config[CONF_FRAMEWORK] = FRAMEWORK_SCHEMA({}) config[CONF_FRAMEWORK] = FRAMEWORK_SCHEMA({})
if CONF_TYPE not in config[CONF_FRAMEWORK]:
variant = config[CONF_VARIANT]
if variant in ARDUINO_ALLOWED_VARIANTS: if variant in ARDUINO_ALLOWED_VARIANTS:
config[CONF_FRAMEWORK][CONF_TYPE] = FRAMEWORK_ARDUINO config[CONF_FRAMEWORK][CONF_TYPE] = FRAMEWORK_ARDUINO
_show_framework_migration_message( _show_framework_migration_message(
@@ -787,6 +771,7 @@ CONFIG_SCHEMA = cv.All(
), ),
_detect_variant, _detect_variant,
_set_default_framework, _set_default_framework,
_check_versions,
set_core_data, set_core_data,
cv.has_at_least_one_key(CONF_BOARD, CONF_VARIANT), cv.has_at_least_one_key(CONF_BOARD, CONF_VARIANT),
) )