sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-02-08 00:31:58 +00:00
Code Issues Releases Wiki Activity

[esp32] Change imports to use esp32 only, not .const (#12243)

Browse Source
This commit is contained in:
Jesse Hills
2025-12-06 03:53:08 +13:00
committed by GitHub
parent 19fa768730
commit 7fd79fdded
32 changed files with 60 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
esphome/components/adc/__init__.py
View File

@@ -1,15 +1,16 @@
from esphome import pins from esphome import pins
import esphome.codegen as cg import esphome.codegen as cg
from esphome.components.esp32 import VARIANT_ESP32P4, get_esp32_variant from esphome.components.esp32 import (
from esphome.components.esp32.const import (
VARIANT_ESP32, VARIANT_ESP32,
VARIANT_ESP32C2, VARIANT_ESP32C2,
VARIANT_ESP32C3, VARIANT_ESP32C3,
VARIANT_ESP32C5, VARIANT_ESP32C5,
VARIANT_ESP32C6, VARIANT_ESP32C6,
VARIANT_ESP32H2, VARIANT_ESP32H2,
VARIANT_ESP32P4,
VARIANT_ESP32S2, VARIANT_ESP32S2,
VARIANT_ESP32S3, VARIANT_ESP32S3,
get_esp32_variant,
) )
import esphome.config_validation as cv import esphome.config_validation as cv
from esphome.const import CONF_ANALOG, CONF_INPUT, CONF_NUMBER, PLATFORM_ESP8266 from esphome.const import CONF_ANALOG, CONF_INPUT, CONF_NUMBER, PLATFORM_ESP8266

2
esphome/components/bme680_bsec/__init__.py
View File

@@ -69,7 +69,7 @@ CONFIG_SCHEMA = cv.All(
cv.only_on_esp8266, cv.only_on_esp8266,
cv.All( cv.All(
cv.only_on_esp32, cv.only_on_esp32,
esp32.only_on_variant(supported=[esp32.const.VARIANT_ESP32]), esp32.only_on_variant(supported=[esp32.VARIANT_ESP32]),
), ),
), ),
) )

4
esphome/components/deep_sleep/__init__.py
View File

