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
+66
-4
@@ -17,7 +17,6 @@ static const char *TAG = "net";
|
||||
|
||||
#define AP_CHANNEL 1
|
||||
#define AP_MAX_CLIENTS 4
|
||||
#define MDNS_HOSTNAME "led"
|
||||
#define RETRY_MAX_MS 30000
|
||||
|
||||
static esp_netif_t *s_ap_netif;
|
||||
@@ -37,6 +36,35 @@ static void apply_sta_config(const wifi_creds_t *c)
|
||||
esp_wifi_set_config(WIFI_IF_STA, &cfg);
|
||||
}
|
||||
|
||||
// Client address: DHCP, or the static address from settings. Called before the client connects.
|
||||
static esp_err_t apply_client_ip(const net_cfg_t *c)
|
||||
{
|
||||
if (!c->use_static) {
|
||||
esp_err_t err = esp_netif_dhcpc_start(s_sta_netif);
|
||||
// Already running is fine
|
||||
return (err == ESP_OK || err == ESP_ERR_ESP_NETIF_DHCP_ALREADY_STARTED) ? ESP_OK : err;
|
||||
}
|
||||
esp_netif_ip_info_t info = {};
|
||||
if (esp_netif_str_to_ip4(c->ip, &info.ip) != ESP_OK ||
|
||||
esp_netif_str_to_ip4(c->netmask, &info.netmask) != ESP_OK ||
|
||||
esp_netif_str_to_ip4(c->gateway, &info.gw) != ESP_OK) {
|
||||
return ESP_ERR_INVALID_ARG;
|
||||
}
|
||||
esp_netif_dhcpc_stop(s_sta_netif); // ignore "not started"
|
||||
esp_err_t err = esp_netif_set_ip_info(s_sta_netif, &info);
|
||||
if (err != ESP_OK) {
|
||||
return err;
|
||||
}
|
||||
esp_netif_dns_info_t dns = {};
|
||||
const char *dns_str = c->dns[0] ? c->dns : c->gateway;
|
||||
if (esp_netif_str_to_ip4(dns_str, &dns.ip.u_addr.ip4) == ESP_OK) {
|
||||
dns.ip.type = ESP_IPADDR_TYPE_V4;
|
||||
esp_netif_set_dns_info(s_sta_netif, ESP_NETIF_DNS_MAIN, &dns);
|
||||
}
|
||||
ESP_LOGI(TAG, "Client static IP %s/%s gw %s", c->ip, c->netmask, c->gateway);
|
||||
return ESP_OK;
|
||||
}
|
||||
|
||||
static void retry_cb(void *arg)
|
||||
{
|
||||
(void)arg;
|
||||
@@ -52,6 +80,13 @@ static void on_wifi_event(void *arg, esp_event_base_t base, int32_t id, void *da
|
||||
case WIFI_EVENT_STA_START: {
|
||||
wifi_creds_t c;
|
||||
if (settings_load_wifi(&c) == ESP_OK && c.ssid[0]) {
|
||||
net_cfg_t n;
|
||||
settings_load_net(&n);
|
||||
if (apply_client_ip(&n) != ESP_OK) {
|
||||
ESP_LOGW(TAG, "Static IP settings are invalid; using DHCP");
|
||||
n.use_static = false;
|
||||
apply_client_ip(&n);
|
||||
}
|
||||
esp_wifi_connect();
|
||||
}
|
||||
break;
|
||||
@@ -133,12 +168,14 @@ esp_err_t net_start(void)
|
||||
ESP_ERROR_CHECK(esp_wifi_start());
|
||||
ESP_LOGI(TAG, "AP %s started", ssid);
|
||||
|
||||
// mDNS: led.local, with an HTTP service on port 80
|
||||
// mDNS: <hostname>.local, with an HTTP service on port 80
|
||||
net_cfg_t n;
|
||||
settings_load_net(&n);
|
||||
ESP_ERROR_CHECK(mdns_init());
|
||||
ESP_ERROR_CHECK(mdns_hostname_set(MDNS_HOSTNAME));
|
||||
ESP_ERROR_CHECK(mdns_hostname_set(n.hostname));
|
||||
ESP_ERROR_CHECK(mdns_instance_name_set("LED controller"));
|
||||
ESP_ERROR_CHECK(mdns_service_add(NULL, "_http", "_tcp", 80, NULL, 0));
|
||||
ESP_LOGI(TAG, "mDNS: %s.local", MDNS_HOSTNAME);
|
||||
ESP_LOGI(TAG, "mDNS: %s.local", n.hostname);
|
||||
return ESP_OK;
|
||||
}
|
||||
|
||||
@@ -167,6 +204,31 @@ esp_err_t net_sta_connect(const wifi_creds_t *c)
|
||||
return esp_wifi_connect();
|
||||
}
|
||||
|
||||
esp_err_t net_save_network(const net_cfg_t *c)
|
||||
{
|
||||
esp_err_t err = settings_save_net(c);
|
||||
if (err != ESP_OK) {
|
||||
return err;
|
||||
}
|
||||
err = mdns_hostname_set(c->hostname);
|
||||
if (err != ESP_OK) {
|
||||
return err;
|
||||
}
|
||||
// Reconnect with the new address settings if a client is configured
|
||||
wifi_creds_t w;
|
||||
if (settings_load_wifi(&w) != ESP_OK || !w.ssid[0]) {
|
||||
return ESP_OK;
|
||||
}
|
||||
esp_timer_stop(s_retry_timer);
|
||||
esp_wifi_disconnect();
|
||||
s_retries = 0;
|
||||
err = apply_client_ip(c);
|
||||
if (err != ESP_OK) {
|
||||
return err;
|
||||
}
|
||||
return esp_wifi_connect();
|
||||
}
|
||||
|
||||
esp_err_t net_scan(wifi_ap_record_t *recs, uint16_t *count)
|
||||
{
|
||||
esp_err_t err = esp_wifi_scan_start(NULL, true);
|
||||
|
||||
Reference in new issue
Block a user