feat: sequences v2, bridges, and sim-controller
Rework sequences (engine, seqplay, envelope, API, web UI), add bridge support, add the host sim-controller and rig simulation tests, and update docs, presets and project tooling config. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
d664026ee5
commit
2543673bd8
68 files changed
+5761
-460
No files matched your search
@@ -23,7 +23,7 @@ TTY := $(shell [ -t 0 ] && echo -it)
|
||||
OWNER := $(shell docker info --format '{{.SecurityOptions}}' 2>/dev/null | grep -q rootless && echo 0:0 || echo $$(id -u):$$(id -g))
|
||||
FIX_OWNER = chown -R $(OWNER) /project
|
||||
|
||||
.PHONY: all help web build flash ota ota-drivers monitor flash-monitor log size menuconfig clean fullclean erase test test-driver test-envelope test-api test-browser
|
||||
.PHONY: all help web build flash ota ota-drivers monitor flash-monitor log size menuconfig clean fullclean erase test test-driver test-envelope test-api test-browser sim-build sim sim-web test-sim
|
||||
|
||||
# Default target: build, flash, then open the console (run in order, so not with make -j)
|
||||
all: build flash monitor
|
||||
@@ -49,6 +49,11 @@ help:
|
||||
@echo " make test driver unit tests + C/Python envelope cross-check"
|
||||
@echo " make test-api HOST=ip HTTP API tests against a running controller (data restored afterwards)"
|
||||
@echo " make test-browser HOST=ip Selenium UI tests against a running controller (needs selenium + chromedriver)"
|
||||
@echo "Simulated rig (no hardware): the controller built for linux + led-simulator's 16 drivers over a UDP bridge"
|
||||
@echo " make sim-build build the controller for the host (sim-controller/build/led_controller_sim.elf)"
|
||||
@echo " make sim build, then run the headless rig and the controller (http://localhost:8080/)"
|
||||
@echo " make sim-web build, then run the browser rig (http://localhost:8765/) and the controller"
|
||||
@echo " make test-sim rig tests (groups, field patterns, sequences) + the API tests against make sim"
|
||||
@echo "variables: PORT=$(PORT) IDF_IMAGE=$(IDF_IMAGE)"
|
||||
|
||||
# --- web UI ---------------------------------------------------------------
|
||||
@@ -120,6 +125,24 @@ test-envelope:
|
||||
@tmp=$$(mktemp -d); \
|
||||
(cd test && python3 env_check.py) > $$tmp/py.txt; \
|
||||
docker run --rm -v "$(CURDIR)":/project -w /project/test $(IDF_IMAGE) bash -c \
|
||||
'gcc -Wall -I/opt/esp/idf/components/json/cJSON env_host.c ../main/envelope.c /opt/esp/idf/components/json/cJSON/cJSON.c -o /tmp/t -lm && /tmp/t' 2>&1 | tail -2 > $$tmp/c.txt; \
|
||||
'gcc -Wall -I/opt/esp/idf/components/json/cJSON env_host.c ../main/envelope.c /opt/esp/idf/components/json/cJSON/cJSON.c -o /tmp/t -lm && /tmp/t' 2>&1 | tail -4 | head -3 > $$tmp/c.txt; \
|
||||
if diff -q $$tmp/py.txt $$tmp/c.txt >/dev/null; then echo "envelope: C and Python agree"; rm -rf $$tmp; \
|
||||
else echo "envelope: MISMATCH"; diff $$tmp/py.txt $$tmp/c.txt; rm -rf $$tmp; exit 1; fi
|
||||
|
||||
# --- simulated rig --------------------------------------------------------
|
||||
# The firmware built for ESP-IDF's linux target runs on this computer; its ESP-NOW frames go over UDP to
|
||||
# led-simulator (bridge_sim.py headless, or server.py in the browser), whose drivers run led-driver/src.
|
||||
SIM_DB ?= $(CURDIR)/sim-controller/data
|
||||
SIM_RUN = mkdir -p $(SIM_DB) && LED_SIM_DB=$(SIM_DB) LED_SIM_BRIDGE=127.0.0.1:8766 sim-controller/build/led_controller_sim.elf
|
||||
|
||||
sim-build: web
|
||||
$(DOCKER_RUN) $(IDF_IMAGE) bash -c 'cd sim-controller && idf.py build; rc=$$?; $(FIX_OWNER); exit $$rc'
|
||||
|
||||
sim: sim-build
|
||||
@trap 'kill 0' INT TERM EXIT; python3 led-simulator/bridge_sim.py & $(SIM_RUN)
|
||||
|
||||
sim-web: sim-build
|
||||
@trap 'kill 0' INT TERM EXIT; python3 led-simulator/server.py & $(SIM_RUN)
|
||||
|
||||
test-sim:
|
||||
python3 -m pytest test/api -q --host localhost:8080
|
||||
Reference in new issue
Block a user