sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-31 23:21:54 +00:00
Code Issues Releases Wiki Activity

[i2s_audio] Refactor to use CORE.data instead of module-level globals (#11223)

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-15 17:16:28 -10:00
committed by GitHub
parent 236ca12d3e
commit 3e1c8f37c5
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,7 +143,18 @@ def validate_mclk_divisible_by_3(config):
return config return config
_use_legacy_driver = None # Key for storing legacy driver setting in CORE.data
I2S_USE_LEGACY_DRIVER_KEY = "i2s_use_legacy_driver"
def _get_use_legacy_driver():
"""Get the legacy driver setting from CORE.data."""
return CORE.data.get(I2S_USE_LEGACY_DRIVER_KEY)
def _set_use_legacy_driver(value: bool) -> None:
"""Set the legacy driver setting in CORE.data."""
CORE.data[I2S_USE_LEGACY_DRIVER_KEY] = value
def i2s_audio_component_schema( def i2s_audio_component_schema(
@@ -209,17 +220,15 @@ async def register_i2s_audio_component(var, config):
def validate_use_legacy(value): def validate_use_legacy(value):
global _use_legacy_driver # noqa: PLW0603
if CONF_USE_LEGACY in value: if CONF_USE_LEGACY in value:
if (_use_legacy_driver is not None) and ( existing_value = _get_use_legacy_driver()
_use_legacy_driver != value[CONF_USE_LEGACY] if (existing_value is not None) and (existing_value != value[CONF_USE_LEGACY]):
):
raise cv.Invalid( raise cv.Invalid(
f"All i2s_audio components must set {CONF_USE_LEGACY} to the same value." f"All i2s_audio components must set {CONF_USE_LEGACY} to the same value."
) )
if (not value[CONF_USE_LEGACY]) and (CORE.using_arduino): if (not value[CONF_USE_LEGACY]) and (CORE.using_arduino):
raise cv.Invalid("Arduino supports only the legacy i2s driver") raise cv.Invalid("Arduino supports only the legacy i2s driver")
_use_legacy_driver = value[CONF_USE_LEGACY] _set_use_legacy_driver(value[CONF_USE_LEGACY])
return value return value
@@ -249,7 +258,8 @@ def _final_validate(_):
def use_legacy(): def use_legacy():
return not (CORE.using_esp_idf and not _use_legacy_driver) legacy_driver = _get_use_legacy_driver()
return not (CORE.using_esp_idf and not legacy_driver)
FINAL_VALIDATE_SCHEMA = _final_validate FINAL_VALIDATE_SCHEMA = _final_validate