fix standalone, formatting

CHANGELOG_LATEST.md

@@ -21,4 +21,4 @@ For more details go to [emsesp.org](https://emsesp.org/).
 
 - call compute value direct, enlarge TCP stack [#3127](https://github.com/emsesp/EMS-ESP32/discussions/3127)
 - Dewtemperature for Easycontrol calculated by ems-esp [3135](https://github.com/emsesp/EMS-ESP32/issues/3135)
-- add option for sync thermostat to ntp, allow different time zones [3148](https://github.com/emsesp/EMS-ESP32/discussions/3148), defaults to no sync.
+- add option for sync thermostat to ntp, allow different time zones [3148](https://github.com/emsesp/EMS-ESP32/discussions/3148), **defaults to no sync**.

factory_settings.ini

@@ -24,6 +24,7 @@ build_flags =
     -D FACTORY_NTP_TIME_ZONE_LABEL=\"Europe/Amsterdam\"
     -D FACTORY_NTP_TIME_ZONE_FORMAT=\"CET-1CEST,M3.5.0,M10.5.0/3\"
     -D FACTORY_NTP_SERVER=\"time.google.com\"
+    -D FACTORY_NTP_THERMOSTAT_SYNC=0
 
     ; MQTT settings
     -D FACTORY_MQTT_ENABLED=false

interface/src/app/settings/NTPSettings.tsx

@@ -215,11 +215,11 @@ const changeTimeZoneT = useCallback(
             <Grid>
               <ValidatedTextField
                 fieldErrors={fieldErrors || {}}
-                name="thermostat_option"
+                name="thermostat_sync"
                 label="Sync EMS-Thermostat"
                 variant="outlined"
                 sx={{ width: '30ch' }}
-                value={data.thermostat_option}
+                value={data.thermostat_sync}
                 onChange={updateFormValue}
                 margin="normal"
                 select
@@ -230,7 +230,7 @@ const changeTimeZoneT = useCallback(
               </ValidatedTextField >
             </Grid>
             <Grid>
-              {data.thermostat_option === 2 && (
+              {data.thermostat_sync === 2 && (
                 <ValidatedTextField
                   fieldErrors={fieldErrors || {}}
                   name="tz_label_t"

interface/src/types/ntp.ts

@@ -16,7 +16,7 @@ export interface NTPSettingsType {
   server: string;
   tz_label: string;
   tz_format: string;
-  thermostat_option: number;
+  thermostat_sync: number;
   tz_label_t: string;
   tz_format_t: string;
 }

lib_standalone/ESP32React.h

@@ -81,6 +81,10 @@ class DummySettings {
     // NTP
     String  server          = "pool.ntp.org";
     String  tzLabel         = "Europe/London";
+    String  tzFormat        = "GMT0BST,M3.5.0/1,M10.5.0";
+    String  tzLabelT        = "Europe/Berlin";
+    String  tzFormatT       = "CET-1CEST,M3.5.0,M10.5.0/3";
+    uint8_t thermostat_sync = 0;
 
     static void read(DummySettings & settings, JsonObject root) {};
     static void read(DummySettings & settings) {};

src/ESP32React/NTPSettingsService.cpp

@@ -90,7 +90,7 @@ void NTPSettings::read(NTPSettings & settings, JsonObject root) {
     root["server"]          = settings.server;
     root["tz_label"]        = settings.tzLabel;
     root["tz_format"]       = settings.tzFormat;
-    root["thermostat_option"] = settings.thermostat_option;
+    root["thermostat_sync"] = settings.thermostat_sync;
     root["tz_label_t"]      = settings.tzLabelT;
     root["tz_format_t"]     = settings.tzFormatT;
 }
@@ -100,7 +100,7 @@ StateUpdateResult NTPSettings::update(JsonObject root, NTPSettings & settings) {
     settings.server          = root["server"] | FACTORY_NTP_SERVER;
     settings.tzLabel         = root["tz_label"] | FACTORY_NTP_TIME_ZONE_LABEL;
     settings.tzFormat        = root["tz_format"] | FACTORY_NTP_TIME_ZONE_FORMAT;
-    settings.thermostat_option = root["thermostat_option"] | 0;
+    settings.thermostat_sync = root["thermostat_sync"] | FACTORY_NTP_THERMOSTAT_SYNC;
     settings.tzLabelT        = root["tz_label_t"] | settings.tzLabel;
     settings.tzFormatT       = root["tz_format_t"] | settings.tzFormat;
     return StateUpdateResult::CHANGED;

src/ESP32React/NTPSettingsService.h

@@ -34,7 +34,7 @@ class NTPSettings {
     String  tzLabel         = FACTORY_NTP_TIME_ZONE_LABEL;
     String  tzFormat        = FACTORY_NTP_TIME_ZONE_FORMAT;
     String  server          = FACTORY_NTP_SERVER;
-    uint8_t thermostat_option = 0;
+    uint8_t thermostat_sync = FACTORY_NTP_THERMOSTAT_SYNC;
     String  tzLabelT        = FACTORY_NTP_TIME_ZONE_LABEL;
     String  tzFormatT       = FACTORY_NTP_TIME_ZONE_FORMAT;
 

src/devices/thermostat.cpp

@@ -1741,7 +1741,7 @@ void Thermostat::process_RCTime(std::shared_ptr<const Telegram> telegram) {
     tm *   tm_;
     bool   sync = true;
     EMSESP::esp32React.getNTPSettingsService()->read([&](const NTPSettings & settings) {
-        switch (settings.thermostat_option) {
+        switch (settings.thermostat_sync) {
         default:
             sync = false;
             break;
@@ -3085,7 +3085,7 @@ bool Thermostat::set_datetime(const char * value, const int8_t id) {
         time_t now = time(nullptr);
         tm *   tm_;
         EMSESP::esp32React.getNTPSettingsService()->read([&](const NTPSettings & settings) {
-            switch (settings.thermostat_option) {
+            switch (settings.thermostat_sync) {
             default:
                 tm_ = localtime(&now);
                 break;