From aaa9f5cd9850f21367af0b58936b6663b6fd26f4 Mon Sep 17 00:00:00 2001 From: helgeerbe Date: Wed, 22 Mar 2023 12:34:47 +0100 Subject: [PATCH] power meter settings were not restored. On reboot only default were set --- src/Configuration.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Configuration.cpp b/src/Configuration.cpp index 0cc210dd..168beba1 100644 --- a/src/Configuration.cpp +++ b/src/Configuration.cpp @@ -290,13 +290,13 @@ bool ConfigurationClass::read() JsonObject powermeter = doc["powermeter"]; config.PowerMeter_Enabled = powermeter["enabled"] | POWERMETER_ENABLED; - config.PowerMeter_Interval = POWERMETER_INTERVAL; - config.PowerMeter_Source = POWERMETER_SOURCE; + config.PowerMeter_Interval = powermeter["interval"] | POWERMETER_INTERVAL; + config.PowerMeter_Source = powermeter["source"] | POWERMETER_SOURCE; strlcpy(config.PowerMeter_MqttTopicPowerMeter1, powermeter["mqtt_topic_powermeter_1"] | "", sizeof(config.PowerMeter_MqttTopicPowerMeter1)); strlcpy(config.PowerMeter_MqttTopicPowerMeter2, powermeter["mqtt_topic_powermeter_2"] | "", sizeof(config.PowerMeter_MqttTopicPowerMeter2)); strlcpy(config.PowerMeter_MqttTopicPowerMeter3, powermeter["mqtt_topic_powermeter_3"] | "", sizeof(config.PowerMeter_MqttTopicPowerMeter3)); - config.PowerMeter_SdmBaudrate = POWERMETER_SDMBAUDRATE; - config.PowerMeter_SdmAddress = POWERMETER_SDMADDRESS; + config.PowerMeter_SdmBaudrate = powermeter["sdmbaudrate"] | POWERMETER_SDMBAUDRATE; + config.PowerMeter_SdmAddress = powermeter["sdmaddress"] | POWERMETER_SDMADDRESS; JsonObject powerlimiter = doc["powerlimiter"];