feat: ESP-NOW link, beat sync and control messages in the C++ driver
- espnow_link, ctrl_msg and beat_sync: the reliable link, envelopes and beat-synced timing. - ctrl_msg: accept an envelope with the trailing save byte. - patterns_frame() and espnow_link_poll() split out of their tasks, so the WebAssembly simulator can drive one frame and one link pass from a timer. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
94e300f6ad
commit
24dd5ffb15
30 files changed
+2159
-158
No files matched your search
+179
-37
@@ -40,6 +40,19 @@ static cJSON *rgb_json(const uint8_t *c)
|
||||
|
||||
static bool read_rgb(const cJSON *a, uint8_t *out)
|
||||
{
|
||||
// The controller sends colours as "#RRGGBB" text
|
||||
if (cJSON_IsString(a)) {
|
||||
const char *s = a->valuestring[0] == '#' ? a->valuestring + 1 : a->valuestring;
|
||||
char *end = nullptr;
|
||||
unsigned long v = strtoul(s, &end, 16);
|
||||
if (end != s + 6 || s[0] == '+' || s[0] == '-' || s[0] == ' ') {
|
||||
return false;
|
||||
}
|
||||
out[0] = (uint8_t)(v >> 16);
|
||||
out[1] = (uint8_t)((v >> 8) & 0xFF);
|
||||
out[2] = (uint8_t)(v & 0xFF);
|
||||
return true;
|
||||
}
|
||||
if (!cJSON_IsArray(a) || cJSON_GetArraySize(a) != 3) {
|
||||
return false;
|
||||
}
|
||||
@@ -120,8 +133,8 @@ bool preset_from_json(const cJSON *o, preset_t *p)
|
||||
if (cJSON_IsNumber(v)) p->fade = (uint32_t)(v->valueint < 0 ? 0 : v->valueint);
|
||||
v = cJSON_GetObjectItem(o, "beat_time");
|
||||
if (cJSON_IsBool(v)) p->beat_time = cJSON_IsTrue(v);
|
||||
static const char *keys[] = { "n1", "n2", "n3", "n4" };
|
||||
for (int i = 0; i < 4; i++) {
|
||||
static const char *keys[] = { "n1", "n2", "n3", "n4", "n5", "n6" };
|
||||
for (int i = 0; i < 6; i++) {
|
||||
v = cJSON_GetObjectItem(o, keys[i]);
|
||||
if (cJSON_IsNumber(v)) p->n[i + 1] = v->valueint;
|
||||
}
|
||||
@@ -130,27 +143,65 @@ bool preset_from_json(const cJSON *o, preset_t *p)
|
||||
return true;
|
||||
}
|
||||
|
||||
// Write the whole list to NVS as one JSON blob
|
||||
static esp_err_t save_list(void)
|
||||
// One key per preset ("p00".."p63"), so a save writes one small entry instead of the whole list.
|
||||
// NVS_SLOTS is the most keys any build has written; the 24 KB nvs partition holds about 50 presets.
|
||||
#define NVS_SLOTS 64
|
||||
static void entry_key(char *out, size_t n, size_t i)
|
||||
{
|
||||
cJSON *arr = cJSON_CreateArray();
|
||||
for (size_t i = 0; i < s_count; i++) {
|
||||
cJSON_AddItemToArray(arr, preset_to_json(&s_list[i]));
|
||||
}
|
||||
char *s = cJSON_PrintUnformatted(arr);
|
||||
cJSON_Delete(arr);
|
||||
snprintf(out, n, "p%02u", (unsigned)i);
|
||||
}
|
||||
|
||||
static esp_err_t save_entry(nvs_handle_t h, size_t i)
|
||||
{
|
||||
cJSON *o = preset_to_json(&s_list[i]);
|
||||
char *s = cJSON_PrintUnformatted(o);
|
||||
cJSON_Delete(o);
|
||||
if (!s) {
|
||||
return ESP_ERR_NO_MEM;
|
||||
}
|
||||
char key[8];
|
||||
entry_key(key, sizeof(key), i);
|
||||
esp_err_t err = nvs_set_str(h, key, s);
|
||||
cJSON_free(s);
|
||||
return err;
|
||||
}
|
||||
|
||||
// Write every preset, the count and the startup name. Erases keys past the new count and the old blob.
|
||||
static esp_err_t save_list(void)
|
||||
{
|
||||
nvs_handle_t h;
|
||||
esp_err_t err = nvs_open(NS, NVS_READWRITE, &h);
|
||||
if (err == ESP_OK) {
|
||||
err = nvs_set_blob(h, "list", s, strlen(s));
|
||||
if (err == ESP_OK) err = nvs_set_str(h, "startup", s_startup);
|
||||
if (err == ESP_OK) err = nvs_commit(h);
|
||||
nvs_close(h);
|
||||
if (err != ESP_OK) {
|
||||
return err;
|
||||
}
|
||||
cJSON_free(s);
|
||||
for (size_t i = 0; i < s_count && err == ESP_OK; i++) {
|
||||
err = save_entry(h, i);
|
||||
}
|
||||
for (size_t i = s_count; i < NVS_SLOTS; i++) {
|
||||
char key[8];
|
||||
entry_key(key, sizeof(key), i);
|
||||
nvs_erase_key(h, key); // also keys left by an older build with a bigger limit
|
||||
}
|
||||
nvs_erase_key(h, "list"); // the single blob written by older firmware
|
||||
if (err == ESP_OK) err = nvs_set_u32(h, "n", (uint32_t)s_count);
|
||||
if (err == ESP_OK) err = nvs_set_str(h, "startup", s_startup);
|
||||
if (err == ESP_OK) err = nvs_commit(h);
|
||||
nvs_close(h);
|
||||
return err;
|
||||
}
|
||||
|
||||
// Write one preset (slot idx) and the count
|
||||
static esp_err_t save_one(size_t idx)
|
||||
{
|
||||
nvs_handle_t h;
|
||||
esp_err_t err = nvs_open(NS, NVS_READWRITE, &h);
|
||||
if (err != ESP_OK) {
|
||||
return err;
|
||||
}
|
||||
err = save_entry(h, idx);
|
||||
if (err == ESP_OK) err = nvs_set_u32(h, "n", (uint32_t)s_count);
|
||||
if (err == ESP_OK) err = nvs_commit(h);
|
||||
nvs_close(h);
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -183,6 +234,21 @@ static int build_defaults(preset_t *out, int max)
|
||||
p->delay = 150;
|
||||
p->brightness = 180;
|
||||
}
|
||||
if ((p = add("Chase Marquee", "chase"))) {
|
||||
p->ncol = 1;
|
||||
p->col[0][0] = 255; p->col[0][1] = 200; p->col[0][2] = 80;
|
||||
p->n[1] = 3; p->n[2] = 2; p->n[3] = 1; p->n[6] = 1; // dashes that scroll
|
||||
p->delay = 120;
|
||||
p->brightness = 180;
|
||||
}
|
||||
if ((p = add("Chase Reverse", "chase"))) {
|
||||
p->ncol = 2;
|
||||
p->col[0][0] = 0; p->col[0][1] = 255; p->col[0][2] = 120;
|
||||
p->col[1][0] = 120; p->col[1][1] = 0; p->col[1][2] = 255;
|
||||
p->n[1] = 6; p->n[2] = 6; p->n[3] = -1; p->n[4] = -1; // negative steps run it backwards
|
||||
p->delay = 120;
|
||||
p->brightness = 180;
|
||||
}
|
||||
if ((p = add("Aurora", "aurora"))) {
|
||||
p->n[1] = 3;
|
||||
p->n[2] = 40;
|
||||
@@ -243,6 +309,61 @@ int presets_add_defaults(void)
|
||||
return added;
|
||||
}
|
||||
|
||||
// Read the one JSON list written by older firmware. Returns false if there is none.
|
||||
static bool load_legacy(nvs_handle_t h)
|
||||
{
|
||||
size_t len = 0;
|
||||
if (nvs_get_blob(h, "list", NULL, &len) != ESP_OK || len == 0) {
|
||||
return false;
|
||||
}
|
||||
char *buf = (char *)malloc(len + 1);
|
||||
if (!buf) {
|
||||
return false;
|
||||
}
|
||||
bool ok = false;
|
||||
if (nvs_get_blob(h, "list", buf, &len) == ESP_OK) {
|
||||
buf[len] = '\0';
|
||||
cJSON *arr = cJSON_Parse(buf);
|
||||
cJSON *o;
|
||||
cJSON_ArrayForEach(o, arr) {
|
||||
if (s_count >= PRESETS_MAX) break;
|
||||
preset_t p;
|
||||
preset_defaults(&p, 0);
|
||||
if (preset_from_json(o, &p) && p.name[0]) {
|
||||
s_list[s_count++] = p;
|
||||
}
|
||||
}
|
||||
cJSON_Delete(arr);
|
||||
ok = true;
|
||||
}
|
||||
free(buf);
|
||||
return ok;
|
||||
}
|
||||
|
||||
static void load_entry(nvs_handle_t h, uint32_t i)
|
||||
{
|
||||
char key[8];
|
||||
entry_key(key, sizeof(key), i);
|
||||
size_t len = 0;
|
||||
if (nvs_get_str(h, key, NULL, &len) != ESP_OK || len == 0) {
|
||||
return;
|
||||
}
|
||||
char *buf = (char *)malloc(len);
|
||||
if (!buf) {
|
||||
return;
|
||||
}
|
||||
if (nvs_get_str(h, key, buf, &len) == ESP_OK) {
|
||||
cJSON *o = cJSON_Parse(buf);
|
||||
preset_t p;
|
||||
preset_defaults(&p, 0);
|
||||
if (o && preset_from_json(o, &p) && p.name[0] && s_count < PRESETS_MAX) {
|
||||
s_list[s_count++] = p;
|
||||
}
|
||||
cJSON_Delete(o);
|
||||
}
|
||||
free(buf);
|
||||
}
|
||||
|
||||
esp_err_t presets_init(void)
|
||||
{
|
||||
s_count = 0;
|
||||
@@ -254,35 +375,35 @@ esp_err_t presets_init(void)
|
||||
presets_add_defaults(); // a new board
|
||||
return ESP_OK;
|
||||
}
|
||||
size_t len = 0;
|
||||
bool have_list = nvs_get_blob(h, "list", NULL, &len) == ESP_OK;
|
||||
if (have_list && len > 0) {
|
||||
char *buf = (char *)malloc(len + 1);
|
||||
if (buf && nvs_get_blob(h, "list", buf, &len) == ESP_OK) {
|
||||
buf[len] = '\0';
|
||||
cJSON *arr = cJSON_Parse(buf);
|
||||
cJSON *o;
|
||||
cJSON_ArrayForEach(o, arr) {
|
||||
if (s_count >= PRESETS_MAX) break;
|
||||
preset_t p;
|
||||
preset_defaults(&p, 0);
|
||||
if (preset_from_json(o, &p) && p.name[0]) {
|
||||
s_list[s_count++] = p;
|
||||
}
|
||||
}
|
||||
cJSON_Delete(arr);
|
||||
uint32_t n = 0;
|
||||
bool have_list = nvs_get_u32(h, "n", &n) == ESP_OK;
|
||||
bool legacy = false;
|
||||
if (have_list) {
|
||||
if (n > PRESETS_MAX) {
|
||||
ESP_LOGW(TAG, "%u presets saved, room for %d: the rest are not loaded", (unsigned)n, PRESETS_MAX);
|
||||
}
|
||||
free(buf);
|
||||
for (uint32_t i = 0; i < n && i < PRESETS_MAX; i++) {
|
||||
load_entry(h, i);
|
||||
}
|
||||
} else {
|
||||
legacy = load_legacy(h);
|
||||
have_list = legacy;
|
||||
}
|
||||
len = sizeof(s_startup);
|
||||
size_t len = sizeof(s_startup);
|
||||
if (nvs_get_str(h, "startup", s_startup, &len) != ESP_OK) {
|
||||
s_startup[0] = '\0';
|
||||
}
|
||||
nvs_close(h);
|
||||
if (legacy) {
|
||||
save_list(); // move the old blob to per-preset keys
|
||||
}
|
||||
if (!have_list) {
|
||||
presets_add_defaults(); // nothing saved yet: start with the defaults
|
||||
}
|
||||
ESP_LOGI(TAG, "%u presets loaded", (unsigned)s_count);
|
||||
for (size_t i = 0; i < s_count; i++) {
|
||||
ESP_LOGI(TAG, " [%u] %s", (unsigned)i, s_list[i].name);
|
||||
}
|
||||
return ESP_OK;
|
||||
}
|
||||
|
||||
@@ -296,17 +417,36 @@ const preset_t *presets_at(size_t i)
|
||||
return i < s_count ? &s_list[i] : NULL;
|
||||
}
|
||||
|
||||
static uint32_t s_dropped; // saves refused because the store was full
|
||||
|
||||
uint32_t presets_dropped(void)
|
||||
{
|
||||
return s_dropped;
|
||||
}
|
||||
|
||||
esp_err_t presets_save(const preset_t *preset)
|
||||
{
|
||||
int idx = find(preset->name);
|
||||
if (idx < 0) {
|
||||
bool added = idx < 0;
|
||||
if (added) {
|
||||
if (s_count >= PRESETS_MAX) {
|
||||
s_dropped++;
|
||||
ESP_LOGW(TAG, "store full (%d presets): '%s' not saved", PRESETS_MAX, preset->name);
|
||||
return ESP_ERR_NO_MEM;
|
||||
}
|
||||
idx = (int)s_count++;
|
||||
}
|
||||
s_list[idx] = *preset;
|
||||
return save_list();
|
||||
ESP_LOGI(TAG, "save '%s' (%s), %u presets", preset->name, added ? "new" : "update", (unsigned)s_count);
|
||||
esp_err_t err = save_one((size_t)idx);
|
||||
if (err != ESP_OK) {
|
||||
s_dropped++;
|
||||
ESP_LOGW(TAG, "'%s' not saved to flash: %s", preset->name, esp_err_to_name(err));
|
||||
if (added) {
|
||||
s_count--; // keep RAM and flash the same
|
||||
}
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
esp_err_t presets_set_order(const char *const *names, size_t n)
|
||||
@@ -328,6 +468,7 @@ esp_err_t presets_set_order(const char *const *names, size_t n)
|
||||
}
|
||||
}
|
||||
memcpy(s_list, fresh, m * sizeof(preset_t));
|
||||
ESP_LOGI(TAG, "order: %u presets (was %u)", (unsigned)m, (unsigned)s_count);
|
||||
s_count = m;
|
||||
return save_list();
|
||||
}
|
||||
@@ -342,6 +483,7 @@ esp_err_t presets_delete(const char *name)
|
||||
s_list[i] = s_list[i + 1];
|
||||
}
|
||||
s_count--;
|
||||
ESP_LOGI(TAG, "delete '%s', %u presets", name, (unsigned)s_count);
|
||||
if (strcmp(s_startup, name) == 0) {
|
||||
s_startup[0] = '\0';
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user