@@ -1,8 +1,7 @@
from esphome import automation, pins from esphome import automation, pins
import esphome.codegen as cg import esphome.codegen as cg
from esphome.components import esp32, time from esphome.components import esp32, time
from esphome.components.esp32 import get_esp32_variant from esphome.components.esp32 import (
from esphome.components.esp32.const import (
VARIANT_ESP32, VARIANT_ESP32,
VARIANT_ESP32C2, VARIANT_ESP32C2,
VARIANT_ESP32C3, VARIANT_ESP32C3,
@@ -10,6 +9,7 @@ from esphome.components.esp32.const import (
VARIANT_ESP32H2, VARIANT_ESP32H2,
VARIANT_ESP32S2, VARIANT_ESP32S2,
VARIANT_ESP32S3, VARIANT_ESP32S3,
get_esp32_variant,
) )
from esphome.config_helpers import filter_source_files_from_platform from esphome.config_helpers import filter_source_files_from_platform
import esphome.config_validation as cv import esphome.config_validation as cv

4
esphome/components/esp32_can/canbus.py
View File

@@ -4,8 +4,7 @@ from esphome import pins
import esphome.codegen as cg import esphome.codegen as cg
from esphome.components import canbus from esphome.components import canbus
from esphome.components.canbus import CONF_BIT_RATE, CanbusComponent, CanSpeed from esphome.components.canbus import CONF_BIT_RATE, CanbusComponent, CanSpeed
from esphome.components.esp32 import get_esp32_variant from esphome.components.esp32 import (
from esphome.components.esp32.const import (
VARIANT_ESP32, VARIANT_ESP32,
VARIANT_ESP32C3, VARIANT_ESP32C3,
VARIANT_ESP32C6, VARIANT_ESP32C6,
@@ -13,6 +12,7 @@ from esphome.components.esp32.const import (
VARIANT_ESP32P4, VARIANT_ESP32P4,
VARIANT_ESP32S2, VARIANT_ESP32S2,
VARIANT_ESP32S3, VARIANT_ESP32S3,
get_esp32_variant,
) )
import esphome.config_validation as cv import esphome.config_validation as cv
from esphome.const import ( from esphome.const import (

3
esphome/components/esp32_dac/output.py
View File

@@ -1,8 +1,7 @@
from esphome import pins from esphome import pins
import esphome.codegen as cg import esphome.codegen as cg
from esphome.components import output from esphome.components import output
from esphome.components.esp32 import get_esp32_variant from esphome.components.esp32 import VARIANT_ESP32, VARIANT_ESP32S2, get_esp32_variant
from esphome.components.esp32.const import VARIANT_ESP32, VARIANT_ESP32S2
import esphome.config_validation as cv import esphome.config_validation as cv
from esphome.const import CONF_ID, CONF_NUMBER, CONF_PIN from esphome.const import CONF_ID, CONF_NUMBER, CONF_PIN

4
esphome/components/esp32_hosted/update/__init__.py
View File

@@ -40,8 +40,8 @@ CONFIG_SCHEMA = cv.All(
), ),
esp32.only_on_variant( esp32.only_on_variant(
supported=[ supported=[
esp32.const.VARIANT_ESP32H2, esp32.VARIANT_ESP32H2,
esp32.const.VARIANT_ESP32P4, esp32.VARIANT_ESP32P4,
] ]
), ),
) )

2
esphome/components/esp32_rmt/__init__.py
View File

@@ -9,7 +9,7 @@ def validate_clock_resolution():
cv.only_on_esp32(value) cv.only_on_esp32(value)
value = cv.int_(value) value = cv.int_(value)
variant = esp32.get_esp32_variant() variant = esp32.get_esp32_variant()
if variant == esp32.const.VARIANT_ESP32H2 and value > 32000000: if variant == esp32.VARIANT_ESP32H2 and value > 32000000:
raise cv.Invalid( raise cv.Invalid(
f"ESP32 variant {variant} has a max clock_resolution of 32000000." f"ESP32 variant {variant} has a max clock_resolution of 32000000."
) )

2
esphome/components/esp32_rmt_led_strip/light.py
View File

@@ -91,7 +91,7 @@ CONFIG_SCHEMA = cv.All(
cv.Optional(CONF_IS_WRGB, default=False): cv.boolean, cv.Optional(CONF_IS_WRGB, default=False): cv.boolean,
cv.Optional(CONF_USE_DMA): cv.All( cv.Optional(CONF_USE_DMA): cv.All(
esp32.only_on_variant( esp32.only_on_variant(
supported=[esp32.const.VARIANT_ESP32P4, esp32.const.VARIANT_ESP32S3] supported=[esp32.VARIANT_ESP32P4, esp32.VARIANT_ESP32S3]
), ),
cv.boolean, cv.boolean,
), ),

11
esphome/components/esp32_touch/__init__.py
View File

@@ -1,10 +1,11 @@
import esphome.codegen as cg import esphome.codegen as cg
from esphome.components import esp32 from esphome.components import esp32
from esphome.components.esp32 import get_esp32_variant, gpio from esphome.components.esp32 import (
from esphome.components.esp32.const import (
VARIANT_ESP32, VARIANT_ESP32,
VARIANT_ESP32S2, VARIANT_ESP32S2,
VARIANT_ESP32S3, VARIANT_ESP32S3,
get_esp32_variant,
gpio,
) )
import esphome.config_validation as cv import esphome.config_validation as cv
from esphome.const import ( from esphome.const import (
@@ -255,9 +256,9 @@ CONFIG_SCHEMA = cv.All(
cv.has_none_or_all_keys(CONF_WATERPROOF_GUARD_RING, CONF_WATERPROOF_SHIELD_DRIVER), cv.has_none_or_all_keys(CONF_WATERPROOF_GUARD_RING, CONF_WATERPROOF_SHIELD_DRIVER),
esp32.only_on_variant( esp32.only_on_variant(
supported=[ supported=[
esp32.const.VARIANT_ESP32, esp32.VARIANT_ESP32,
esp32.const.VARIANT_ESP32S2, esp32.VARIANT_ESP32S2,
esp32.const.VARIANT_ESP32S3, esp32.VARIANT_ESP32S3,
] ]
), ),
validate_variant_vars, validate_variant_vars,

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

@@ -3,16 +3,14 @@ import logging
from esphome import pins from esphome import pins
import esphome.codegen as cg import esphome.codegen as cg
from esphome.components.esp32 import ( from esphome.components.esp32 import (
add_idf_component,
add_idf_sdkconfig_option,
get_esp32_variant,
)
from esphome.components.esp32.const import (
VARIANT_ESP32, VARIANT_ESP32,
VARIANT_ESP32C3, VARIANT_ESP32C3,
VARIANT_ESP32P4, VARIANT_ESP32P4,
VARIANT_ESP32S2, VARIANT_ESP32S2,
VARIANT_ESP32S3, VARIANT_ESP32S3,
add_idf_component,
add_idf_sdkconfig_option,
get_esp32_variant,
) )
from esphome.components.network import ip_address_literal from esphome.components.network import ip_address_literal
from esphome.components.spi import CONF_INTERFACE_INDEX, get_spi_interface from esphome.components.spi import CONF_INTERFACE_INDEX, get_spi_interface

5
esphome/components/i2s_audio/__init__.py
View File

@@ -1,7 +1,6 @@
from esphome import pins from esphome import pins
import esphome.codegen as cg import esphome.codegen as cg
from esphome.components.esp32 import add_idf_sdkconfig_option, get_esp32_variant from esphome.components.esp32 import (
from esphome.components.esp32.const import (
VARIANT_ESP32, VARIANT_ESP32,
VARIANT_ESP32C3, VARIANT_ESP32C3,
VARIANT_ESP32C5, VARIANT_ESP32C5,
@@ -10,6 +9,8 @@ from esphome.components.esp32.const import (
VARIANT_ESP32P4, VARIANT_ESP32P4,
VARIANT_ESP32S2, VARIANT_ESP32S2,
VARIANT_ESP32S3, VARIANT_ESP32S3,
add_idf_sdkconfig_option,
get_esp32_variant,
) )
import esphome.config_validation as cv import esphome.config_validation as cv
from esphome.const import CONF_BITS_PER_SAMPLE, CONF_CHANNEL, CONF_ID, CONF_SAMPLE_RATE from esphome.const import CONF_BITS_PER_SAMPLE, CONF_CHANNEL, CONF_ID, CONF_SAMPLE_RATE

2
esphome/components/i2s_audio/media_player/__init__.py
View File

@@ -40,7 +40,7 @@ INTERNAL_DAC_OPTIONS = {
EXTERNAL_DAC_OPTIONS = [CONF_MONO, CONF_STEREO] EXTERNAL_DAC_OPTIONS = [CONF_MONO, CONF_STEREO]
NO_INTERNAL_DAC_VARIANTS = [esp32.const.VARIANT_ESP32S2] NO_INTERNAL_DAC_VARIANTS = [esp32.VARIANT_ESP32S2]
I2C_COMM_FMT_OPTIONS = ["lsb", "msb"] I2C_COMM_FMT_OPTIONS = ["lsb", "msb"]

4
esphome/components/i2s_audio/microphone/__init__.py
View File

@@ -37,8 +37,8 @@ I2SAudioMicrophone = i2s_audio_ns.class_(
"I2SAudioMicrophone", I2SAudioIn, microphone.Microphone, cg.Component "I2SAudioMicrophone", I2SAudioIn, microphone.Microphone, cg.Component
) )
INTERNAL_ADC_VARIANTS = [esp32.const.VARIANT_ESP32] INTERNAL_ADC_VARIANTS = [esp32.VARIANT_ESP32]
PDM_VARIANTS = [esp32.const.VARIANT_ESP32, esp32.const.VARIANT_ESP32S3] PDM_VARIANTS = [esp32.VARIANT_ESP32, esp32.VARIANT_ESP32S3]
def _validate_esp32_variant(config): def _validate_esp32_variant(config):

2
esphome/components/i2s_audio/speaker/__init__.py
View File

@@ -62,7 +62,7 @@ I2C_COMM_FMT_OPTIONS = {
"pcm_long": i2s_comm_format_t.I2S_COMM_FORMAT_PCM_LONG, "pcm_long": i2s_comm_format_t.I2S_COMM_FORMAT_PCM_LONG,
} }
INTERNAL_DAC_VARIANTS = [esp32.const.VARIANT_ESP32] INTERNAL_DAC_VARIANTS = [esp32.VARIANT_ESP32]
def _set_num_channels_from_config(config): def _set_num_channels_from_config(config):

3
esphome/components/improv_serial/__init__.py
View File

@@ -1,7 +1,6 @@
import esphome.codegen as cg import esphome.codegen as cg
from esphome.components import improv_base from esphome.components import improv_base
from esphome.components.esp32 import get_esp32_variant from esphome.components.esp32 import VARIANT_ESP32S3, get_esp32_variant
from esphome.components.esp32.const import VARIANT_ESP32S3
from esphome.components.logger import USB_CDC from esphome.components.logger import USB_CDC
import esphome.config_validation as cv import esphome.config_validation as cv
from esphome.const import CONF_BAUD_RATE, CONF_HARDWARE_UART, CONF_ID, CONF_LOGGER from esphome.const import CONF_BAUD_RATE, CONF_HARDWARE_UART, CONF_ID, CONF_LOGGER

5
esphome/components/logger/__init__.py
View File

@@ -3,8 +3,7 @@ import re
from esphome import automation from esphome import automation
from esphome.automation import LambdaAction, StatelessLambdaAction from esphome.automation import LambdaAction, StatelessLambdaAction
import esphome.codegen as cg import esphome.codegen as cg
from esphome.components.esp32 import add_idf_sdkconfig_option, get_esp32_variant from esphome.components.esp32 import (
from esphome.components.esp32.const import (
VARIANT_ESP32, VARIANT_ESP32,
VARIANT_ESP32C2, VARIANT_ESP32C2,
VARIANT_ESP32C3, VARIANT_ESP32C3,
@@ -14,6 +13,8 @@ from esphome.components.esp32.const import (
VARIANT_ESP32P4, VARIANT_ESP32P4,
VARIANT_ESP32S2, VARIANT_ESP32S2,
VARIANT_ESP32S3, VARIANT_ESP32S3,
add_idf_sdkconfig_option,
get_esp32_variant,
) )
from esphome.components.libretiny import get_libretiny_component, get_libretiny_family from esphome.components.libretiny import get_libretiny_component, get_libretiny_family
from esphome.components.libretiny.const import ( from esphome.components.libretiny.const import (

4
esphome/components/mipi_dsi/display.py
View File

@@ -12,7 +12,7 @@ from esphome.components.const import (
CONF_DRAW_ROUNDING, CONF_DRAW_ROUNDING,
) )
from esphome.components.display import CONF_SHOW_TEST_CARD from esphome.components.display import CONF_SHOW_TEST_CARD
from esphome.components.esp32 import const, only_on_variant from esphome.components.esp32 import VARIANT_ESP32P4, only_on_variant
from esphome.components.mipi import ( from esphome.components.mipi import (
COLOR_ORDERS, COLOR_ORDERS,
CONF_COLOR_DEPTH, CONF_COLOR_DEPTH,
@@ -165,7 +165,7 @@ def model_schema(config):
) )
return cv.All( return cv.All(
schema, schema,
only_on_variant(supported=[const.VARIANT_ESP32P4]), only_on_variant(supported=[VARIANT_ESP32P4]),
cv.only_with_esp_idf, cv.only_with_esp_idf,
) )

4
esphome/components/mipi_rgb/display.py
View File

@@ -11,7 +11,7 @@ from esphome.components.const import (
CONF_DRAW_ROUNDING, CONF_DRAW_ROUNDING,
) )
from esphome.components.display import CONF_SHOW_TEST_CARD from esphome.components.display import CONF_SHOW_TEST_CARD
from esphome.components.esp32 import const, only_on_variant from esphome.components.esp32 import VARIANT_ESP32S3, only_on_variant
from esphome.components.mipi import ( from esphome.components.mipi import (
COLOR_ORDERS, COLOR_ORDERS,
CONF_DE_PIN, CONF_DE_PIN,
@@ -224,7 +224,7 @@ def _config_schema(config):
schema = model_schema(config) schema = model_schema(config)
return cv.All( return cv.All(
schema, schema,
only_on_variant(supported=[const.VARIANT_ESP32S3]), only_on_variant(supported=[VARIANT_ESP32S3]),
cv.only_with_esp_idf, cv.only_with_esp_idf,
)(config) )(config)

4
esphome/components/neopixelbus/_methods.py
View File

@@ -2,12 +2,12 @@ from dataclasses import dataclass
from typing import Any from typing import Any
import esphome.codegen as cg import esphome.codegen as cg
from esphome.components.esp32 import get_esp32_variant from esphome.components.esp32 import (
from esphome.components.esp32.const import (
VARIANT_ESP32, VARIANT_ESP32,
VARIANT_ESP32C3, VARIANT_ESP32C3,
VARIANT_ESP32S2, VARIANT_ESP32S2,
VARIANT_ESP32S3, VARIANT_ESP32S3,
get_esp32_variant,
) )
import esphome.config_validation as cv import esphome.config_validation as cv
from esphome.const import ( from esphome.const import (

3
esphome/components/neopixelbus/light.py
View File

@@ -1,8 +1,7 @@
from esphome import pins from esphome import pins
import esphome.codegen as cg import esphome.codegen as cg
from esphome.components import light from esphome.components import light
from esphome.components.esp32 import get_esp32_variant from esphome.components.esp32 import VARIANT_ESP32C3, VARIANT_ESP32S3, get_esp32_variant
from esphome.components.esp32.const import VARIANT_ESP32C3, VARIANT_ESP32S3
import esphome.config_validation as cv import esphome.config_validation as cv
from esphome.const import ( from esphome.const import (
CONF_CHANNEL, CONF_CHANNEL,

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

@@ -7,14 +7,12 @@ from esphome.components.esp32 import (
CONF_CPU_FREQUENCY, CONF_CPU_FREQUENCY,
CONF_ENABLE_IDF_EXPERIMENTAL_FEATURES, CONF_ENABLE_IDF_EXPERIMENTAL_FEATURES,
VARIANT_ESP32, VARIANT_ESP32,
add_idf_sdkconfig_option,
get_esp32_variant,
)
from esphome.components.esp32.const import (
VARIANT_ESP32C5, VARIANT_ESP32C5,
VARIANT_ESP32P4, VARIANT_ESP32P4,
VARIANT_ESP32S2, VARIANT_ESP32S2,
VARIANT_ESP32S3, VARIANT_ESP32S3,
add_idf_sdkconfig_option,
get_esp32_variant,
) )
import esphome.config_validation as cv import esphome.config_validation as cv
from esphome.const import ( from esphome.const import (

4
esphome/components/remote_receiver/__init__.py
View File

@@ -65,7 +65,7 @@ RemoteReceiverComponent = remote_receiver_ns.class_(
def validate_config(config): def validate_config(config):
if CORE.is_esp32: if CORE.is_esp32:
variant = esp32.get_esp32_variant() variant = esp32.get_esp32_variant()
if variant in (esp32.const.VARIANT_ESP32, esp32.const.VARIANT_ESP32S2): if variant in (esp32.VARIANT_ESP32, esp32.VARIANT_ESP32S2):
max_idle = 65535 max_idle = 65535
else: else:
max_idle = 32767 max_idle = 32767
@@ -148,7 +148,7 @@ CONFIG_SCHEMA = remote_base.validate_triggers(
): cv.All(cv.only_on_esp32, cv.int_range(min=2)), ): cv.All(cv.only_on_esp32, cv.int_range(min=2)),
cv.Optional(CONF_USE_DMA): cv.All( cv.Optional(CONF_USE_DMA): cv.All(
esp32.only_on_variant( esp32.only_on_variant(
supported=[esp32.const.VARIANT_ESP32P4, esp32.const.VARIANT_ESP32S3] supported=[esp32.VARIANT_ESP32P4, esp32.VARIANT_ESP32S3]
), ),
cv.boolean, cv.boolean,
), ),

2
esphome/components/remote_transmitter/__init__.py
View File

@@ -55,7 +55,7 @@ CONFIG_SCHEMA = cv.Schema(
cv.Optional(CONF_EOT_LEVEL): cv.All(cv.only_on_esp32, cv.boolean), cv.Optional(CONF_EOT_LEVEL): cv.All(cv.only_on_esp32, cv.boolean),
cv.Optional(CONF_USE_DMA): cv.All( cv.Optional(CONF_USE_DMA): cv.All(
esp32.only_on_variant( esp32.only_on_variant(
supported=[esp32.const.VARIANT_ESP32P4, esp32.const.VARIANT_ESP32S3] supported=[esp32.VARIANT_ESP32P4, esp32.VARIANT_ESP32S3]
), ),
cv.boolean, cv.boolean,
), ),

4
esphome/components/rpi_dpi_rgb/display.py
View File

@@ -1,7 +1,7 @@
from esphome import pins from esphome import pins
import esphome.codegen as cg import esphome.codegen as cg
from esphome.components import display from esphome.components import display
from esphome.components.esp32 import const, only_on_variant from esphome.components.esp32 import VARIANT_ESP32S3, only_on_variant
from esphome.components.mipi import ( from esphome.components.mipi import (
CONF_DE_PIN, CONF_DE_PIN,
CONF_HSYNC_BACK_PORCH, CONF_HSYNC_BACK_PORCH,
@@ -121,7 +121,7 @@ CONFIG_SCHEMA = cv.All(
} }
) )
), ),
only_on_variant(supported=[const.VARIANT_ESP32S3]), only_on_variant(supported=[VARIANT_ESP32S3]),
cv.only_with_esp_idf, cv.only_with_esp_idf,
) )

4
esphome/components/spi/__init__.py
View File

@@ -3,8 +3,7 @@ from typing import Any
from esphome import pins from esphome import pins
import esphome.codegen as cg import esphome.codegen as cg
from esphome.components.esp32 import only_on_variant from esphome.components.esp32 import (
from esphome.components.esp32.const import (
KEY_ESP32, KEY_ESP32,
VARIANT_ESP32C2, VARIANT_ESP32C2,
VARIANT_ESP32C3, VARIANT_ESP32C3,
@@ -13,6 +12,7 @@ from esphome.components.esp32.const import (
VARIANT_ESP32P4, VARIANT_ESP32P4,
VARIANT_ESP32S2, VARIANT_ESP32S2,
VARIANT_ESP32S3, VARIANT_ESP32S3,
only_on_variant,
) )
from esphome.config_helpers import filter_source_files_from_platform from esphome.config_helpers import filter_source_files_from_platform
import esphome.config_validation as cv import esphome.config_validation as cv

4
esphome/components/st7701s/display.py
View File

@@ -1,7 +1,7 @@
from esphome import pins from esphome import pins
import esphome.codegen as cg import esphome.codegen as cg
from esphome.components import display, spi from esphome.components import display, spi
from esphome.components.esp32 import const, only_on_variant from esphome.components.esp32 import VARIANT_ESP32S3, only_on_variant
from esphome.components.mipi import ( from esphome.components.mipi import (
CONF_DE_PIN, CONF_DE_PIN,
CONF_HSYNC_BACK_PORCH, CONF_HSYNC_BACK_PORCH,
@@ -161,7 +161,7 @@ CONFIG_SCHEMA = cv.All(
} }
).extend(spi.spi_device_schema(cs_pin_required=False, default_data_rate=1e6)) ).extend(spi.spi_device_schema(cs_pin_required=False, default_data_rate=1e6))
), ),
only_on_variant(supported=[const.VARIANT_ESP32S3]), only_on_variant(supported=[VARIANT_ESP32S3]),
cv.only_with_esp_idf, cv.only_with_esp_idf,
) )

5
esphome/components/tinyusb/__init__.py
View File

@@ -1,10 +1,11 @@
import esphome.codegen as cg import esphome.codegen as cg
from esphome.components import esp32 from esphome.components import esp32
from esphome.components.esp32 import add_idf_component, add_idf_sdkconfig_option from esphome.components.esp32 import (
from esphome.components.esp32.const import (
VARIANT_ESP32P4, VARIANT_ESP32P4,
VARIANT_ESP32S2, VARIANT_ESP32S2,
VARIANT_ESP32S3, VARIANT_ESP32S3,
add_idf_component,
add_idf_sdkconfig_option,
) )
import esphome.config_validation as cv import esphome.config_validation as cv
from esphome.const import CONF_ID from esphome.const import CONF_ID

3
esphome/config_validation.py
View File

@@ -1744,8 +1744,7 @@ class SplitDefault(Optional):
def default(self): def default(self):
keys = [] keys = []
if CORE.is_esp32: if CORE.is_esp32:
from esphome.components.esp32 import get_esp32_variant from esphome.components.esp32 import VARIANT_ESP32, get_esp32_variant
from esphome.components.esp32.const import VARIANT_ESP32
variant = get_esp32_variant().replace(VARIANT_ESP32, "").lower() variant = get_esp32_variant().replace(VARIANT_ESP32, "").lower()
framework = CORE.target_framework.replace("esp-", "") framework = CORE.target_framework.replace("esp-", "")

3
tests/component_tests/esp32/test_esp32.py
View File

@@ -17,8 +17,7 @@ def test_esp32_config(
) -> None: ) -> None:
set_core_config(PlatformFramework.ESP32_IDF) set_core_config(PlatformFramework.ESP32_IDF)
from esphome.components.esp32 import CONFIG_SCHEMA from esphome.components.esp32 import CONFIG_SCHEMA, VARIANT_ESP32, VARIANT_FRIENDLY
from esphome.components.esp32.const import VARIANT_ESP32, VARIANT_FRIENDLY
# Example ESP32 configuration # Example ESP32 configuration
config = { config = {

2
tests/component_tests/psram/test_psram.py
View File

@@ -4,7 +4,7 @@ from typing import Any
import pytest import pytest
from esphome.components.esp32.const import ( from esphome.components.esp32 import (
KEY_VARIANT, KEY_VARIANT,
VARIANT_ESP32, VARIANT_ESP32,
VARIANT_ESP32C2, VARIANT_ESP32C2,

4
tests/unit_tests/test_config_validation.py
View File

@@ -6,7 +6,7 @@ import pytest
import voluptuous as vol import voluptuous as vol
from esphome import config_validation from esphome import config_validation
from esphome.components.esp32.const import ( from esphome.components.esp32 import (
VARIANT_ESP32, VARIANT_ESP32,
VARIANT_ESP32C2, VARIANT_ESP32C2,
VARIANT_ESP32C3, VARIANT_ESP32C3,
@@ -221,7 +221,7 @@ def hex_int__valid(value):
], ],
) )
def test_split_default(framework, platform, variant, full, idf, arduino, simple): def test_split_default(framework, platform, variant, full, idf, arduino, simple):
from esphome.components.esp32.const import KEY_ESP32 from esphome.components.esp32 import KEY_ESP32
from esphome.const import ( from esphome.const import (
KEY_CORE, KEY_CORE,
KEY_TARGET_FRAMEWORK, KEY_TARGET_FRAMEWORK,

2
tests/unit_tests/test_main.py
View File

@@ -35,7 +35,7 @@ from esphome.__main__ import (
upload_program, upload_program,
upload_using_esptool, upload_using_esptool,
) )
from esphome.components.esp32.const import KEY_ESP32, KEY_VARIANT, VARIANT_ESP32 from esphome.components.esp32 import KEY_ESP32, KEY_VARIANT, VARIANT_ESP32
from esphome.const import ( from esphome.const import (
CONF_API, CONF_API,
CONF_BROKER, CONF_BROKER,