From 1c222771a544ab515e26c51b1884ca3f32c7dfae Mon Sep 17 00:00:00 2001 From: jimmy Date: Mon, 2 Nov 2026 23:44:58 +1300 Subject: [PATCH] refactor: move the v2 controller to the repository root The ESP-IDF project, docs, tools, tests and web UI move from v2/ to the root, and the Makefile, README, build scripts and test runner drop the v2/ prefix. Co-Authored-By: Claude Opus 5.5 --- .gitignore | 5 +++++ v2/CMakeLists.txt => CMakeLists.txt | 2 +- Makefile | 25 ++++++++++----------- README.md | 6 ++--- v2/dependencies.lock => dependencies.lock | 0 {v2/docs => docs}/BENCH_TEST.md | 6 ++--- {v2/main => main}/CMakeLists.txt | 2 +- {v2/main => main}/Kconfig.projbuild | 0 {v2/main => main}/api.c | 0 {v2/main => main}/api.h | 0 {v2/main => main}/audio.c | 0 {v2/main => main}/audio.h | 0 {v2/main => main}/beat.c | 0 {v2/main => main}/beat.h | 0 {v2/main => main}/beat_dsp.c | 0 {v2/main => main}/beat_dsp.h | 0 {v2/main => main}/bench.c | 0 {v2/main => main}/bench.h | 0 {v2/main => main}/engine.c | 0 {v2/main => main}/engine.h | 0 {v2/main => main}/envelope.c | 0 {v2/main => main}/envelope.h | 0 {v2/main => main}/espnow_tx.c | 0 {v2/main => main}/espnow_tx.h | 0 {v2/main => main}/idf_component.yml | 0 {v2/main => main}/main.c | 0 {v2/main => main}/mic.c | 0 {v2/main => main}/mic.h | 0 {v2/main => main}/ota.c | 0 {v2/main => main}/ota.h | 0 {v2/main => main}/rel.c | 0 {v2/main => main}/rel.h | 0 {v2/main => main}/store.c | 0 {v2/main => main}/store.h | 0 {v2/main => main}/web.c | 0 {v2/main => main}/web.h | 0 v2/partitions.csv => partitions.csv | 0 v2/sdkconfig.defaults => sdkconfig.defaults | 0 {v2/test => test}/binary_envelope.py | 0 {v2/test => test}/env_check.py | 0 {v2/test => test}/env_host.c | 0 {v2/tools => tools}/analyze_edges.py | 0 {v2/tools => tools}/build_web.sh | 2 +- {v2/tools => tools}/ota.py | 6 ++--- {v2/tools => tools}/run_driver_tests.py | 2 +- {v2/tools => tools}/serial_log.py | 0 {v2/tools => tools}/usb_latency.py | 0 v2/.gitignore | 5 ----- {v2/web => web}/audio.html | 0 {v2/web => web}/static/audio.js | 0 {v2/web => web}/static/color_palette.js | 0 {v2/web => web}/static/devices.js | 0 {v2/web => web}/static/help.js | 0 {v2/web => web}/static/htmx.min.js | 0 {v2/web => web}/static/led_tool.js | 0 {v2/web => web}/static/list_search.js | 0 {v2/web => web}/static/outputs.js | 0 {v2/web => web}/static/patterns.js | 0 {v2/web => web}/static/presets.js | 0 {v2/web => web}/static/profiles.js | 0 {v2/web => web}/static/sequences.js | 0 {v2/web => web}/static/style.css | 0 {v2/web => web}/static/zone_palette.js | 0 {v2/web => web}/static/zones.js | 0 {v2/web => web}/templates/index.html | 0 {v2/web => web}/templates/settings.html | 0 66 files changed, 30 insertions(+), 31 deletions(-) rename v2/CMakeLists.txt => CMakeLists.txt (76%) rename v2/dependencies.lock => dependencies.lock (100%) rename {v2/docs => docs}/BENCH_TEST.md (99%) rename {v2/main => main}/CMakeLists.txt (87%) rename {v2/main => main}/Kconfig.projbuild (100%) rename {v2/main => main}/api.c (100%) rename {v2/main => main}/api.h (100%) rename {v2/main => main}/audio.c (100%) rename {v2/main => main}/audio.h (100%) rename {v2/main => main}/beat.c (100%) rename {v2/main => main}/beat.h (100%) rename {v2/main => main}/beat_dsp.c (100%) rename {v2/main => main}/beat_dsp.h (100%) rename {v2/main => main}/bench.c (100%) rename {v2/main => main}/bench.h (100%) rename {v2/main => main}/engine.c (100%) rename {v2/main => main}/engine.h (100%) rename {v2/main => main}/envelope.c (100%) rename {v2/main => main}/envelope.h (100%) rename {v2/main => main}/espnow_tx.c (100%) rename {v2/main => main}/espnow_tx.h (100%) rename {v2/main => main}/idf_component.yml (100%) rename {v2/main => main}/main.c (100%) rename {v2/main => main}/mic.c (100%) rename {v2/main => main}/mic.h (100%) rename {v2/main => main}/ota.c (100%) rename {v2/main => main}/ota.h (100%) rename {v2/main => main}/rel.c (100%) rename {v2/main => main}/rel.h (100%) rename {v2/main => main}/store.c (100%) rename {v2/main => main}/store.h (100%) rename {v2/main => main}/web.c (100%) rename {v2/main => main}/web.h (100%) rename v2/partitions.csv => partitions.csv (100%) rename v2/sdkconfig.defaults => sdkconfig.defaults (100%) rename {v2/test => test}/binary_envelope.py (100%) rename {v2/test => test}/env_check.py (100%) rename {v2/test => test}/env_host.c (100%) rename {v2/tools => tools}/analyze_edges.py (100%) rename {v2/tools => tools}/build_web.sh (95%) rename {v2/tools => tools}/ota.py (89%) rename {v2/tools => tools}/run_driver_tests.py (95%) rename {v2/tools => tools}/serial_log.py (100%) rename {v2/tools => tools}/usb_latency.py (100%) delete mode 100644 v2/.gitignore rename {v2/web => web}/audio.html (100%) rename {v2/web => web}/static/audio.js (100%) rename {v2/web => web}/static/color_palette.js (100%) rename {v2/web => web}/static/devices.js (100%) rename {v2/web => web}/static/help.js (100%) rename {v2/web => web}/static/htmx.min.js (100%) rename {v2/web => web}/static/led_tool.js (100%) rename {v2/web => web}/static/list_search.js (100%) rename {v2/web => web}/static/outputs.js (100%) rename {v2/web => web}/static/patterns.js (100%) rename {v2/web => web}/static/presets.js (100%) rename {v2/web => web}/static/profiles.js (100%) rename {v2/web => web}/static/sequences.js (100%) rename {v2/web => web}/static/style.css (100%) rename {v2/web => web}/static/zone_palette.js (100%) rename {v2/web => web}/static/zones.js (100%) rename {v2/web => web}/templates/index.html (100%) rename {v2/web => web}/templates/settings.html (100%) diff --git a/.gitignore b/.gitignore index e959943..c7e94bd 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,8 @@ settings.json *.sqlite .pytest_cache/ .ropeproject/ +build/ +sdkconfig +sdkconfig.old +managed_components/ +www_dist/ diff --git a/v2/CMakeLists.txt b/CMakeLists.txt similarity index 76% rename from v2/CMakeLists.txt rename to CMakeLists.txt index 53901b5..5b1fee4 100644 --- a/v2/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,3 @@ cmake_minimum_required(VERSION 3.16) include($ENV{IDF_PATH}/tools/cmake/project.cmake) -project(led_controller_v2) +project(led_controller) diff --git a/Makefile b/Makefile index daa60d6..73a502c 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Build, flash and monitor the v2 ESP32-S3 controller (ESP-IDF in Docker). +# Build, flash and monitor the ESP32-S3 controller (ESP-IDF in Docker). # # make list the targets # make build minify the web UI, then build the firmware @@ -11,9 +11,8 @@ PORT ?= /dev/ttyACM0 IDF_IMAGE ?= espressif/idf:v5.5.5 SECS ?= 10 -V2 := v2 -DOCKER_RUN = docker run --rm -v "$(CURDIR)/$(V2)":/project -w /project +DOCKER_RUN = docker run --rm -v "$(CURDIR)":/project -w /project DEVICE = --device=$(PORT) # Interactive terminal only when there is one (monitor needs it, CI does not have it) TTY := $(shell [ -t 0 ] && echo -it) @@ -26,7 +25,7 @@ FIX_OWNER = chown -R $(OWNER) /project .PHONY: help web build flash ota monitor flash-monitor log size menuconfig clean fullclean erase test test-driver test-envelope help: - @echo "v2 controller (ESP32-S3):" + @echo "LED controller (ESP32-S3):" @echo " make build minify + gzip the web UI, then build the firmware" @echo " make flash flash firmware and web UI to PORT ($(PORT))" @echo " make ota HOST=ip build, then upload the firmware (web UI included) over Ethernet (no USB)" @@ -44,7 +43,7 @@ help: # --- web UI --------------------------------------------------------------- web: - cd $(V2) && tools/build_web.sh + tools/build_web.sh # --- firmware ------------------------------------------------------------- build: web @@ -55,7 +54,7 @@ flash: build ota: build @test -n "$(HOST)" || { echo "usage: make ota HOST="; exit 1; } - python3 $(V2)/tools/ota.py $(HOST) + python3 tools/ota.py $(HOST) monitor: $(DOCKER_RUN) $(TTY) $(DEVICE) $(IDF_IMAGE) idf.py -p $(PORT) monitor @@ -64,7 +63,7 @@ flash-monitor: flash monitor # Non-interactive: reset the board and print what it says for SECS seconds log: - python3 $(V2)/tools/serial_log.py $(PORT) $(SECS) + python3 tools/serial_log.py $(PORT) $(SECS) size: $(DOCKER_RUN) $(IDF_IMAGE) bash -c 'idf.py size; rc=$$?; $(FIX_OWNER); exit $$rc' @@ -76,23 +75,23 @@ erase: $(DOCKER_RUN) $(DEVICE) $(IDF_IMAGE) idf.py -p $(PORT) erase-flash clean: - rm -rf $(V2)/build + rm -rf build fullclean: clean - rm -rf $(V2)/sdkconfig $(V2)/sdkconfig.old $(V2)/www_dist + rm -rf sdkconfig sdkconfig.old www_dist # --- tests ---------------------------------------------------------------- test: test-driver test-envelope # Host-side unit tests for the driver's link layer and beat sync (pure Python) test-driver: - python3 $(V2)/tools/run_driver_tests.py + python3 tools/run_driver_tests.py -# The C envelope packer must produce the same bytes as v2/test/binary_envelope.py +# The C envelope packer must produce the same bytes as test/binary_envelope.py test-envelope: @tmp=$$(mktemp -d); \ - (cd $(V2)/test && python3 env_check.py) > $$tmp/py.txt; \ - docker run --rm -v "$(CURDIR)/$(V2)":/project -w /project/test $(IDF_IMAGE) bash -c \ + (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; \ 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 diff --git a/README.md b/README.md index 1764d7b..5ce46d8 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,18 @@ # led-controller -ESP32-S3 controller for LED drivers: W5500 Ethernet, web UI, I2S microphone beat detection and an ESP-NOW link to the drivers. The firmware lives in [`v2/`](v2/); see [`v2/docs/BENCH_TEST.md`](v2/docs/BENCH_TEST.md) for the bench tests. +ESP32-S3 controller for LED drivers: W5500 Ethernet, web UI, I2S microphone beat detection and an ESP-NOW link to the drivers. The firmware is C (ESP-IDF) at the repository root; see [`docs/BENCH_TEST.md`](docs/BENCH_TEST.md) for the bench tests. ## Build and flash ```bash -make build # minify the web UI from v2/web, then build the firmware (ESP-IDF in Docker) +make build # minify the web UI from web/, then build the firmware (ESP-IDF in Docker) make flash # flash over USB make ota HOST= # update firmware (web UI included) over Ethernet, no USB (POST /ota) make monitor # serial console make test # driver unit tests and the C/Python envelope cross-check ``` -`make` lists every target. The web UI sources are in `v2/web/` (`static/`, `templates/`, `audio.html`). +`make` lists every target. The web UI sources are in `web/` (`static/`, `templates/`, `audio.html`). ## Other directories diff --git a/v2/dependencies.lock b/dependencies.lock similarity index 100% rename from v2/dependencies.lock rename to dependencies.lock diff --git a/v2/docs/BENCH_TEST.md b/docs/BENCH_TEST.md similarity index 99% rename from v2/docs/BENCH_TEST.md rename to docs/BENCH_TEST.md index 652b52e..5530872 100644 --- a/v2/docs/BENCH_TEST.md +++ b/docs/BENCH_TEST.md @@ -1,4 +1,4 @@ -# v2 bench test: one S3 controller and one LED driver +# Bench test: one S3 controller and one LED driver This walks one ESP32-S3 controller (W5500 Ethernet, INMP441 mic) and one `led-driver` unit through flashing, a smoke test, a lossy-link test and a beat latency measurement. Nothing here has been run on hardware yet, so treat the expected numbers as targets to check, not results. @@ -12,7 +12,7 @@ This walks one ESP32-S3 controller (W5500 Ethernet, INMP441 mic) and one `led-dr **Channel rule.** ESP-NOW only works when both radios use the same channel. The p2p driver uses its `wifi_channel` setting (default 5); the controller's default is now 5 as well (`CONFIG_ESPNOW_CHANNEL` in `sdkconfig.defaults`). If your driver uses another channel, change the controller before building: ```bash -cd v2 && docker run --rm -v "$PWD":/project -w /project espressif/idf:v5.5.5 idf.py menuconfig +docker run --rm -v "$PWD":/project -w /project espressif/idf:v5.5.5 idf.py menuconfig ``` then *ESP-NOW config → Wi-Fi channel*. Alternatively set `CONFIG_ESPNOW_CHANNEL=` in `sdkconfig.defaults` (delete `sdkconfig` after, so it is regenerated). To use the beat marker pin, also set `CONFIG_BEAT_TEST_GPIO` (for example 4) in the same menu. @@ -22,7 +22,7 @@ then *ESP-NOW config → Wi-Fi channel*. Alternatively set `CONFIG_ESPNOW_CHANNE The repository root has a Makefile that wraps all of this: `make build`, `make flash`, `make monitor` (Ctrl-] to quit), `make log` (console for 10 s, no terminal needed), `make test`, and `make help` for the rest; `PORT=/dev/ttyACM1` selects another port. The manual commands below do the same thing. ```bash -cd v2 + tools/build_web.sh docker run --rm -v "$PWD":/project -w /project espressif/idf:v5.5.5 idf.py build ``` diff --git a/v2/main/CMakeLists.txt b/main/CMakeLists.txt similarity index 87% rename from v2/main/CMakeLists.txt rename to main/CMakeLists.txt index 484924a..36fe1da 100644 --- a/v2/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -6,6 +6,6 @@ idf_component_register(SRCS "main.c" "mic.c" "beat.c" "beat_dsp.c" "espnow_tx.c" # The gzipped web UI is embedded in the app image (run tools/build_web.sh first) if(NOT EXISTS ${PROJECT_DIR}/www_dist/www.pack) - message(FATAL_ERROR "www_dist/www.pack is missing: run v2/tools/build_web.sh (make build does)") + message(FATAL_ERROR "www_dist/www.pack is missing: run tools/build_web.sh (make build does)") endif() target_add_binary_data(${COMPONENT_LIB} ${PROJECT_DIR}/www_dist/www.pack BINARY) diff --git a/v2/main/Kconfig.projbuild b/main/Kconfig.projbuild similarity index 100% rename from v2/main/Kconfig.projbuild rename to main/Kconfig.projbuild diff --git a/v2/main/api.c b/main/api.c similarity index 100% rename from v2/main/api.c rename to main/api.c diff --git a/v2/main/api.h b/main/api.h similarity index 100% rename from v2/main/api.h rename to main/api.h diff --git a/v2/main/audio.c b/main/audio.c similarity index 100% rename from v2/main/audio.c rename to main/audio.c diff --git a/v2/main/audio.h b/main/audio.h similarity index 100% rename from v2/main/audio.h rename to main/audio.h diff --git a/v2/main/beat.c b/main/beat.c similarity index 100% rename from v2/main/beat.c rename to main/beat.c diff --git a/v2/main/beat.h b/main/beat.h similarity index 100% rename from v2/main/beat.h rename to main/beat.h diff --git a/v2/main/beat_dsp.c b/main/beat_dsp.c similarity index 100% rename from v2/main/beat_dsp.c rename to main/beat_dsp.c diff --git a/v2/main/beat_dsp.h b/main/beat_dsp.h similarity index 100% rename from v2/main/beat_dsp.h rename to main/beat_dsp.h diff --git a/v2/main/bench.c b/main/bench.c similarity index 100% rename from v2/main/bench.c rename to main/bench.c diff --git a/v2/main/bench.h b/main/bench.h similarity index 100% rename from v2/main/bench.h rename to main/bench.h diff --git a/v2/main/engine.c b/main/engine.c similarity index 100% rename from v2/main/engine.c rename to main/engine.c diff --git a/v2/main/engine.h b/main/engine.h similarity index 100% rename from v2/main/engine.h rename to main/engine.h diff --git a/v2/main/envelope.c b/main/envelope.c similarity index 100% rename from v2/main/envelope.c rename to main/envelope.c diff --git a/v2/main/envelope.h b/main/envelope.h similarity index 100% rename from v2/main/envelope.h rename to main/envelope.h diff --git a/v2/main/espnow_tx.c b/main/espnow_tx.c similarity index 100% rename from v2/main/espnow_tx.c rename to main/espnow_tx.c diff --git a/v2/main/espnow_tx.h b/main/espnow_tx.h similarity index 100% rename from v2/main/espnow_tx.h rename to main/espnow_tx.h diff --git a/v2/main/idf_component.yml b/main/idf_component.yml similarity index 100% rename from v2/main/idf_component.yml rename to main/idf_component.yml diff --git a/v2/main/main.c b/main/main.c similarity index 100% rename from v2/main/main.c rename to main/main.c diff --git a/v2/main/mic.c b/main/mic.c similarity index 100% rename from v2/main/mic.c rename to main/mic.c diff --git a/v2/main/mic.h b/main/mic.h similarity index 100% rename from v2/main/mic.h rename to main/mic.h diff --git a/v2/main/ota.c b/main/ota.c similarity index 100% rename from v2/main/ota.c rename to main/ota.c diff --git a/v2/main/ota.h b/main/ota.h similarity index 100% rename from v2/main/ota.h rename to main/ota.h diff --git a/v2/main/rel.c b/main/rel.c similarity index 100% rename from v2/main/rel.c rename to main/rel.c diff --git a/v2/main/rel.h b/main/rel.h similarity index 100% rename from v2/main/rel.h rename to main/rel.h diff --git a/v2/main/store.c b/main/store.c similarity index 100% rename from v2/main/store.c rename to main/store.c diff --git a/v2/main/store.h b/main/store.h similarity index 100% rename from v2/main/store.h rename to main/store.h diff --git a/v2/main/web.c b/main/web.c similarity index 100% rename from v2/main/web.c rename to main/web.c diff --git a/v2/main/web.h b/main/web.h similarity index 100% rename from v2/main/web.h rename to main/web.h diff --git a/v2/partitions.csv b/partitions.csv similarity index 100% rename from v2/partitions.csv rename to partitions.csv diff --git a/v2/sdkconfig.defaults b/sdkconfig.defaults similarity index 100% rename from v2/sdkconfig.defaults rename to sdkconfig.defaults diff --git a/v2/test/binary_envelope.py b/test/binary_envelope.py similarity index 100% rename from v2/test/binary_envelope.py rename to test/binary_envelope.py diff --git a/v2/test/env_check.py b/test/env_check.py similarity index 100% rename from v2/test/env_check.py rename to test/env_check.py diff --git a/v2/test/env_host.c b/test/env_host.c similarity index 100% rename from v2/test/env_host.c rename to test/env_host.c diff --git a/v2/tools/analyze_edges.py b/tools/analyze_edges.py similarity index 100% rename from v2/tools/analyze_edges.py rename to tools/analyze_edges.py diff --git a/v2/tools/build_web.sh b/tools/build_web.sh similarity index 95% rename from v2/tools/build_web.sh rename to tools/build_web.sh index 22dfd0b..70c7d20 100755 --- a/v2/tools/build_web.sh +++ b/tools/build_web.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Minify and gzip the web UI into v2/www_dist and pack it into www_dist/www.pack, which the +# Minify and gzip the web UI into www_dist and pack it into www_dist/www.pack, which the # firmware embeds (main/CMakeLists.txt). Usage: tools/build_web.sh (needs node/npx; WWW_MAX = size limit in bytes) set -euo pipefail cd "$(dirname "$0")/.." diff --git a/v2/tools/ota.py b/tools/ota.py similarity index 89% rename from v2/tools/ota.py rename to tools/ota.py index 6b2fae6..e5ef941 100644 --- a/v2/tools/ota.py +++ b/tools/ota.py @@ -3,7 +3,7 @@ ota.py [firmware.bin] -Default is build/led_controller_v2.bin next to this script. The board reboots into the new image. +Default is build/led_controller.bin next to this script. The board reboots into the new image. """ import http.client import json @@ -13,7 +13,7 @@ import time host = sys.argv[1] if len(sys.argv) > 1 else sys.exit(__doc__) build = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "build") -fw = sys.argv[2] if len(sys.argv) > 2 else os.path.join(build, "led_controller_v2.bin") +fw = sys.argv[2] if len(sys.argv) > 2 else os.path.join(build, "led_controller.bin") def info(): @@ -51,5 +51,5 @@ def upload(path, url): before = info() print("running:", before) if before is None: - sys.exit("no OTA endpoint (is this the v2 controller?)") + sys.exit("no OTA endpoint (is this the LED controller?)") upload(fw, "/ota") diff --git a/v2/tools/run_driver_tests.py b/tools/run_driver_tests.py similarity index 95% rename from v2/tools/run_driver_tests.py rename to tools/run_driver_tests.py index 7cc424f..f6d47d1 100644 --- a/v2/tools/run_driver_tests.py +++ b/tools/run_driver_tests.py @@ -3,7 +3,7 @@ import os import sys -root = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "..", "led-driver") +root = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "led-driver") sys.path[:0] = [os.path.join(root, "src"), os.path.join(root, "tests")] import test_beat_sync # noqa: E402 diff --git a/v2/tools/serial_log.py b/tools/serial_log.py similarity index 100% rename from v2/tools/serial_log.py rename to tools/serial_log.py diff --git a/v2/tools/usb_latency.py b/tools/usb_latency.py similarity index 100% rename from v2/tools/usb_latency.py rename to tools/usb_latency.py diff --git a/v2/.gitignore b/v2/.gitignore deleted file mode 100644 index ccce5ea..0000000 --- a/v2/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -build/ -sdkconfig -sdkconfig.old -managed_components/ -www_dist/ diff --git a/v2/web/audio.html b/web/audio.html similarity index 100% rename from v2/web/audio.html rename to web/audio.html diff --git a/v2/web/static/audio.js b/web/static/audio.js similarity index 100% rename from v2/web/static/audio.js rename to web/static/audio.js diff --git a/v2/web/static/color_palette.js b/web/static/color_palette.js similarity index 100% rename from v2/web/static/color_palette.js rename to web/static/color_palette.js diff --git a/v2/web/static/devices.js b/web/static/devices.js similarity index 100% rename from v2/web/static/devices.js rename to web/static/devices.js diff --git a/v2/web/static/help.js b/web/static/help.js similarity index 100% rename from v2/web/static/help.js rename to web/static/help.js diff --git a/v2/web/static/htmx.min.js b/web/static/htmx.min.js similarity index 100% rename from v2/web/static/htmx.min.js rename to web/static/htmx.min.js diff --git a/v2/web/static/led_tool.js b/web/static/led_tool.js similarity index 100% rename from v2/web/static/led_tool.js rename to web/static/led_tool.js diff --git a/v2/web/static/list_search.js b/web/static/list_search.js similarity index 100% rename from v2/web/static/list_search.js rename to web/static/list_search.js diff --git a/v2/web/static/outputs.js b/web/static/outputs.js similarity index 100% rename from v2/web/static/outputs.js rename to web/static/outputs.js diff --git a/v2/web/static/patterns.js b/web/static/patterns.js similarity index 100% rename from v2/web/static/patterns.js rename to web/static/patterns.js diff --git a/v2/web/static/presets.js b/web/static/presets.js similarity index 100% rename from v2/web/static/presets.js rename to web/static/presets.js diff --git a/v2/web/static/profiles.js b/web/static/profiles.js similarity index 100% rename from v2/web/static/profiles.js rename to web/static/profiles.js diff --git a/v2/web/static/sequences.js b/web/static/sequences.js similarity index 100% rename from v2/web/static/sequences.js rename to web/static/sequences.js diff --git a/v2/web/static/style.css b/web/static/style.css similarity index 100% rename from v2/web/static/style.css rename to web/static/style.css diff --git a/v2/web/static/zone_palette.js b/web/static/zone_palette.js similarity index 100% rename from v2/web/static/zone_palette.js rename to web/static/zone_palette.js diff --git a/v2/web/static/zones.js b/web/static/zones.js similarity index 100% rename from v2/web/static/zones.js rename to web/static/zones.js diff --git a/v2/web/templates/index.html b/web/templates/index.html similarity index 100% rename from v2/web/templates/index.html rename to web/templates/index.html diff --git a/v2/web/templates/settings.html b/web/templates/settings.html similarity index 100% rename from v2/web/templates/settings.html rename to web/templates/settings.html