Upstream moved forward with v0.6.2-esp32 (ADR-081 adaptive CSI mesh kernel,
Timer Svc stack fix) and the Docker entrypoint merge of PR #402.
Conflicts resolved:
- `firmware/esp32-csi-node/sdkconfig.defaults`: both sides appended a new
config block. Kept both — `CONFIG_ESP_WIFI_EXTRA_IRAM_OPT=y` (ours,
defense-in-depth for RuView#396 SPI cache race) AND
`CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=8192` (upstream's ADR-081 Timer
Svc stack bump). They target different crash modes.
- Applied the same `CONFIG_ESP_WIFI_EXTRA_IRAM_OPT=y` line to
`sdkconfig.defaults.4mb` and `sdkconfig.defaults.template` for
consistency — the SPI cache race is not flash-size specific, and the
4MB / template variants run the same CSI collector code with the same
MGMT-only callback path.
- `firmware/esp32-csi-node/version.txt`: both sides bumped to 0.6.2.
Upstream already released v0.6.2-esp32, so our in-flight work bumps
to 0.6.3.
- `CHANGELOG.md`: auto-merge placed our [Unreleased] #397 entries
(and the older #391 / #390 entries) inside the newly-cut
[v0.6.2-esp32] section. Moved them back to [Unreleased] — they
describe work that has not been released yet.
Auto-merged cleanly: `csi_collector.c`, `csi_collector.h`, `main.c`,
`docker/*`, `README.md`, `docs/user-guide.md`. Verified the PR's
defensive-copy code (`s_node_id_early_set`, `s_filter_mac`,
`CSI_MIN_PROCESS_INTERVAL_US`, `s_early_drop`, the 50 Hz rate gate,
MGMT-only filter, and `csi_collector_set_node_id()` API) is still
present, and that the dropped probe-injection symbols stay absent
(grep confirms 0 / 27 hits).
Validation in this devcontainer:
- ADR-081 host tests built and ran from `firmware/esp32-csi-node/tests/host/`:
`test_adaptive_controller` 18/18 pass, `test_rv_feature_state` 15/15
pass, `test_rv_mesh` 27/27 pass — 60/60 total. These exercise the
merged-in pure-C logic that this PR has no changes against, so
they're a regression check that the merge didn't corrupt the
upstream modules.
- `edge_processing.c` still has `const float sample_rate = 10.0f;`.
- Brace balance and dangling-ref checks on `csi_collector.c` pass.
ESP-IDF firmware build, flash, and miniterm soak still deferred to
@ruvnet's COM7 per the original review comment.
Co-Authored-By: claude-flow <ruv@ruv.net>
d33e4a531c