From db40d1d38117e7925e3ba5b1aa649ef96a98bad3 Mon Sep 17 00:00:00 2001 From: proddy Date: Mon, 5 Jan 2026 21:36:21 +0100 Subject: [PATCH] set default values, just to be sure --- src/ESP32React/APSettingsService.h | 10 +++++----- src/ESP32React/MqttSettingsService.h | 26 ++++++++++++------------- src/ESP32React/NTPSettingsService.h | 8 ++++---- src/ESP32React/NetworkSettingsService.h | 8 ++++---- src/ESP32React/SecurityManager.h | 1 - 5 files changed, 26 insertions(+), 27 deletions(-) diff --git a/src/ESP32React/APSettingsService.h b/src/ESP32React/APSettingsService.h index d895e94a3..fda384bc8 100644 --- a/src/ESP32React/APSettingsService.h +++ b/src/ESP32React/APSettingsService.h @@ -59,11 +59,11 @@ enum APNetworkStatus { ACTIVE = 0, INACTIVE, LINGERING }; class APSettings { public: uint8_t provisionMode = FACTORY_AP_PROVISION_MODE; // 0 = on, 2 = off - String ssid; - String password; - uint8_t channel = FACTORY_AP_CHANNEL; - bool ssidHidden = FACTORY_AP_SSID_HIDDEN; - uint8_t maxClients = FACTORY_AP_MAX_CLIENTS; + String ssid = FACTORY_AP_SSID; + String password = FACTORY_AP_PASSWORD; + 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 4c3ad7c06..b31859201 100644 --- a/src/ESP32React/MqttSettingsService.h +++ b/src/ESP32React/MqttSettingsService.h @@ -66,19 +66,19 @@ class MqttSettings { public: - bool enabled = FACTORY_MQTT_ENABLED; - String host; - uint16_t port = FACTORY_MQTT_PORT; - String rootCA; + bool enabled = FACTORY_MQTT_ENABLED; + String host = FACTORY_MQTT_HOST; + uint16_t port = FACTORY_MQTT_PORT; + String rootCA = ""; bool enableTLS = false; - String username; - String password; + String username = FACTORY_MQTT_USERNAME; + String password = FACTORY_MQTT_PASSWORD; String clientId; uint16_t keepAlive = FACTORY_MQTT_KEEP_ALIVE; bool cleanSession = FACTORY_MQTT_CLEAN_SESSION; // EMS-ESP specific - String base; + String base = FACTORY_MQTT_BASE; 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; @@ -91,12 +91,12 @@ class MqttSettings { 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 = 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; + String discovery_prefix = EMSESP_DEFAULT_DISCOVERY_PREFIX; + 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 cd55284d7..4b3bbce69 100644 --- a/src/ESP32React/NTPSettingsService.h +++ b/src/ESP32React/NTPSettingsService.h @@ -30,10 +30,10 @@ class NTPSettings { public: - bool enabled = FACTORY_NTP_ENABLED; - String tzLabel; - String tzFormat; - String server; + bool enabled = FACTORY_NTP_ENABLED; + String tzLabel = FACTORY_NTP_TIME_ZONE_LABEL; + String tzFormat = FACTORY_NTP_TIME_ZONE_FORMAT; + String server = FACTORY_NTP_SERVER; static void read(NTPSettings & settings, JsonObject root); static StateUpdateResult update(JsonObject root, NTPSettings & settings); diff --git a/src/ESP32React/NetworkSettingsService.h b/src/ESP32React/NetworkSettingsService.h index 80e27c695..f35186bf6 100644 --- a/src/ESP32React/NetworkSettingsService.h +++ b/src/ESP32React/NetworkSettingsService.h @@ -64,10 +64,10 @@ class NetworkSettings { public: // core wifi configuration - String ssid; - String bssid; - String password; - String hostname; + String ssid = FACTORY_WIFI_SSID; + String bssid = ""; + String password = FACTORY_WIFI_PASSWORD; + String hostname = FACTORY_WIFI_HOSTNAME; bool staticIPConfig = false; bool bandwidth20 = false; uint8_t tx_power = 0; diff --git a/src/ESP32React/SecurityManager.h b/src/ESP32React/SecurityManager.h index 247f21019..b4dc89bb8 100644 --- a/src/ESP32React/SecurityManager.h +++ b/src/ESP32React/SecurityManager.h @@ -9,7 +9,6 @@ #include #define ACCESS_TOKEN_PARAMATER "access_token" - #define AUTHORIZATION_HEADER "Authorization" #define AUTHORIZATION_HEADER_PREFIX "Bearer " #define AUTHORIZATION_HEADER_PREFIX_LEN 7