mirror of
https://github.com/esphome/esphome.git
synced 2026-02-08 08:41:59 +00:00
[esp32] Sort variants in situ (#10410)
Co-authored-by: Jonathan Swoboda <154711427+swoboda1337@users.noreply.github.com>
This commit is contained in:
@@ -304,14 +304,14 @@ def test_all_predefined_models(
|
||||
config = {"model": name}
|
||||
|
||||
# Get the pins required by this model and find a compatible variant
|
||||
pins = [
|
||||
pin
|
||||
for pin in [
|
||||
model.get_default(pin, None)
|
||||
for pin in ("dc_pin", "reset_pin", "cs_pin")
|
||||
]
|
||||
if pin is not None
|
||||
]
|
||||
pins = []
|
||||
for pin_name in ("dc_pin", "reset_pin", "cs_pin", "enable_pin"):
|
||||
pin_value = model.get_default(pin_name, None)
|
||||
if pin_value is not None:
|
||||
if isinstance(pin_value, list):
|
||||
pins.extend(pin_value)
|
||||
else:
|
||||
pins.append(pin_value)
|
||||
choose_variant_with_pins(pins)
|
||||
|
||||
# Add required fields that don't have defaults
|
||||
|
||||
@@ -251,15 +251,6 @@ def test_split_default(framework, platform, variant, full, idf, arduino, simple)
|
||||
"host": "24",
|
||||
}
|
||||
|
||||
idf_mappings = {
|
||||
"esp32_idf": "4",
|
||||
"esp32_s2_idf": "7",
|
||||
"esp32_s3_idf": "10",
|
||||
"esp32_c3_idf": "13",
|
||||
"esp32_c6_idf": "16",
|
||||
"esp32_h2_idf": "19",
|
||||
}
|
||||
|
||||
arduino_mappings = {
|
||||
"esp32_arduino": "3",
|
||||
"esp32_s2_arduino": "6",
|
||||
@@ -269,6 +260,15 @@ def test_split_default(framework, platform, variant, full, idf, arduino, simple)
|
||||
"esp32_h2_arduino": "18",
|
||||
}
|
||||
|
||||
idf_mappings = {
|
||||
"esp32_idf": "4",
|
||||
"esp32_s2_idf": "7",
|
||||
"esp32_s3_idf": "10",
|
||||
"esp32_c3_idf": "13",
|
||||
"esp32_c6_idf": "16",
|
||||
"esp32_h2_idf": "19",
|
||||
}
|
||||
|
||||
schema = config_validation.Schema(
|
||||
{
|
||||
config_validation.SplitDefault(
|
||||
@@ -293,8 +293,8 @@ def test_split_default(framework, platform, variant, full, idf, arduino, simple)
|
||||
@pytest.mark.parametrize(
|
||||
"framework, platform, message",
|
||||
[
|
||||
("esp-idf", PLATFORM_ESP32, "ESP32 using esp-idf framework"),
|
||||
("arduino", PLATFORM_ESP32, "ESP32 using arduino framework"),
|
||||
("esp-idf", PLATFORM_ESP32, "ESP32 using esp-idf framework"),
|
||||
("arduino", PLATFORM_ESP8266, "ESP8266 using arduino framework"),
|
||||
("arduino", PLATFORM_RP2040, "RP2040 using arduino framework"),
|
||||
("arduino", PLATFORM_BK72XX, "BK72XX using arduino framework"),
|
||||
|
||||
Reference in New Issue
Block a user