From cd126fd9e3338c93ad2244298f2ecde666687fcd Mon Sep 17 00:00:00 2001 From: ruv Date: Sat, 16 May 2026 08:27:51 -0400 Subject: [PATCH] fix: bug triage from issues #559, #561, #588 - verify: point at archive/v1/ proof paths (v1/ was removed) (#559) - firmware README: app flash offset 0x10000 -> 0x20000, include ota_data_initial.bin at 0xf000, correct provision.py path from scripts/ to firmware/esp32-csi-node/ (#561) - provision.py: drop password-length leak in console output; print (set)/(empty) instead of len(password) asterisks (#588) Co-Authored-By: claude-flow --- firmware/esp32-csi-node/README.md | 21 +++++++++++++-------- firmware/esp32-csi-node/provision.py | 2 +- scripts/provision.py | 2 +- verify | 4 ++-- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/firmware/esp32-csi-node/README.md b/firmware/esp32-csi-node/README.md index a3cfe28d..c60e59fe 100644 --- a/firmware/esp32-csi-node/README.md +++ b/firmware/esp32-csi-node/README.md @@ -37,18 +37,22 @@ MSYS_NO_PATHCONV=1 docker run --rm \ ### 2. Flash +Offsets must match `partitions_display.csv` (8 MB) or `partitions_4mb.csv` (4 MB): +`bootloader=0x0`, `partition-table=0x8000`, `otadata=0xf000`, `app (ota_0)=0x20000`. + ```bash python -m esptool --chip esp32s3 --port COM7 --baud 460800 \ write_flash --flash_mode dio --flash_size 8MB \ - 0x0 firmware/esp32-csi-node/build/bootloader/bootloader.bin \ - 0x8000 firmware/esp32-csi-node/build/partition_table/partition-table.bin \ - 0x10000 firmware/esp32-csi-node/build/esp32-csi-node.bin + 0x0 firmware/esp32-csi-node/build/bootloader/bootloader.bin \ + 0x8000 firmware/esp32-csi-node/build/partition_table/partition-table.bin \ + 0xf000 firmware/esp32-csi-node/build/ota_data_initial.bin \ + 0x20000 firmware/esp32-csi-node/build/esp32-csi-node.bin ``` ### 3. Provision WiFi credentials (no reflash needed) ```bash -python scripts/provision.py --port COM7 \ +python firmware/esp32-csi-node/provision.py --port COM7 \ --ssid "YourSSID" --password "YourPass" --target-ip 192.168.1.20 ``` @@ -254,9 +258,10 @@ Find your serial port: `COM7` on Windows, `/dev/ttyUSB0` on Linux, `/dev/cu.SLAB ```bash python -m esptool --chip esp32s3 --port COM7 --baud 460800 \ write_flash --flash_mode dio --flash_size 8MB \ - 0x0 firmware/esp32-csi-node/build/bootloader/bootloader.bin \ - 0x8000 firmware/esp32-csi-node/build/partition_table/partition-table.bin \ - 0x10000 firmware/esp32-csi-node/build/esp32-csi-node.bin + 0x0 firmware/esp32-csi-node/build/bootloader/bootloader.bin \ + 0x8000 firmware/esp32-csi-node/build/partition_table/partition-table.bin \ + 0xf000 firmware/esp32-csi-node/build/ota_data_initial.bin \ + 0x20000 firmware/esp32-csi-node/build/esp32-csi-node.bin ``` ### Serial Monitor @@ -285,7 +290,7 @@ All settings can be changed at runtime via Non-Volatile Storage (NVS) without re The easiest way to write NVS settings: ```bash -python scripts/provision.py --port COM7 \ +python firmware/esp32-csi-node/provision.py --port COM7 \ --ssid "MyWiFi" \ --password "MyPassword" \ --target-ip 192.168.1.20 diff --git a/firmware/esp32-csi-node/provision.py b/firmware/esp32-csi-node/provision.py index d6a0e2f0..b29e7463 100644 --- a/firmware/esp32-csi-node/provision.py +++ b/firmware/esp32-csi-node/provision.py @@ -281,7 +281,7 @@ def main(): if args.ssid: print(f" WiFi SSID: {args.ssid}") if args.password is not None: - print(f" WiFi Password: {'*' * len(args.password)}") + print(f" WiFi Password: {'(set)' if args.password else '(empty)'}") if args.target_ip: print(f" Target IP: {args.target_ip}") if args.target_port: diff --git a/scripts/provision.py b/scripts/provision.py index f46f1543..3222bf10 100644 --- a/scripts/provision.py +++ b/scripts/provision.py @@ -213,7 +213,7 @@ def main(): if args.ssid: print(f" WiFi SSID: {args.ssid}") if args.password is not None: - print(f" WiFi Password: {'*' * len(args.password)}") + print(f" WiFi Password: {'(set)' if args.password else '(empty)'}") if args.target_ip: print(f" Target IP: {args.target_ip}") if args.target_port: diff --git a/verify b/verify index dd7eab57..1b868238 100755 --- a/verify +++ b/verify @@ -19,9 +19,9 @@ set -euo pipefail SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PROOF_DIR="${SCRIPT_DIR}/v1/data/proof" +PROOF_DIR="${SCRIPT_DIR}/archive/v1/data/proof" VERIFY_PY="${PROOF_DIR}/verify.py" -V1_SRC="${SCRIPT_DIR}/v1/src" +V1_SRC="${SCRIPT_DIR}/archive/v1/src" # Colors (disabled if not a terminal) if [ -t 1 ]; then