fixes the timestamp for HA integration + startup value for dtuStateOb…

…server
ohAnd · Nov 25, 2024 · 954686c · 954686c
1 parent 4190066
commit 954686c
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 12 deletions.
diff --git a/include/dtuInterface.h b/include/dtuInterface.h
@@ -57,7 +57,7 @@ struct connectionControl
 {
   boolean preventCloudErrors = true;
   boolean dtuActiveOffToCloudUpdate = false;
-  boolean dtuConnectionOnline = true;          // true if connection is online as valued a summary
+  boolean dtuConnectionOnline = false;          // true if connection is online as a valued summary
   uint8_t dtuConnectState = DTU_STATE_OFFLINE;
   uint8_t dtuErrorState = DTU_ERROR_NO_ERROR;
   uint8_t dtuTxRxState = DTU_TXRX_STATE_IDLE;

diff --git a/include/version.h b/include/version.h
@@ -1,3 +1,3 @@
-#define VERSION "2.0.274_localDev"
-#define BUILDTIME "27.10.2024 - 18:39:49"
-#define BUILDTIMESTAMP "1730050789"
+#define VERSION "2.0.338_localDev"
+#define BUILDTIME "25.11.2024 - 11:14:29"
+#define BUILDTIMESTAMP "1732529669"
diff --git a/include/version.json b/include/version.json
@@ -1,6 +1,6 @@
 {
-    "version": "2.0.274_localDev",
-    "versiondate": "27.10.2024 - 18:39:49",
-    "linksnapshot": "https://github.com/ohAnd/dtuGateway/releases/download/snapshot/dtuGateway_snapshot_2.0.274_localDev.bin",
-    "link": "https://github.com/ohAnd/dtuGateway/releases/latest/download/dtuGateway_release_2.0.274_localDev.bin"
+    "version": "2.0.338_localDev",
+    "versiondate": "25.11.2024 - 11:14:29",
+    "linksnapshot": "https://github.com/ohAnd/dtuGateway/releases/download/snapshot/dtuGateway_snapshot_2.0.338_localDev.bin",
+    "link": "https://github.com/ohAnd/dtuGateway/releases/latest/download/dtuGateway_release_2.0.338_localDev.bin"
 }
diff --git a/platformio.ini b/platformio.ini
@@ -64,8 +64,8 @@ platform = espressif8266
 board = esp07s
 framework = arduino
 monitor_speed = 115200
-monitor_port = COM17
-upload_port = COM17
+monitor_port = COM18
+upload_port = COM18
 upload_speed = 921600
 lib_deps = 
 	arduino-libraries/NTPClient @ ^3.2.1

diff --git a/src/Config.cpp b/src/Config.cpp
@@ -157,7 +157,7 @@ void UserConfigManager::printConfigdata()
     Serial.println(userConfig.remoteDisplayActive);
 
     Serial.println(F("\ndisplay"));
-    Serial.print(F("connected: \t\t\t"));
+    Serial.print(F("connected type: \t\t\t"));
     Serial.println(userConfig.displayConnected);
     Serial.print(F("orientation: \t\t\t"));
     Serial.println(userConfig.displayOrientation);

diff --git a/src/dtuGateway.ino b/src/dtuGateway.ino
@@ -485,6 +485,15 @@ boolean scanNetworksResult()
 // }
 
 // APIs (non REST)
+String getTimeStringByTimestamp(unsigned long timestamp)
+{
+  UnixTime stamp(1);
+  char buf[31];
+  stamp.getDateTime(timestamp - 3600);
+  // should have the format "2023-11-11T18:11:17+00:00"
+  snprintf(buf, sizeof(buf), "%04i-%02i-%02iT%02i:%02i:%02i%+03i:00", stamp.year, stamp.month, stamp.day, stamp.hour, stamp.minute, stamp.second, userConfig.timezoneOffest / 3600);
+  return String(buf);
+}
 
 // openhab
 // send item to openhab
@@ -641,7 +650,7 @@ void updateValuesToMqtt(boolean haAutoDiscovery = false)
 {
   Serial.println("MQTT:\t\t publish data (HA autoDiscovery = " + String(haAutoDiscovery) + ")");
   std::map<std::string, std::string> keyValueStore;
-  keyValueStore["time_stamp"] = String(dtuGlobalData.currentTimestamp).c_str();
+  keyValueStore["time_stamp"] = getTimeStringByTimestamp(platformData.currentNTPtime).c_str();
   // grid
   keyValueStore["grid_U"] = String(dtuGlobalData.grid.voltage).c_str();
   keyValueStore["grid_I"] = String(dtuGlobalData.grid.current).c_str();