init settings

This commit is contained in:
proddy
2026-01-03 14:13:54 +01:00
parent 41bf293db3
commit 425b44e334
4 changed files with 35 additions and 34 deletions

View File

@@ -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;

View File

@@ -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);

View File

@@ -30,7 +30,7 @@
class NTPSettings {
public:
bool enabled;
bool enabled = FACTORY_NTP_ENABLED;
String tzLabel;
String tzFormat;
String server;

View File

@@ -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;