From 82514e9e411e214a884a1d8482cbd05589d82765 Mon Sep 17 00:00:00 2001
From: Stefan Allius <stefan.allius@t-online.de>
Date: Wed, 17 Apr 2024 22:03:12 +0200
Subject: [PATCH] calculate real timestamp for received data

---
 app/src/gen3plus/solarman_v5.py | 47 +++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/app/src/gen3plus/solarman_v5.py b/app/src/gen3plus/solarman_v5.py
index fe1e347..554366c 100644
--- a/app/src/gen3plus/solarman_v5.py
+++ b/app/src/gen3plus/solarman_v5.py
@@ -55,6 +55,7 @@ class SolarmanV5(Message):
         self.seq = Sequence(server_side)
         self.snr = 0
         self.db = InfosG3P()
+        self.time_ofs = 0
         self.switch = {
 
             0x4210: self.msg_data_ind,   # real time data
@@ -352,10 +353,11 @@ class SolarmanV5(Message):
         total = result[1]
         tim = result[2]
         res = result[3]  # always zero
-        logger.info(f'frame type:{ftype:02x} total:{total}s'
+        logger.info(f'frame type:{ftype:02x}'
                     f' timer:{tim:08x}s  null:{res}')
-        dt = datetime.fromtimestamp(total)
-        logger.info(f'ts: {dt.strftime("%Y-%m-%d %H:%M:%S")}')
+        if self.time_ofs:
+            dt = datetime.fromtimestamp(total + self.time_ofs)
+            logger.info(f'ts: {dt.strftime("%Y-%m-%d %H:%M:%S")}')
 
         self.__process_data(ftype)
         self.__forward_msg()
@@ -363,27 +365,33 @@ class SolarmanV5(Message):
 
     def msg_data_ind(self):
         data = self._recv_buffer
-        result = struct.unpack_from('<BLLLLL', data, self.header_len)
+        result = struct.unpack_from('<BHLLLHL', data, self.header_len)
         ftype = result[0]  # 1 or 0x81
-        total = result[1]
-        tim = result[2]
-        offset = result[3]
-        unkn = result[4]
-        cnt = result[5]
-        logger.info(f'ftype:{ftype:02x} total:{total}s'
-                    f' timer:{tim:08x}s  ofs:{offset}'
-                    f' ??: {unkn:08x} cnt:{cnt}')
-        dt = datetime.fromtimestamp(total)
-        logger.info(f'ts: {dt.strftime("%Y-%m-%d %H:%M:%S")}')
+        total = result[2]
+        tim = result[3]
+        if 1 == ftype:
+            self.time_ofs = result[4]
+        unkn = result[5]
+        cnt = result[6]
+        logger.info(f'ftype:{ftype:02x} timer:{tim:08x}s'
+                    f' ??: {unkn:04x} cnt:{cnt}')
+        if self.time_ofs:
+            dt = datetime.fromtimestamp(total + self.time_ofs)
+            logger.info(f'ts: {dt.strftime("%Y-%m-%d %H:%M:%S")}')
 
-        self.__process_data(ftype & 0x7f)  # mask bit 7  (0x80)
+        self.__process_data(ftype)
         self.__forward_msg()
         self.__send_ack_rsp(0x1210, ftype)
 
     def msg_sync_start(self):
         data = self._recv_buffer[self.header_len:]
-        result = struct.unpack_from('<B', data, 0)
+        result = struct.unpack_from('<BLLL', data, 0)
         ftype = result[0]
+        total = result[1]
+        self.time_ofs = result[3]
+
+        dt = datetime.fromtimestamp(total + self.time_ofs)
+        logger.info(f'ts: {dt.strftime("%Y-%m-%d %H:%M:%S")}')
 
         self.__forward_msg()
         self.__send_ack_rsp(0x1310, ftype)
@@ -407,8 +415,13 @@ class SolarmanV5(Message):
 
     def msg_sync_end(self):
         data = self._recv_buffer[self.header_len:]
-        result = struct.unpack_from('<B', data, 0)
+        result = struct.unpack_from('<BLL', data, 0)
         ftype = result[0]
+        total = result[1]
+        self.time_ofs = result[3]
+
+        dt = datetime.fromtimestamp(total + self.time_ofs)
+        logger.info(f'ts: {dt.strftime("%Y-%m-%d %H:%M:%S")}')
 
         self.__forward_msg()
         self.__send_ack_rsp(0x1810, ftype)