Build every screen from one shared core plus a small file per board, the same firmware as before (0.2.84)
The two board profiles (5,000 lines each, 87 % the same text) become packages/core.yaml and one file per board under packages/boards/: the hardware, a table of 84 sizes and font sizes, 18 hooks with the lines of C++ only that board adds inside a shared lambda, and the board's own sections. packages/cyd.yaml and packages/guition.yaml keep their names and places (a screen installed from ESP Screens builds as before); home-like-2432s028.yaml and guition-4848s040.yaml become the same entries for a checkout. The firmware stays 0.2.70: the C++ ESPHome generates for each board, through the checkout profile and through the GitHub package route, was compared line by line with the old profiles' (docs/TEST_RESULTS_0284.md). tools/check_packages.py replaces tools/generate_packages.py; tools/profiles.py gives the tests and tools the three files as one; docs/PROFILES.md says how the files fit together and how a board is added. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,75 @@
|
||||
"""The board profiles as the tests and tools read them (app 0.2.84+).
|
||||
|
||||
A screen is three files: an entry (`home-like-2432s028.yaml` or `packages/cyd.yaml` for a CYD, `guition-4848s040.yaml`
|
||||
or `packages/guition.yaml` for a Guition), `packages/core.yaml` that every board shares, and the board's own file under
|
||||
`packages/boards/`. `text(name)` is the three of them one after the other, so a check that looks for a line finds it
|
||||
wherever it lives; `resolved(name)` also fills in the `${NAME}` substitutions from the three files (the sizes, the fonts
|
||||
and the hooks with the board's code), for a check that needs the numbers or the whole lambda. Neither is what ESPHome
|
||||
builds: that is the merge ESPHome's packages component makes (docs/PROFILES.md); the firmware check in tools/check.sh
|
||||
compiles the real thing.
|
||||
"""
|
||||
import re
|
||||
from pathlib import Path
|
||||
|
||||
import yaml
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
CORE = ROOT / 'packages/core.yaml'
|
||||
BOARDS = {'cyd': ROOT / 'packages/boards/cyd-2432s028.yaml', 'guition': ROOT / 'packages/boards/guition-4848s040.yaml'}
|
||||
ENTRIES = {'home-like-2432s028.yaml': 'cyd', 'guition-4848s040.yaml': 'guition',
|
||||
'packages/cyd.yaml': 'cyd', 'packages/guition.yaml': 'guition'}
|
||||
# The names the four entry files are known by, in the order the older tests listed them.
|
||||
PROFILES = ('home-like-2432s028.yaml', 'guition-4848s040.yaml')
|
||||
PACKAGES = ('packages/cyd.yaml', 'packages/guition.yaml')
|
||||
NAMES = PROFILES + PACKAGES
|
||||
|
||||
|
||||
def board_of(name):
|
||||
return ENTRIES[str(name).replace(str(ROOT) + '/', '')]
|
||||
|
||||
|
||||
def files(name):
|
||||
"""The entry, the core and the board file of a profile name, in that order."""
|
||||
return [ROOT / name, CORE, BOARDS[board_of(name)]]
|
||||
|
||||
|
||||
def text(name):
|
||||
return '\n'.join(path.read_text() for path in files(name))
|
||||
|
||||
|
||||
def substitutions_of(path):
|
||||
"""The `substitutions:` block of one file, as ESPHome reads it (block scalars included)."""
|
||||
block = re.search(r'^substitutions:\n(.*?)(?=^[a-z_]+:|\Z)', path.read_text(), re.M | re.S)
|
||||
if not block:
|
||||
return {}
|
||||
values = yaml.safe_load('substitutions:\n' + block[1])['substitutions'] or {}
|
||||
return {key: '' if value is None else str(value) for key, value in values.items()}
|
||||
|
||||
|
||||
def substitutions(name):
|
||||
"""Every substitution the three files define, the entry's winning over the board's over the core's."""
|
||||
values = {}
|
||||
for path in reversed(files(name)):
|
||||
values.update(substitutions_of(path))
|
||||
return values
|
||||
|
||||
|
||||
def resolve(source, values):
|
||||
"""`${NAME}` filled in, until nothing is left to fill (a hook's code names sizes of its own)."""
|
||||
for _ in range(4):
|
||||
before = source
|
||||
source = re.sub(r'\$\{([A-Z_][A-Z0-9_]*)\}', lambda m: values.get(m[1], m[0]), source)
|
||||
if source == before:
|
||||
break
|
||||
return source
|
||||
|
||||
|
||||
def resolved(name):
|
||||
return resolve(text(name), substitutions(name))
|
||||
|
||||
|
||||
def merged(name):
|
||||
"""Closer to what ESPHome builds: the three files without their substitutions blocks, every ${NAME} filled in.
|
||||
For a check that counts things, so a hook's definition in the board file is not counted next to its use."""
|
||||
without = [re.sub(r'^substitutions:\n(.*?)(?=^[a-z_]+:|\Z)', '', path.read_text(), count=1, flags=re.M | re.S) for path in files(name)]
|
||||
return resolve('\n'.join(without), substitutions(name))
|
||||
Reference in New Issue
Block a user