From 425b44e334c3ed3778085a8149d1c88f773adf07 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sat, 3 Jan 2026 14:13:54 +0100
Subject: [PATCH] init settings

---
 src/ESP32React/APSettingsService.h      |  8 ++---
 src/ESP32React/MqttSettingsService.h    | 45 +++++++++++++------------
 src/ESP32React/NTPSettingsService.h     |  2 +-
 src/ESP32React/NetworkSettingsService.h | 14 ++++----
 4 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/src/ESP32React/APSettingsService.h b/src/ESP32React/APSettingsService.h
index 67c9e03bf..d895e94a3 100644
--- a/src/ESP32React/APSettingsService.h
+++ b/src/ESP32React/APSettingsService.h
@@ -58,12 +58,12 @@ enum APNetworkStatus { ACTIVE = 0, INACTIVE, LINGERING };
 
 class APSettings {
   public:
-    uint8_t provisionMode; // 0 = on, 2 = off
+    uint8_t provisionMode = FACTORY_AP_PROVISION_MODE; // 0 = on, 2 = off
     String  ssid;
     String  password;
-    uint8_t channel;
-    bool    ssidHidden;
-    uint8_t maxClients;
+    uint8_t channel    = FACTORY_AP_CHANNEL;
+    bool    ssidHidden = FACTORY_AP_SSID_HIDDEN;
+    uint8_t maxClients = FACTORY_AP_MAX_CLIENTS;
 
     IPAddress localIP;
     IPAddress gatewayIP;
diff --git a/src/ESP32React/MqttSettingsService.h b/src/ESP32React/MqttSettingsService.h
index b844e2ea1..4c3ad7c06 100644
--- a/src/ESP32React/MqttSettingsService.h
+++ b/src/ESP32React/MqttSettingsService.h
@@ -8,6 +8,7 @@
 #include <espMqttClient.h>
 
 #include <uuid/common.h>
+#include <default_settings.h>
 
 #define MQTT_RECONNECTION_DELAY 2000 // 2 seconds
 
@@ -65,37 +66,37 @@
 
 class MqttSettings {
   public:
-    bool     enabled;
+    bool     enabled = FACTORY_MQTT_ENABLED;
     String   host;
-    uint16_t port;
+    uint16_t port = FACTORY_MQTT_PORT;
     String   rootCA;
-    bool     enableTLS;
+    bool     enableTLS = false;
     String   username;
     String   password;
     String   clientId;
-    uint16_t keepAlive;
-    bool     cleanSession;
+    uint16_t keepAlive    = FACTORY_MQTT_KEEP_ALIVE;
+    bool     cleanSession = FACTORY_MQTT_CLEAN_SESSION;
 
     // EMS-ESP specific
     String   base;
-    uint16_t publish_time_boiler;
-    uint16_t publish_time_thermostat;
-    uint16_t publish_time_solar;
-    uint16_t publish_time_mixer;
-    uint16_t publish_time_water;
-    uint16_t publish_time_other;
-    uint16_t publish_time_sensor;
-    uint16_t publish_time_heartbeat;
-    uint8_t  mqtt_qos;
-    bool     mqtt_retain;
-    bool     ha_enabled;
-    uint8_t  nested_format;
+    uint16_t publish_time_boiler     = EMSESP_DEFAULT_PUBLISH_TIME;
+    uint16_t publish_time_thermostat = EMSESP_DEFAULT_PUBLISH_TIME;
+    uint16_t publish_time_solar      = EMSESP_DEFAULT_PUBLISH_TIME;
+    uint16_t publish_time_mixer      = EMSESP_DEFAULT_PUBLISH_TIME;
+    uint16_t publish_time_water      = EMSESP_DEFAULT_PUBLISH_TIME;
+    uint16_t publish_time_other      = EMSESP_DEFAULT_PUBLISH_TIME_OTHER;
+    uint16_t publish_time_sensor     = EMSESP_DEFAULT_PUBLISH_TIME;
+    uint16_t publish_time_heartbeat  = EMSESP_DEFAULT_PUBLISH_HEARTBEAT;
+    uint8_t  mqtt_qos                = EMSESP_DEFAULT_MQTT_QOS;
+    bool     mqtt_retain             = EMSESP_DEFAULT_MQTT_RETAIN;
+    bool     ha_enabled              = EMSESP_DEFAULT_HA_ENABLED;
+    uint8_t  nested_format           = EMSESP_DEFAULT_NESTED_FORMAT;
     String   discovery_prefix;
-    uint8_t  discovery_type;
-    bool     publish_single;
-    bool     publish_single2cmd;
-    bool     send_response;
-    uint8_t  entity_format;
+    uint8_t  discovery_type     = EMSESP_DEFAULT_DISCOVERY_TYPE;
+    bool     publish_single     = EMSESP_DEFAULT_PUBLISH_SINGLE;
+    bool     publish_single2cmd = EMSESP_DEFAULT_PUBLISH_SINGLE2CMD;
+    bool     send_response      = EMSESP_DEFAULT_SEND_RESPONSE;
+    uint8_t  entity_format      = EMSESP_DEFAULT_ENTITY_FORMAT;
 
     static void              read(MqttSettings & settings, JsonObject root);
     static StateUpdateResult update(JsonObject root, MqttSettings & settings);
diff --git a/src/ESP32React/NTPSettingsService.h b/src/ESP32React/NTPSettingsService.h
index 38f4ed5e2..cd55284d7 100644
--- a/src/ESP32React/NTPSettingsService.h
+++ b/src/ESP32React/NTPSettingsService.h
@@ -30,7 +30,7 @@
 
 class NTPSettings {
   public:
-    bool   enabled;
+    bool   enabled = FACTORY_NTP_ENABLED;
     String tzLabel;
     String tzFormat;
     String server;
diff --git a/src/ESP32React/NetworkSettingsService.h b/src/ESP32React/NetworkSettingsService.h
index a12536b78..80e27c695 100644
--- a/src/ESP32React/NetworkSettingsService.h
+++ b/src/ESP32React/NetworkSettingsService.h
@@ -68,13 +68,13 @@ class NetworkSettings {
     String  bssid;
     String  password;
     String  hostname;
-    bool    staticIPConfig;
-    bool    bandwidth20;
-    uint8_t tx_power;
-    bool    nosleep;
-    bool    enableMDNS;
-    bool    enableCORS;
-    String  CORSOrigin;
+    bool    staticIPConfig = false;
+    bool    bandwidth20    = false;
+    uint8_t tx_power       = 0;
+    bool    nosleep        = true;
+    bool    enableMDNS     = true;
+    bool    enableCORS     = false;
+    String  CORSOrigin     = "*";
 
     // optional configuration for static IP address
     IPAddress localIP;