[models] added heatpump model and added "since" function to variables models

pyheatpump/models/__init__.py

@@ -1,4 +1,5 @@
+from .heatpump import Heatpump
 from .variable import Variable
 from .variable_type import VariableType
 from .variable_value import VariableValue
-__all__ = ['Variable', 'VariableType', 'VariableValue']
+__all__ = ['Heatpump', 'Variable', 'VariableType', 'VariableValue']

pyheatpump/models/heatpump.py

@@ -0,0 +1,42 @@
+#!/usr/bin/env python3
+from typing import Dict
+from datetime import datetime
+
+from .variable_type import VariableType
+from .variable import Variable
+from .variable_value import VariableValue
+
+class Heatpump:
+    mac_address: str
+    var_types: Dict
+    last_update: int = None
+
+    def __init__(self, mac_address, last_update):
+        self.mac_address = mac_address
+        self.last_update = last_update
+        self.var_types = VariableType.getall()
+
+    def __str__(self):
+        return str(self.__dict__())
+
+    def __dict__(self):
+        r = {'macAddress': self.macformat}
+        if self.last_update is None:
+            return { **r, **self.get_var_values() }
+        return { **r, **self.get_var_values_since() }
+
+    @property
+    def macformat(self):
+        return ''.join(self.mac_address.split(':')).lower()
+
+    def get_var_values(self):
+        r = {}
+        for label, var_type in self.var_types.items():
+            r[label] = var_type.get_variables_values()
+        return r
+
+    def get_var_values_since(self):
+        r = {}
+        for label, var_type in self.var_types.items():
+            r[label] = var_type.get_variables_values_since(self.last_update)
+        return r

pyheatpump/models/variable.py

@@ -68,10 +68,20 @@ class Variable(RowClass):
 
     @staticmethod
     def getall_values_of_type(type: VariableType) -> dict:
-         return dict([
-            (row['address'], row['value'])
+        return Variable.getall_values_of_type_since(type, 0) 
+
+
+    @staticmethod
+    def getall_values_of_type_since(type: VariableType, since: int) -> dict:
+        floatcast = lambda x: round(float(x)/10, 2)
+        cast_fct = floatcast if type.slabel == 'F' else lambda x: x
+
+        offset = 10000 if (type.slabel == 'D') else 0
+        return dict([
+            (row['address'], cast_fct(row['value']))
             for row in sql(
-            """SELECT var.address, val.value FROM variable var
+            """SELECT (var.address + {}) as address, val.value
+            FROM variable var
             LEFT JOIN var_value val ON
                 var.type = val.type
                 AND var.address = val.address
@@ -79,11 +89,13 @@ class Variable(RowClass):
             WHERE
                 var.type = '{}'
                 AND var.address >= {}
-                AND var.address <= {}""".format(
-            type, type.start_address, type.end_address))
+                AND var.address <= {}
+                AND var.last_update > {}""".format(
+            offset, type, type.start_address, type.end_address, since))
         ])
 
 
+
     def modbus_update(self):
         if self.type == 'A':
             pass

pyheatpump/models/variable_type.py

@@ -59,6 +59,11 @@ class VariableType(RowClass):
         from .variable import Variable
         return Variable.getall_values_of_type(self)
 
+    def get_variables_values_since(self, since: int):
+        from .variable import Variable
+        return Variable.getall_values_of_type_since(self, since)
+
+
     @staticmethod
     def getall():
         return dict([