fixed timesync listening on wrong topic and added messageId counter f…

…or timesync reply
helgeerbe · Oct 4, 2024 · 50ee059 · 50ee059
1 parent 69e2d78
commit 50ee059
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/include/ZendureBattery.h b/include/ZendureBattery.h
@@ -122,7 +122,7 @@ class ZendureBattery : public BatteryProvider {
     void shutdown() const;
 
 protected:
-    void timesync() const;
+    void timesync();
     static String parseVersion(uint32_t version);
     uint16_t calcOutputLimit(uint16_t limit) const;
 
@@ -145,6 +145,8 @@ class ZendureBattery : public BatteryProvider {
     uint32_t _rateSunCalcMs;
     uint64_t _nextSunCalc;
 
+    uint32_t _messageCounter = 0;
+
     String _deviceId;
 
     String _baseTopic;

diff --git a/src/ZendureBattery.cpp b/src/ZendureBattery.cpp
@@ -82,7 +82,7 @@ bool ZendureBattery::init(bool verboseLogging)
 
     // subscribe for timesync messages
     _topicTimesync = _baseTopic + "time-sync";
-    MqttSettings.subscribe(_topicReport, 0/*QoS*/,
+    MqttSettings.subscribe(_topicTimesync, 0/*QoS*/,
             std::bind(&ZendureBattery::onMqttMessageTimesync,
                 this, std::placeholders::_1, std::placeholders::_2,
                 std::placeholders::_3, std::placeholders::_4,
@@ -302,13 +302,13 @@ void ZendureBattery::shutdown() const
     }
 }
 
-void ZendureBattery::timesync() const
+void ZendureBattery::timesync()
 {
     struct tm timeinfo;
     if (!_baseTopic.isEmpty() && getLocalTime(&timeinfo, 5)) {
         char timeStringBuff[50];
         strftime(timeStringBuff, sizeof(timeStringBuff), "%s", &timeinfo);
-        MqttSettings.publishGeneric("iot" + _baseTopic + "time-sync/reply","{\"zoneOffset\": \"+00:00\", \"messageId\": 123, \"timestamp\": " + String(timeStringBuff) + "}", false, 0);
+        MqttSettings.publishGeneric("iot" + _baseTopic + "time-sync/reply","{\"zoneOffset\": \"+00:00\", \"messageId\": " + String(++_messageCounter) + ", \"timestamp\": " + String(timeStringBuff) + "}", false, 0);
         MessageOutput.printf("ZendureBattery: Timesync Reply\r\n");
     }
 }