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

Fix SplitDefault with variants (#5928)

This commit is contained in:
Jesse Hills 2023-12-14 17:33:04 +09:00 committed by GitHub
parent a3cc551856
commit 0a188ad9d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
esphome/config_validation.py
View File

@ -1518,6 +1518,13 @@ class GenerateID(Optional):
super().__init__(key, default=lambda: None)
def _get_priority_default(*args):
for arg in args:
if arg is not vol.UNDEFINED:
return arg
return vol.UNDEFINED
class SplitDefault(Optional):
"""Mark this key to have a split default for ESP8266/ESP32."""
@ -1542,30 +1549,22 @@ class SplitDefault(Optional):
super().__init__(key)
self._esp8266_default = vol.default_factory(esp8266)
self._esp32_arduino_default = vol.default_factory(
esp32_arduino if esp32 is vol.UNDEFINED else esp32
_get_priority_default(esp32, esp32_arduino)
)
self._esp32_idf_default = vol.default_factory(
esp32_idf if esp32 is vol.UNDEFINED else esp32
_get_priority_default(esp32, esp32_idf)
)
self._esp32_s2_arduino_default = vol.default_factory(
(esp32_s2_arduino if esp32 is vol.UNDEFINED else esp32)
if esp32_s2 is vol.UNDEFINED
else esp32_s2
_get_priority_default(esp32_s2, esp32, esp32_s2_arduino, esp32_arduino)
)
self._esp32_s2_idf_default = vol.default_factory(
(esp32_s2_idf if esp32 is vol.UNDEFINED else esp32)
if esp32_s2 is vol.UNDEFINED
else esp32_s2
_get_priority_default(esp32_s2, esp32, esp32_s2_idf, esp32_idf)
)
self._esp32_s3_arduino_default = vol.default_factory(
(esp32_s3_arduino if esp32 is vol.UNDEFINED else esp32)
if esp32_s3 is vol.UNDEFINED
else esp32_s3
_get_priority_default(esp32_s3, esp32, esp32_s3_arduino, esp32_arduino)
)
self._esp32_s3_idf_default = vol.default_factory(
(esp32_s3_idf if esp32 is vol.UNDEFINED else esp32)
if esp32_s3 is vol.UNDEFINED
else esp32_s3
_get_priority_default(esp32_s3, esp32, esp32_s3_idf, esp32_idf)
)
self._rp2040_default = vol.default_factory(rp2040)
self._bk72xx_default = vol.default_factory(bk72xx)