feat: web UI with AP, Wi-Fi client, mDNS, presets, OTA and DDP
- Wi-Fi access point led-XXXXXX plus a client network, configurable mDNS name and static client address - Preset tiles with an editor, drag to reorder, default presets, global brightness, Run and Edit modes, collapsible menu on phones - 35 patterns ported from led-driver, up to 512 LEDs, colour order, max brightness and data pin settings - Over-the-air updates (POST /ota) with rollback, and a CLI in tools/ota.py - DDP receiver on UDP 4048 with tools/ddp_test.py - LED refresh every 10 ms; lwIP sockets raised to 16 so mDNS, HTTP and DDP can run together Co-Authored-By: Claude Haiku 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
89f996096c
commit
9a04d28ecf
32 files changed
+6210
-398
No files matched your search
@@ -0,0 +1,391 @@
|
||||
/*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*
|
||||
* Named presets, stored in NVS as one JSON list (as the MicroPython presets.json), with a startup preset.
|
||||
*/
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
|
||||
#include "cJSON.h"
|
||||
#include "esp_log.h"
|
||||
#include "nvs.h"
|
||||
#include "presets.h"
|
||||
|
||||
static const char *TAG = "presets";
|
||||
static const char *NS = "presets";
|
||||
|
||||
static preset_t s_list[PRESETS_MAX];
|
||||
static size_t s_count;
|
||||
static char s_startup[32];
|
||||
static char s_selected[32];
|
||||
|
||||
static int find(const char *name)
|
||||
{
|
||||
for (size_t i = 0; i < s_count; i++) {
|
||||
if (strcmp(s_list[i].name, name) == 0) {
|
||||
return (int)i;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
static cJSON *rgb_json(const uint8_t *c)
|
||||
{
|
||||
cJSON *a = cJSON_CreateArray();
|
||||
for (int i = 0; i < 3; i++) {
|
||||
cJSON_AddItemToArray(a, cJSON_CreateNumber(c[i]));
|
||||
}
|
||||
return a;
|
||||
}
|
||||
|
||||
static bool read_rgb(const cJSON *a, uint8_t *out)
|
||||
{
|
||||
if (!cJSON_IsArray(a) || cJSON_GetArraySize(a) != 3) {
|
||||
return false;
|
||||
}
|
||||
for (int i = 0; i < 3; i++) {
|
||||
cJSON *v = cJSON_GetArrayItem(a, i);
|
||||
if (!cJSON_IsNumber(v)) {
|
||||
return false;
|
||||
}
|
||||
int x = v->valueint;
|
||||
out[i] = (uint8_t)(x < 0 ? 0 : (x > 255 ? 255 : x));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
cJSON *preset_to_json(const preset_t *p)
|
||||
{
|
||||
cJSON *o = cJSON_CreateObject();
|
||||
cJSON_AddStringToObject(o, "name", p->name);
|
||||
cJSON_AddStringToObject(o, "pattern", patterns_name(p->pattern));
|
||||
cJSON *colors = cJSON_AddArrayToObject(o, "colors");
|
||||
for (int i = 0; i < p->ncol; i++) {
|
||||
cJSON_AddItemToArray(colors, rgb_json(p->col[i]));
|
||||
}
|
||||
cJSON_AddItemToObject(o, "background", rgb_json(p->bg));
|
||||
cJSON_AddNumberToObject(o, "delay", p->delay);
|
||||
cJSON_AddNumberToObject(o, "brightness", p->brightness);
|
||||
cJSON_AddBoolToObject(o, "auto", p->autorun);
|
||||
cJSON_AddBoolToObject(o, "reverse", p->reverse);
|
||||
cJSON_AddNumberToObject(o, "fade", p->fade);
|
||||
cJSON_AddBoolToObject(o, "beat_time", p->beat_time);
|
||||
cJSON_AddNumberToObject(o, "n1", p->n[1]);
|
||||
cJSON_AddNumberToObject(o, "n2", p->n[2]);
|
||||
cJSON_AddNumberToObject(o, "n3", p->n[3]);
|
||||
cJSON_AddNumberToObject(o, "n4", p->n[4]);
|
||||
cJSON_AddNumberToObject(o, "mode", p->n[6]); // n6: the pattern's style
|
||||
return o;
|
||||
}
|
||||
|
||||
bool preset_from_json(const cJSON *o, preset_t *p)
|
||||
{
|
||||
if (!cJSON_IsObject(o)) {
|
||||
return false;
|
||||
}
|
||||
cJSON *v = cJSON_GetObjectItem(o, "name");
|
||||
if (cJSON_IsString(v)) {
|
||||
strncpy(p->name, v->valuestring, sizeof(p->name) - 1);
|
||||
p->name[sizeof(p->name) - 1] = '\0';
|
||||
}
|
||||
v = cJSON_GetObjectItem(o, "pattern");
|
||||
if (cJSON_IsString(v)) {
|
||||
int idx = patterns_index(v->valuestring);
|
||||
if (idx < 0) {
|
||||
return false;
|
||||
}
|
||||
p->pattern = idx;
|
||||
}
|
||||
v = cJSON_GetObjectItem(o, "colors");
|
||||
if (cJSON_IsArray(v)) {
|
||||
int n = cJSON_GetArraySize(v);
|
||||
if (n > PATTERN_MAX_COLOURS) n = PATTERN_MAX_COLOURS;
|
||||
p->ncol = 0;
|
||||
for (int i = 0; i < n; i++) {
|
||||
if (read_rgb(cJSON_GetArrayItem(v, i), p->col[p->ncol])) {
|
||||
p->ncol++;
|
||||
}
|
||||
}
|
||||
}
|
||||
read_rgb(cJSON_GetObjectItem(o, "background"), p->bg);
|
||||
v = cJSON_GetObjectItem(o, "delay");
|
||||
if (cJSON_IsNumber(v)) p->delay = (uint32_t)(v->valueint < 0 ? 0 : v->valueint);
|
||||
v = cJSON_GetObjectItem(o, "brightness");
|
||||
if (cJSON_IsNumber(v)) p->brightness = (uint8_t)(v->valueint < 0 ? 0 : (v->valueint > 255 ? 255 : v->valueint));
|
||||
v = cJSON_GetObjectItem(o, "auto");
|
||||
if (cJSON_IsBool(v)) p->autorun = cJSON_IsTrue(v);
|
||||
v = cJSON_GetObjectItem(o, "reverse");
|
||||
if (cJSON_IsBool(v)) p->reverse = cJSON_IsTrue(v);
|
||||
v = cJSON_GetObjectItem(o, "fade");
|
||||
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++) {
|
||||
v = cJSON_GetObjectItem(o, keys[i]);
|
||||
if (cJSON_IsNumber(v)) p->n[i + 1] = v->valueint;
|
||||
}
|
||||
v = cJSON_GetObjectItem(o, "mode");
|
||||
if (cJSON_IsNumber(v)) p->n[6] = v->valueint;
|
||||
return true;
|
||||
}
|
||||
|
||||
// Write the whole list to NVS as one JSON blob
|
||||
static esp_err_t save_list(void)
|
||||
{
|
||||
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);
|
||||
if (!s) {
|
||||
return ESP_ERR_NO_MEM;
|
||||
}
|
||||
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);
|
||||
}
|
||||
cJSON_free(s);
|
||||
return err;
|
||||
}
|
||||
|
||||
// The presets a new board starts with (added by presets_add_defaults, and on a board that has none saved)
|
||||
static int build_defaults(preset_t *out, int max)
|
||||
{
|
||||
int n = 0;
|
||||
auto add = [&](const char *name, const char *pattern) -> preset_t * {
|
||||
if (n >= max) {
|
||||
return NULL;
|
||||
}
|
||||
preset_t *p = &out[n++];
|
||||
preset_defaults(p, patterns_index(pattern));
|
||||
strncpy(p->name, name, sizeof(p->name) - 1);
|
||||
p->name[sizeof(p->name) - 1] = '\0';
|
||||
return p;
|
||||
};
|
||||
preset_t *p;
|
||||
if ((p = add("Rainbow", "colour_cycle"))) {
|
||||
p->n[6] = 1; // rainbow wheel
|
||||
p->n[1] = 2;
|
||||
p->delay = 60;
|
||||
p->brightness = 160;
|
||||
}
|
||||
if ((p = add("Chase", "chase"))) {
|
||||
p->ncol = 2;
|
||||
p->col[0][0] = 255; p->col[0][1] = 80; p->col[0][2] = 0;
|
||||
p->col[1][0] = 0; p->col[1][1] = 120; p->col[1][2] = 255;
|
||||
p->n[1] = 4; p->n[2] = 4; p->n[3] = 1; p->n[4] = 1;
|
||||
p->delay = 150;
|
||||
p->brightness = 180;
|
||||
}
|
||||
if ((p = add("Aurora", "aurora"))) {
|
||||
p->n[1] = 3;
|
||||
p->n[2] = 40;
|
||||
p->delay = 40;
|
||||
p->brightness = 150;
|
||||
}
|
||||
if ((p = add("Candle", "candle_glow"))) {
|
||||
p->ncol = 3;
|
||||
p->col[0][0] = 255; p->col[0][1] = 140; p->col[0][2] = 40;
|
||||
p->col[1][0] = 255; p->col[1][1] = 200; p->col[1][2] = 120;
|
||||
p->col[2][0] = 255; p->col[2][1] = 90; p->col[2][2] = 20;
|
||||
p->n[1] = 4; p->n[2] = 3; p->n[3] = 90;
|
||||
p->delay = 120;
|
||||
p->brightness = 200;
|
||||
}
|
||||
if ((p = add("Twinkle", "twinkle"))) {
|
||||
p->ncol = 1;
|
||||
p->col[0][0] = 200; p->col[0][1] = 220; p->col[0][2] = 255;
|
||||
p->bg[2] = 20;
|
||||
p->n[1] = 48; p->n[2] = 128;
|
||||
p->delay = 100;
|
||||
p->brightness = 200;
|
||||
}
|
||||
if ((p = add("Flame", "flame"))) {
|
||||
p->delay = 40;
|
||||
p->brightness = 255;
|
||||
p->n[2] = 2500;
|
||||
}
|
||||
if ((p = add("Sweep", "sweep"))) {
|
||||
p->ncol = 2;
|
||||
p->col[0][0] = 255; p->col[0][1] = 0; p->col[0][2] = 120;
|
||||
p->col[1][0] = 0; p->col[1][1] = 200; p->col[1][2] = 255;
|
||||
p->n[1] = 90; p->n[2] = 200; p->n[3] = 200;
|
||||
p->delay = 2000;
|
||||
p->brightness = 200;
|
||||
}
|
||||
if ((p = add("Off", "off"))) {
|
||||
p->brightness = 255;
|
||||
}
|
||||
return n;
|
||||
}
|
||||
|
||||
// Add the default presets whose names aren't in the list yet. Returns how many were added.
|
||||
int presets_add_defaults(void)
|
||||
{
|
||||
preset_t defs[16];
|
||||
int n = build_defaults(defs, 16);
|
||||
int added = 0;
|
||||
for (int i = 0; i < n; i++) {
|
||||
if (find(defs[i].name) < 0 && s_count < PRESETS_MAX) {
|
||||
s_list[s_count++] = defs[i];
|
||||
added++;
|
||||
}
|
||||
}
|
||||
if (added > 0) {
|
||||
save_list();
|
||||
}
|
||||
return added;
|
||||
}
|
||||
|
||||
esp_err_t presets_init(void)
|
||||
{
|
||||
s_count = 0;
|
||||
s_startup[0] = '\0';
|
||||
s_selected[0] = '\0';
|
||||
|
||||
nvs_handle_t h;
|
||||
if (nvs_open(NS, NVS_READONLY, &h) != ESP_OK) {
|
||||
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);
|
||||
}
|
||||
free(buf);
|
||||
}
|
||||
len = sizeof(s_startup);
|
||||
if (nvs_get_str(h, "startup", s_startup, &len) != ESP_OK) {
|
||||
s_startup[0] = '\0';
|
||||
}
|
||||
nvs_close(h);
|
||||
if (!have_list) {
|
||||
presets_add_defaults(); // nothing saved yet: start with the defaults
|
||||
}
|
||||
ESP_LOGI(TAG, "%u presets loaded", (unsigned)s_count);
|
||||
return ESP_OK;
|
||||
}
|
||||
|
||||
size_t presets_count(void)
|
||||
{
|
||||
return s_count;
|
||||
}
|
||||
|
||||
const preset_t *presets_at(size_t i)
|
||||
{
|
||||
return i < s_count ? &s_list[i] : NULL;
|
||||
}
|
||||
|
||||
esp_err_t presets_save(const preset_t *preset)
|
||||
{
|
||||
int idx = find(preset->name);
|
||||
if (idx < 0) {
|
||||
if (s_count >= PRESETS_MAX) {
|
||||
return ESP_ERR_NO_MEM;
|
||||
}
|
||||
idx = (int)s_count++;
|
||||
}
|
||||
s_list[idx] = *preset;
|
||||
return save_list();
|
||||
}
|
||||
|
||||
esp_err_t presets_set_order(const char *const *names, size_t n)
|
||||
{
|
||||
// Static: this is too big for the HTTP server's task stack, and only that task calls it
|
||||
static preset_t fresh[PRESETS_MAX];
|
||||
bool used[PRESETS_MAX] = { false };
|
||||
size_t m = 0;
|
||||
for (size_t k = 0; k < n && m < s_count; k++) {
|
||||
int idx = find(names[k]);
|
||||
if (idx >= 0 && !used[idx]) {
|
||||
used[idx] = true;
|
||||
fresh[m++] = s_list[idx];
|
||||
}
|
||||
}
|
||||
for (size_t i = 0; i < s_count; i++) {
|
||||
if (!used[i]) {
|
||||
fresh[m++] = s_list[i];
|
||||
}
|
||||
}
|
||||
memcpy(s_list, fresh, m * sizeof(preset_t));
|
||||
s_count = m;
|
||||
return save_list();
|
||||
}
|
||||
|
||||
esp_err_t presets_delete(const char *name)
|
||||
{
|
||||
int idx = find(name);
|
||||
if (idx < 0) {
|
||||
return ESP_ERR_NOT_FOUND;
|
||||
}
|
||||
for (size_t i = (size_t)idx; i + 1 < s_count; i++) {
|
||||
s_list[i] = s_list[i + 1];
|
||||
}
|
||||
s_count--;
|
||||
if (strcmp(s_startup, name) == 0) {
|
||||
s_startup[0] = '\0';
|
||||
}
|
||||
if (strcmp(s_selected, name) == 0) {
|
||||
s_selected[0] = '\0';
|
||||
}
|
||||
return save_list();
|
||||
}
|
||||
|
||||
esp_err_t presets_select(const char *name)
|
||||
{
|
||||
int idx = find(name);
|
||||
if (idx < 0) {
|
||||
return ESP_ERR_NOT_FOUND;
|
||||
}
|
||||
patterns_select(s_list[idx]);
|
||||
strncpy(s_selected, name, sizeof(s_selected) - 1);
|
||||
s_selected[sizeof(s_selected) - 1] = '\0';
|
||||
return ESP_OK;
|
||||
}
|
||||
|
||||
const char *presets_selected(void)
|
||||
{
|
||||
return s_selected;
|
||||
}
|
||||
|
||||
esp_err_t presets_set_startup(const char *name)
|
||||
{
|
||||
if (name[0] && find(name) < 0) {
|
||||
return ESP_ERR_NOT_FOUND;
|
||||
}
|
||||
strncpy(s_startup, name, sizeof(s_startup) - 1);
|
||||
s_startup[sizeof(s_startup) - 1] = '\0';
|
||||
return save_list();
|
||||
}
|
||||
|
||||
const char *presets_startup(void)
|
||||
{
|
||||
return s_startup;
|
||||
}
|
||||
|
||||
void presets_apply_startup(void)
|
||||
{
|
||||
if (s_startup[0] && presets_select(s_startup) == ESP_OK) {
|
||||
ESP_LOGI(TAG, "Startup preset: %s", s_startup);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user