From 1e4d32e0eaa150ed80694967a1f57d9a1ee4151c Mon Sep 17 00:00:00 2001 From: Tomasz Duda Date: Tue, 29 Oct 2024 07:40:27 +0100 Subject: [PATCH] fix spi --- esphome/components/spi/__init__.py | 31 ++++++++++++------------------ esphome/core/config.py | 3 ++- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/esphome/components/spi/__init__.py b/esphome/components/spi/__init__.py index fdf19bb56e..fbc3e34618 100644 --- a/esphome/components/spi/__init__.py +++ b/esphome/components/spi/__init__.py @@ -1,40 +1,37 @@ import re +from esphome import pins import esphome.codegen as cg -import esphome.config_validation as cv -import esphome.final_validate as fv from esphome.components.esp32.const import ( KEY_ESP32, - VARIANT_ESP32S2, - VARIANT_ESP32S3, VARIANT_ESP32C2, VARIANT_ESP32C3, VARIANT_ESP32C6, VARIANT_ESP32H2, + VARIANT_ESP32S2, + VARIANT_ESP32S3, ) -from esphome import pins +import esphome.config_validation as cv from esphome.const import ( CONF_CLK_PIN, + CONF_CS_PIN, + CONF_DATA_PINS, + CONF_DATA_RATE, CONF_ID, + CONF_INVERTED, CONF_MISO_PIN, CONF_MOSI_PIN, - CONF_SPI_ID, - CONF_CS_PIN, CONF_NUMBER, - CONF_INVERTED, + CONF_SPI_ID, KEY_CORE, KEY_TARGET_PLATFORM, KEY_VARIANT, - CONF_DATA_RATE, PLATFORM_ESP32, PLATFORM_ESP8266, PLATFORM_RP2040, - CONF_DATA_PINS, -) -from esphome.core import ( - coroutine_with_priority, - CORE, ) +from esphome.core import CORE, coroutine_with_priority +import esphome.final_validate as fv CODEOWNERS = ["@esphome/core", "@clydebarrow"] spi_ns = cg.esphome_ns.namespace("spi") @@ -96,11 +93,7 @@ RP_SPI_PINSETS = [ def get_target_platform(): - return ( - CORE.data[KEY_CORE][KEY_TARGET_PLATFORM] - if KEY_TARGET_PLATFORM in CORE.data[KEY_CORE] - else "" - ) + return CORE.data[KEY_CORE][KEY_TARGET_PLATFORM] def get_target_variant(): diff --git a/esphome/core/config.py b/esphome/core/config.py index 753ae8342b..e89e3cf687 100644 --- a/esphome/core/config.py +++ b/esphome/core/config.py @@ -299,7 +299,8 @@ def preload_core_config(config, result) -> str: # Insert generated target platform config to main config config[plat] = plat_conf config[CONF_ESPHOME] = conf - return newstyle_found[0] if newstyle_found else plat + target_platform = newstyle_found[0] if newstyle_found else plat + return target_platform def include_file(path, basename):