Merge remote-tracking branch 'origin/develop'

bram2202 · Aug 29, 2021 · 102f5cb · 102f5cb
2 parents 873b71a + 4e7b574
commit 102f5cb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/AutoConfig.cpp b/AutoConfig.cpp
@@ -141,7 +141,7 @@ void AutoConfig::SendConfig()
     // power_tariff
     autoconfPayload["device"] = device.as<JsonObject>();
     autoconfPayload["availability_topic"] = _identifier + "/power/power_tariff/status";
-    autoconfPayload["state_topic"] = _identifier + "/power/power_tariff/reset";
+    autoconfPayload["state_topic"] = _identifier + "/power/power_tariff";
     autoconfPayload["name"] = _identifier + "_power_tariff";
     autoconfPayload["unique_id"] = "power_tariff";
     serializeJson(autoconfPayload, mqttPayload);

diff --git a/esp8266-dsmr.ino b/esp8266-dsmr.ino
@@ -156,11 +156,12 @@ void handleString(String incomingString)
         break;
       }
 
-      // Check if measurement state is offline, if so publish online state
+      // Check if measurement state is offline, if so publish online state and last reset
       if (!measurement.online)
       {
         measurement.online = true;
         mqttPublisher.publish(measurement.name + "/status", "online", true);
+        mqttPublisher.publish(measurement.name + "/reset", "1970-01-01T00:00:00+00:00", true);
       }
 
       // Publish measurement