diff --git a/Makefile b/Makefile index b64eaca..978fc9a 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ # Override on the command line, e.g. make flash PORT=/dev/ttyACM1 PORT ?= /dev/ttyACM0 -IDF_IMAGE ?= espressif/idf:v5.5.5 +IDF_IMAGE ?= espressif/idf:v6.1 SECS ?= 10 DOCKER_RUN = docker run --rm -v "$(CURDIR)":/project -w /project diff --git a/dependencies.lock b/dependencies.lock index 59febb3..e1db000 100644 --- a/dependencies.lock +++ b/dependencies.lock @@ -12,7 +12,7 @@ dependencies: idf: source: type: idf - version: 6.1.0 + version: 5.5.5 joltwallet/littlefs: component_hash: e1a0f4a6adf821759cb34703a91107bbdce5d7ff6f4728f40ab012bb87842974 dependencies: @@ -28,4 +28,4 @@ direct_dependencies: - joltwallet/littlefs manifest_hash: a5329d49f0154685d9701ccb399916a87107b77ddfe802c911aa2bb41ed5bab0 target: esp32s3 -version: 3.0.0 +version: 2.0.0 diff --git a/docs/BENCH_TEST.md b/docs/BENCH_TEST.md index 25e1c09..332b860 100644 --- a/docs/BENCH_TEST.md +++ b/docs/BENCH_TEST.md @@ -6,13 +6,13 @@ This walks one ESP32-S3 controller (W5500 Ethernet, INMP441 mic) and one `led-dr - Controller: XIAO ESP32-S3 with a W5500 module wired as in `main/Kconfig.projbuild` (SCLK 7, MISO 8, MOSI 9, CS 2, INT 3, RST 1), Ethernet cable to a DHCP network. The mic is optional for this test; the bench generator makes its own beats. - Driver: one `led-driver` unit (MicroPython, the `p2p` ESP-NOW branch) with a few LEDs. It needs no Wi-Fi network. -- A PC on the same network. Docker with `espressif/idf:v5.5.5` for building. +- A PC on the same network. Docker with `espressif/idf:v6.1` for building. - For the true latency measurement: a logic analyzer or scope with two channels and a common ground. Optional: the software echo numbers need nothing extra. **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 -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:v6.1 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 44) in the same menu. @@ -24,21 +24,21 @@ The repository root has a Makefile that wraps all of this: `make build`, `make f ```bash tools/build_web.sh -docker run --rm -v "$PWD":/project -w /project espressif/idf:v5.5.5 idf.py build +docker run --rm -v "$PWD":/project -w /project espressif/idf:v6.1 idf.py build ``` -Expect `Project build complete`, the app well under its 2 MB slot, with the web UI embedded (`www_dist/www.pack`). Fix ownership if Docker left it root-owned: `docker run --rm -v "$PWD":/project espressif/idf:v5.5.5 chown -R 0:0 /project`. +Expect `Project build complete`, the app well under its 2 MB slot, with the web UI embedded (`www_dist/www.pack`). Fix ownership if Docker left it root-owned: `docker run --rm -v "$PWD":/project espressif/idf:v6.1 chown -R 0:0 /project`. Flash with the S3 on USB (check which port it is; `ls /dev/ttyACM*`): ```bash -docker run --rm --device=/dev/ttyACM0 -v "$PWD":/project -w /project espressif/idf:v5.5.5 idf.py -p /dev/ttyACM0 flash +docker run --rm --device=/dev/ttyACM0 -v "$PWD":/project -w /project espressif/idf:v6.1 idf.py -p /dev/ttyACM0 flash ``` This writes the bootloader, partition table and app (the web UI is part of the app). Watch the log: ```bash -docker run --rm -it --device=/dev/ttyACM0 -v "$PWD":/project -w /project espressif/idf:v5.5.5 idf.py -p /dev/ttyACM0 monitor +docker run --rm -it --device=/dev/ttyACM0 -v "$PWD":/project -w /project espressif/idf:v6.1 idf.py -p /dev/ttyACM0 monitor ``` Look for, in order: `store: ... records` lines, `espnow_tx: ESP-NOW up on channel N`, `rel: reliable link up`, `Ethernet Link Up`, `Got IP: x.x.x.x`, `HTTP server started`.