image: allow the image to by auto-loaded by animation (#5139)

This commit is contained in:
Kamil Trzciński 2023-12-20 11:33:05 +01:00 committed by GitHub
parent 16798bbfb4
commit d582cfa30a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 39 additions and 8 deletions

View File

@ -12,7 +12,7 @@ import argcomplete
from esphome import const, writer, yaml_util from esphome import const, writer, yaml_util
import esphome.codegen as cg import esphome.codegen as cg
from esphome.config import iter_components, read_config, strip_default_ids from esphome.config import iter_component_configs, read_config, strip_default_ids
from esphome.const import ( from esphome.const import (
ALLOWED_NAME_CHARS, ALLOWED_NAME_CHARS,
CONF_BAUD_RATE, CONF_BAUD_RATE,
@ -196,7 +196,7 @@ def write_cpp(config):
def generate_cpp_contents(config): def generate_cpp_contents(config):
_LOGGER.info("Generating C++ source...") _LOGGER.info("Generating C++ source...")
for name, component, conf in iter_components(CORE.config): for name, component, conf in iter_component_configs(CORE.config):
if component.to_code is not None: if component.to_code is not None:
coro = wrap_to_code(name, component) coro = wrap_to_code(name, component)
CORE.add_job(coro, conf) CORE.add_job(coro, conf)

View File

@ -36,6 +36,7 @@ _LOGGER = logging.getLogger(__name__)
DOMAIN = "image" DOMAIN = "image"
DEPENDENCIES = ["display"] DEPENDENCIES = ["display"]
MULTI_CONF = True MULTI_CONF = True
MULTI_CONF_NO_DEFAULT = True
image_ns = cg.esphome_ns.namespace("image") image_ns = cg.esphome_ns.namespace("image")

View File

@ -39,6 +39,17 @@ _LOGGER = logging.getLogger(__name__)
def iter_components(config): def iter_components(config):
for domain, conf in config.items():
component = get_component(domain)
yield domain, component
if component.is_platform_component:
for p_config in conf:
p_name = f"{domain}.{p_config[CONF_PLATFORM]}"
platform = get_platform(domain, p_config[CONF_PLATFORM])
yield p_name, platform
def iter_component_configs(config):
for domain, conf in config.items(): for domain, conf in config.items():
component = get_component(domain) component = get_component(domain)
if component.multi_conf: if component.multi_conf:
@ -303,8 +314,10 @@ class LoadValidationStep(ConfigValidationStep):
# Ignore top-level keys starting with a dot # Ignore top-level keys starting with a dot
return return
result.add_output_path([self.domain], self.domain) result.add_output_path([self.domain], self.domain)
result[self.domain] = self.conf
component = get_component(self.domain) component = get_component(self.domain)
if component.multi_conf_no_default and isinstance(self.conf, core.AutoLoad):
self.conf = []
result[self.domain] = self.conf
path = [self.domain] path = [self.domain]
if component is None: if component is None:
result.add_str_error(f"Component not found: {self.domain}", path) result.add_str_error(f"Component not found: {self.domain}", path)
@ -424,6 +437,9 @@ class MetadataValidationStep(ConfigValidationStep):
def run(self, result: Config) -> None: def run(self, result: Config) -> None:
if self.conf is None: if self.conf is None:
if self.comp.multi_conf and self.comp.multi_conf_no_default:
result[self.domain] = self.conf = []
else:
result[self.domain] = self.conf = {} result[self.domain] = self.conf = {}
success = True success = True

View File

@ -57,6 +57,10 @@ class ComponentManifest:
def multi_conf(self) -> bool: def multi_conf(self) -> bool:
return getattr(self.module, "MULTI_CONF", False) return getattr(self.module, "MULTI_CONF", False)
@property
def multi_conf_no_default(self) -> bool:
return getattr(self.module, "MULTI_CONF_NO_DEFAULT", False)
@property @property
def to_code(self) -> Optional[Callable[[Any], None]]: def to_code(self) -> Optional[Callable[[Any], None]]:
return getattr(self.module, "to_code", None) return getattr(self.module, "to_code", None)

View File

@ -4,7 +4,7 @@ import re
from pathlib import Path from pathlib import Path
from typing import Union from typing import Union
from esphome.config import iter_components from esphome.config import iter_components, iter_component_configs
from esphome.const import ( from esphome.const import (
HEADER_FILE_EXTENSIONS, HEADER_FILE_EXTENSIONS,
SOURCE_FILE_EXTENSIONS, SOURCE_FILE_EXTENSIONS,
@ -70,14 +70,14 @@ UPLOAD_SPEED_OVERRIDE = {
def get_flags(key): def get_flags(key):
flags = set() flags = set()
for _, component, conf in iter_components(CORE.config): for _, component, conf in iter_component_configs(CORE.config):
flags |= getattr(component, key)(conf) flags |= getattr(component, key)(conf)
return flags return flags
def get_include_text(): def get_include_text():
include_text = '#include "esphome.h"\nusing namespace esphome;\n' include_text = '#include "esphome.h"\nusing namespace esphome;\n'
for _, component, conf in iter_components(CORE.config): for _, component, conf in iter_component_configs(CORE.config):
if not hasattr(component, "includes"): if not hasattr(component, "includes"):
continue continue
includes = component.includes includes = component.includes
@ -232,7 +232,7 @@ the custom_components folder or the external_components feature.
def copy_src_tree(): def copy_src_tree():
source_files: list[loader.FileResource] = [] source_files: list[loader.FileResource] = []
for _, component, _ in iter_components(CORE.config): for _, component in iter_components(CORE.config):
source_files += component.resources source_files += component.resources
source_files_map = { source_files_map = {
Path(x.package.replace(".", "/") + "/" + x.resource): x for x in source_files Path(x.package.replace(".", "/") + "/" + x.resource): x for x in source_files

View File

@ -92,3 +92,13 @@ sensor:
name: "Loop Time" name: "Loop Time"
psram: psram:
name: "PSRAM Free" name: "PSRAM Free"
# Purposely test that `animation:` does auto-load `image:`
# Keep the `image:` undefined.
# image:
animation:
- id: rgb565_animation
file: pnglogo.png
type: RGB565
use_transparency: no