🎨 Moving project to use event bus

2025-07-08 21:47:06 +02:00
parent 0586775849
commit 6769ffeb20
69 changed files with 497 additions and 496 deletions
@@ -0,0 +1,136 @@
+#pragma once
+
+#include <WiFi.h>
+#include <IPAddress.h>
+#include <ArduinoJson.h>
+#include <utils/json_utils.h>
+#include <utils/ip_utils.h>
+#include <utils/string_utils.h>
+#include <template/state_result.h>
+
+#ifndef FACTORY_WIFI_SSID
+#define FACTORY_WIFI_SSID ""
+#endif
+
+#ifndef FACTORY_WIFI_PASSWORD
+#define FACTORY_WIFI_PASSWORD ""
+#endif
+
+#ifndef FACTORY_WIFI_HOSTNAME
+#define FACTORY_WIFI_HOSTNAME "#{platform}-#{unique_id}"
+#endif
+
+#ifndef FACTORY_WIFI_RSSI_THRESHOLD
+#define FACTORY_WIFI_RSSI_THRESHOLD -80
+#endif
+
+typedef struct {
+    String ssid;
+    uint8_t bssid[6];
+    int32_t channel;
+    String password;
+    bool staticIPConfig;
+    IPAddress localIP;
+    IPAddress gatewayIP;
+    IPAddress subnetMask;
+    IPAddress dnsIP1;
+    IPAddress dnsIP2;
+    bool available;
+
+    void serialize(JsonObject &json) const {
+        json["ssid"] = ssid;
+        json["password"] = password;
+        json["static_ip_config"] = staticIPConfig;
+        if (staticIPConfig) {
+            JsonUtils::writeIP(json, "local_ip", localIP);
+            JsonUtils::writeIP(json, "gateway_ip", gatewayIP);
+            JsonUtils::writeIP(json, "subnet_mask", subnetMask);
+            JsonUtils::writeIP(json, "dns_ip_1", dnsIP1);
+            JsonUtils::writeIP(json, "dns_ip_2", dnsIP2);
+        }
+    }
+
+    bool deserialize(const JsonObject &json) {
+        String newSsid = json["ssid"].as<String>();
+        String newPassword = json["password"].as<String>();
+        if (newSsid.length() < 1 || newSsid.length() > 31 || newPassword.length() > 64) {
+            ESP_LOGE("WiFiSettings", "SSID or password length is invalid");
+            return false;
+        }
+        ssid = newSsid;
+        password = newPassword;
+        staticIPConfig = json["static_ip_config"] | false;
+        if (staticIPConfig) {
+            JsonUtils::readIP(json, "local_ip", localIP);
+            JsonUtils::readIP(json, "gateway_ip", gatewayIP);
+            JsonUtils::readIP(json, "subnet_mask", subnetMask);
+            JsonUtils::readIP(json, "dns_ip_1", dnsIP1);
+            JsonUtils::readIP(json, "dns_ip_2", dnsIP2);
+            if (IPUtils::isNotSet(dnsIP1) && IPUtils::isSet(dnsIP2)) {
+                dnsIP1 = dnsIP2;
+                dnsIP2 = INADDR_NONE;
+            }
+            if (IPUtils::isNotSet(localIP) || IPUtils::isNotSet(gatewayIP) || IPUtils::isNotSet(subnetMask)) {
+                staticIPConfig = false;
+                ESP_LOGW("WiFiSettings", "Invalid static IP configuration - falling back to DHCP");
+            }
+        }
+        available = false;
+        return true;
+    }
+
+} wifi_settings_t;
+
+inline wifi_settings_t createDefaultWiFiSettings() {
+    return wifi_settings_t {.ssid = FACTORY_WIFI_SSID,
+                            .password = FACTORY_WIFI_PASSWORD,
+                            .staticIPConfig = false,
+                            .localIP = INADDR_NONE,
+                            .gatewayIP = INADDR_NONE,
+                            .subnetMask = INADDR_NONE,
+                            .dnsIP1 = INADDR_NONE,
+                            .dnsIP2 = INADDR_NONE,
+                            .available = false};
+}
+
+class WiFiSettings {
+  public:
+    String hostname;
+    bool priorityBySignalStrength;
+    std::vector<wifi_settings_t> wifiSettings;
+    static void read(WiFiSettings &settings, JsonObject &root) {
+        root["hostname"] = settings.hostname;
+        root["priority_RSSI"] = settings.priorityBySignalStrength;
+        JsonArray wifiNetworks = root["wifi_networks"].to<JsonArray>();
+        for (const auto &wifi : settings.wifiSettings) {
+            JsonObject wifiNetwork = wifiNetworks.add<JsonObject>();
+            wifi.serialize(wifiNetwork);
+        }
+        ESP_LOGV("WiFiSettings", "WiFi Settings read");
+    }
+    static StateUpdateResult update(JsonObject &root, WiFiSettings &settings) {
+        settings.hostname = root["hostname"] | FACTORY_WIFI_HOSTNAME;
+        settings.priorityBySignalStrength = root["priority_RSSI"] | true;
+        settings.wifiSettings.clear();
+        if (root["wifi_networks"].is<JsonArray>()) {
+            JsonArray wifiNetworks = root["wifi_networks"];
+            int networkCount = 0;
+            for (JsonObject wifiNetwork : wifiNetworks) {
+                if (networkCount >= 5) {
+                    ESP_LOGE("WiFiSettings", "Too many wifi networks");
+                    break;
+                }
+                wifi_settings_t newSettings;
+                if (newSettings.deserialize(wifiNetwork)) {
+                    settings.wifiSettings.push_back(newSettings);
+                    networkCount++;
+                }
+            }
+        } else if (String(FACTORY_WIFI_SSID).length() > 0) {
+            ESP_LOGI("WiFiSettings", "No WiFi config found - using factory settings");
+            settings.wifiSettings.push_back(createDefaultWiFiSettings());
+        }
+        ESP_LOGV("WiFiSettings", "WiFi Settings updated");
+        return StateUpdateResult::CHANGED;
+    }
+};