mirror of
https://github.com/ruvnet/RuView.git
synced 2026-05-03 08:20:09 +00:00
- Add 154 missing vendor files (gitignore was filtering them) - vendor/midstream: 564 files (was 561) - vendor/sublinear-time-solver: 1190 files (was 1039) - Add ESP32 edge processing (ADR-039): presence, vitals, fall detection - Add WASM programmable sensing (ADR-040/041) with wasm3 runtime - Add firmware CI workflow (.github/workflows/firmware-ci.yml) - Add wifi-densepose-wasm-edge crate for edge WASM modules - Update sensing server, provision.py, UI components Co-Authored-By: claude-flow <ruv@ruv.net>
288 lines
10 KiB
C
288 lines
10 KiB
C
/**
|
|
* @file nvs_config.c
|
|
* @brief Runtime configuration via NVS (Non-Volatile Storage).
|
|
*
|
|
* Checks NVS namespace "csi_cfg" for keys: ssid, password, target_ip,
|
|
* target_port, node_id. Falls back to Kconfig defaults when absent.
|
|
*/
|
|
|
|
#include "nvs_config.h"
|
|
|
|
#include <string.h>
|
|
#include "esp_log.h"
|
|
#include "nvs_flash.h"
|
|
#include "nvs.h"
|
|
#include "sdkconfig.h"
|
|
|
|
static const char *TAG = "nvs_config";
|
|
|
|
void nvs_config_load(nvs_config_t *cfg)
|
|
{
|
|
if (cfg == NULL) {
|
|
ESP_LOGE(TAG, "nvs_config_load: cfg is NULL");
|
|
return;
|
|
}
|
|
|
|
/* Start with Kconfig compiled defaults */
|
|
strncpy(cfg->wifi_ssid, CONFIG_CSI_WIFI_SSID, NVS_CFG_SSID_MAX - 1);
|
|
cfg->wifi_ssid[NVS_CFG_SSID_MAX - 1] = '\0';
|
|
|
|
#ifdef CONFIG_CSI_WIFI_PASSWORD
|
|
strncpy(cfg->wifi_password, CONFIG_CSI_WIFI_PASSWORD, NVS_CFG_PASS_MAX - 1);
|
|
cfg->wifi_password[NVS_CFG_PASS_MAX - 1] = '\0';
|
|
#else
|
|
cfg->wifi_password[0] = '\0';
|
|
#endif
|
|
|
|
strncpy(cfg->target_ip, CONFIG_CSI_TARGET_IP, NVS_CFG_IP_MAX - 1);
|
|
cfg->target_ip[NVS_CFG_IP_MAX - 1] = '\0';
|
|
|
|
cfg->target_port = (uint16_t)CONFIG_CSI_TARGET_PORT;
|
|
cfg->node_id = (uint8_t)CONFIG_CSI_NODE_ID;
|
|
|
|
/* ADR-029: Defaults for channel hopping and TDM.
|
|
* hop_count=1 means single-channel (backward-compatible). */
|
|
cfg->channel_hop_count = 1;
|
|
cfg->channel_list[0] = (uint8_t)CONFIG_CSI_WIFI_CHANNEL;
|
|
for (uint8_t i = 1; i < NVS_CFG_HOP_MAX; i++) {
|
|
cfg->channel_list[i] = 0;
|
|
}
|
|
cfg->dwell_ms = 50;
|
|
cfg->tdm_slot_index = 0;
|
|
cfg->tdm_node_count = 1;
|
|
|
|
/* ADR-039: Edge intelligence defaults from Kconfig. */
|
|
#ifdef CONFIG_EDGE_TIER
|
|
cfg->edge_tier = (uint8_t)CONFIG_EDGE_TIER;
|
|
#else
|
|
cfg->edge_tier = 2;
|
|
#endif
|
|
cfg->presence_thresh = 0.0f; /* 0 = auto-calibrate. */
|
|
#ifdef CONFIG_EDGE_FALL_THRESH
|
|
cfg->fall_thresh = (float)CONFIG_EDGE_FALL_THRESH / 1000.0f;
|
|
#else
|
|
cfg->fall_thresh = 2.0f;
|
|
#endif
|
|
cfg->vital_window = 256;
|
|
#ifdef CONFIG_EDGE_VITAL_INTERVAL_MS
|
|
cfg->vital_interval_ms = (uint16_t)CONFIG_EDGE_VITAL_INTERVAL_MS;
|
|
#else
|
|
cfg->vital_interval_ms = 1000;
|
|
#endif
|
|
#ifdef CONFIG_EDGE_TOP_K
|
|
cfg->top_k_count = (uint8_t)CONFIG_EDGE_TOP_K;
|
|
#else
|
|
cfg->top_k_count = 8;
|
|
#endif
|
|
#ifdef CONFIG_EDGE_POWER_DUTY
|
|
cfg->power_duty = (uint8_t)CONFIG_EDGE_POWER_DUTY;
|
|
#else
|
|
cfg->power_duty = 100;
|
|
#endif
|
|
|
|
/* ADR-040: WASM programmable sensing defaults from Kconfig. */
|
|
#ifdef CONFIG_WASM_MAX_MODULES
|
|
cfg->wasm_max_modules = (uint8_t)CONFIG_WASM_MAX_MODULES;
|
|
#else
|
|
cfg->wasm_max_modules = 4;
|
|
#endif
|
|
cfg->wasm_verify = 1; /* Default: verify enabled (secure-by-default). */
|
|
#ifndef CONFIG_WASM_VERIFY_SIGNATURE
|
|
cfg->wasm_verify = 0; /* Kconfig disabled signature verification. */
|
|
#endif
|
|
|
|
/* Try to override from NVS */
|
|
nvs_handle_t handle;
|
|
esp_err_t err = nvs_open("csi_cfg", NVS_READONLY, &handle);
|
|
if (err != ESP_OK) {
|
|
ESP_LOGI(TAG, "No NVS config found, using compiled defaults");
|
|
return;
|
|
}
|
|
|
|
size_t len;
|
|
char buf[NVS_CFG_PASS_MAX];
|
|
|
|
/* WiFi SSID */
|
|
len = sizeof(buf);
|
|
if (nvs_get_str(handle, "ssid", buf, &len) == ESP_OK && len > 1) {
|
|
strncpy(cfg->wifi_ssid, buf, NVS_CFG_SSID_MAX - 1);
|
|
cfg->wifi_ssid[NVS_CFG_SSID_MAX - 1] = '\0';
|
|
ESP_LOGI(TAG, "NVS override: ssid=%s", cfg->wifi_ssid);
|
|
}
|
|
|
|
/* WiFi password */
|
|
len = sizeof(buf);
|
|
if (nvs_get_str(handle, "password", buf, &len) == ESP_OK) {
|
|
strncpy(cfg->wifi_password, buf, NVS_CFG_PASS_MAX - 1);
|
|
cfg->wifi_password[NVS_CFG_PASS_MAX - 1] = '\0';
|
|
ESP_LOGI(TAG, "NVS override: password=***");
|
|
}
|
|
|
|
/* Target IP */
|
|
len = sizeof(buf);
|
|
if (nvs_get_str(handle, "target_ip", buf, &len) == ESP_OK && len > 1) {
|
|
strncpy(cfg->target_ip, buf, NVS_CFG_IP_MAX - 1);
|
|
cfg->target_ip[NVS_CFG_IP_MAX - 1] = '\0';
|
|
ESP_LOGI(TAG, "NVS override: target_ip=%s", cfg->target_ip);
|
|
}
|
|
|
|
/* Target port */
|
|
uint16_t port_val;
|
|
if (nvs_get_u16(handle, "target_port", &port_val) == ESP_OK) {
|
|
cfg->target_port = port_val;
|
|
ESP_LOGI(TAG, "NVS override: target_port=%u", cfg->target_port);
|
|
}
|
|
|
|
/* Node ID */
|
|
uint8_t node_val;
|
|
if (nvs_get_u8(handle, "node_id", &node_val) == ESP_OK) {
|
|
cfg->node_id = node_val;
|
|
ESP_LOGI(TAG, "NVS override: node_id=%u", cfg->node_id);
|
|
}
|
|
|
|
/* ADR-029: Channel hop count */
|
|
uint8_t hop_count_val;
|
|
if (nvs_get_u8(handle, "hop_count", &hop_count_val) == ESP_OK) {
|
|
if (hop_count_val >= 1 && hop_count_val <= NVS_CFG_HOP_MAX) {
|
|
cfg->channel_hop_count = hop_count_val;
|
|
ESP_LOGI(TAG, "NVS override: hop_count=%u", (unsigned)cfg->channel_hop_count);
|
|
} else {
|
|
ESP_LOGW(TAG, "NVS hop_count=%u out of range [1..%u], ignored",
|
|
(unsigned)hop_count_val, (unsigned)NVS_CFG_HOP_MAX);
|
|
}
|
|
}
|
|
|
|
/* ADR-029: Channel list (stored as a blob of up to NVS_CFG_HOP_MAX bytes) */
|
|
len = NVS_CFG_HOP_MAX;
|
|
uint8_t ch_blob[NVS_CFG_HOP_MAX];
|
|
if (nvs_get_blob(handle, "chan_list", ch_blob, &len) == ESP_OK && len > 0) {
|
|
uint8_t count = (len < cfg->channel_hop_count) ? (uint8_t)len : cfg->channel_hop_count;
|
|
for (uint8_t i = 0; i < count; i++) {
|
|
cfg->channel_list[i] = ch_blob[i];
|
|
}
|
|
ESP_LOGI(TAG, "NVS override: chan_list loaded (%u channels)", (unsigned)count);
|
|
}
|
|
|
|
/* ADR-029: Dwell time */
|
|
uint32_t dwell_val;
|
|
if (nvs_get_u32(handle, "dwell_ms", &dwell_val) == ESP_OK) {
|
|
if (dwell_val >= 10) {
|
|
cfg->dwell_ms = dwell_val;
|
|
ESP_LOGI(TAG, "NVS override: dwell_ms=%lu", (unsigned long)cfg->dwell_ms);
|
|
} else {
|
|
ESP_LOGW(TAG, "NVS dwell_ms=%lu too small, ignored", (unsigned long)dwell_val);
|
|
}
|
|
}
|
|
|
|
/* ADR-029/031: TDM slot index */
|
|
uint8_t slot_val;
|
|
if (nvs_get_u8(handle, "tdm_slot", &slot_val) == ESP_OK) {
|
|
cfg->tdm_slot_index = slot_val;
|
|
ESP_LOGI(TAG, "NVS override: tdm_slot_index=%u", (unsigned)cfg->tdm_slot_index);
|
|
}
|
|
|
|
/* ADR-029/031: TDM node count */
|
|
uint8_t tdm_nodes_val;
|
|
if (nvs_get_u8(handle, "tdm_nodes", &tdm_nodes_val) == ESP_OK) {
|
|
if (tdm_nodes_val >= 1) {
|
|
cfg->tdm_node_count = tdm_nodes_val;
|
|
ESP_LOGI(TAG, "NVS override: tdm_node_count=%u", (unsigned)cfg->tdm_node_count);
|
|
} else {
|
|
ESP_LOGW(TAG, "NVS tdm_nodes=%u invalid, ignored", (unsigned)tdm_nodes_val);
|
|
}
|
|
}
|
|
|
|
/* ADR-039: Edge intelligence overrides. */
|
|
uint8_t edge_tier_val;
|
|
if (nvs_get_u8(handle, "edge_tier", &edge_tier_val) == ESP_OK) {
|
|
if (edge_tier_val <= 2) {
|
|
cfg->edge_tier = edge_tier_val;
|
|
ESP_LOGI(TAG, "NVS override: edge_tier=%u", (unsigned)cfg->edge_tier);
|
|
}
|
|
}
|
|
|
|
/* Presence threshold stored as u16 (value * 1000). */
|
|
uint16_t pres_thresh_val;
|
|
if (nvs_get_u16(handle, "pres_thresh", &pres_thresh_val) == ESP_OK) {
|
|
cfg->presence_thresh = (float)pres_thresh_val / 1000.0f;
|
|
ESP_LOGI(TAG, "NVS override: presence_thresh=%.3f", cfg->presence_thresh);
|
|
}
|
|
|
|
/* Fall threshold stored as u16 (value * 1000). */
|
|
uint16_t fall_thresh_val;
|
|
if (nvs_get_u16(handle, "fall_thresh", &fall_thresh_val) == ESP_OK) {
|
|
cfg->fall_thresh = (float)fall_thresh_val / 1000.0f;
|
|
ESP_LOGI(TAG, "NVS override: fall_thresh=%.3f", cfg->fall_thresh);
|
|
}
|
|
|
|
uint16_t vital_win_val;
|
|
if (nvs_get_u16(handle, "vital_win", &vital_win_val) == ESP_OK) {
|
|
if (vital_win_val >= 32 && vital_win_val <= 256) {
|
|
cfg->vital_window = vital_win_val;
|
|
ESP_LOGI(TAG, "NVS override: vital_window=%u", cfg->vital_window);
|
|
}
|
|
}
|
|
|
|
uint16_t vital_int_val;
|
|
if (nvs_get_u16(handle, "vital_int", &vital_int_val) == ESP_OK) {
|
|
if (vital_int_val >= 100) {
|
|
cfg->vital_interval_ms = vital_int_val;
|
|
ESP_LOGI(TAG, "NVS override: vital_interval_ms=%u", cfg->vital_interval_ms);
|
|
}
|
|
}
|
|
|
|
uint8_t topk_val;
|
|
if (nvs_get_u8(handle, "subk_count", &topk_val) == ESP_OK) {
|
|
if (topk_val >= 1 && topk_val <= 32) {
|
|
cfg->top_k_count = topk_val;
|
|
ESP_LOGI(TAG, "NVS override: top_k_count=%u", (unsigned)cfg->top_k_count);
|
|
}
|
|
}
|
|
|
|
uint8_t duty_val;
|
|
if (nvs_get_u8(handle, "power_duty", &duty_val) == ESP_OK) {
|
|
if (duty_val >= 10 && duty_val <= 100) {
|
|
cfg->power_duty = duty_val;
|
|
ESP_LOGI(TAG, "NVS override: power_duty=%u%%", (unsigned)cfg->power_duty);
|
|
}
|
|
}
|
|
|
|
/* ADR-040: WASM configuration overrides. */
|
|
uint8_t wasm_max_val;
|
|
if (nvs_get_u8(handle, "wasm_max", &wasm_max_val) == ESP_OK) {
|
|
if (wasm_max_val >= 1 && wasm_max_val <= 8) {
|
|
cfg->wasm_max_modules = wasm_max_val;
|
|
ESP_LOGI(TAG, "NVS override: wasm_max_modules=%u", (unsigned)cfg->wasm_max_modules);
|
|
}
|
|
}
|
|
|
|
uint8_t wasm_verify_val;
|
|
if (nvs_get_u8(handle, "wasm_verify", &wasm_verify_val) == ESP_OK) {
|
|
cfg->wasm_verify = wasm_verify_val ? 1 : 0;
|
|
ESP_LOGI(TAG, "NVS override: wasm_verify=%u", (unsigned)cfg->wasm_verify);
|
|
}
|
|
|
|
/* ADR-040: Load WASM signing public key from NVS (32-byte blob). */
|
|
cfg->wasm_pubkey_valid = 0;
|
|
memset(cfg->wasm_pubkey, 0, 32);
|
|
size_t pubkey_len = 32;
|
|
if (nvs_get_blob(handle, "wasm_pubkey", cfg->wasm_pubkey, &pubkey_len) == ESP_OK
|
|
&& pubkey_len == 32)
|
|
{
|
|
cfg->wasm_pubkey_valid = 1;
|
|
ESP_LOGI(TAG, "NVS: wasm_pubkey loaded (%02x%02x...%02x%02x)",
|
|
cfg->wasm_pubkey[0], cfg->wasm_pubkey[1],
|
|
cfg->wasm_pubkey[30], cfg->wasm_pubkey[31]);
|
|
} else if (cfg->wasm_verify) {
|
|
ESP_LOGW(TAG, "wasm_verify=1 but no wasm_pubkey in NVS — uploads will be rejected");
|
|
}
|
|
|
|
/* Validate tdm_slot_index < tdm_node_count */
|
|
if (cfg->tdm_slot_index >= cfg->tdm_node_count) {
|
|
ESP_LOGW(TAG, "tdm_slot_index=%u >= tdm_node_count=%u, clamping to 0",
|
|
(unsigned)cfg->tdm_slot_index, (unsigned)cfg->tdm_node_count);
|
|
cfg->tdm_slot_index = 0;
|
|
}
|
|
|
|
nvs_close(handle);
|
|
}
|