[models] fixed some variable names and remove Digital address offsets

pyheatpump/models/heatpump.py

@@ -6,6 +6,9 @@ from .variable_type import VariableType
 from .variable import Variable
 from .variable_value import VariableValue
 
+from pyheatpump.logger import logger_init
+logger = logger_init()
+
 class Heatpump:
     mac_address: str
     var_types: Dict
@@ -42,8 +45,14 @@ class Heatpump:
         return r
 
     def control(self, data):
-        if data['mac_address'] != self.mac_address:
-            logger.warn(f'Orders are not for the current heatpump ({self.mac_address} != {data["mac_address"]})')
+        logger.warn('Received orders data :')
+        logger.warn(data)
+        if 'macAddress' not in data.keys():
+            logger.info(f'No orders')
+            return True
+
+        if data['macAddress'] != self.macformat:
+            logger.warn(f'Orders are not for the current heatpump ({self.mac_address} != {data["macAddress"]})')
             raise Exception('Wrong mac_address')
 
         for label, var_type in self.var_types.items():

pyheatpump/models/variable.py

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

pyheatpump/models/variable_type.py

@@ -64,8 +64,14 @@ class VariableType(RowClass):
         return Variable.getall_values_of_type_since(self, since)
 
     def control(self, data):
+        from .variable import Variable
+        from .variable_value import VariableValue
+
         for s_address, s_value in data.items():
             address = int(s_address)
+            if self.slabel == 'I':
+                # For integers, we have to respect the offset to get the address
+                address = address + self.start_address - 1
 
             # All values are stored in strings that represent floats
             # We have to convert them
@@ -80,10 +86,12 @@ class VariableType(RowClass):
             if address not in range(self.start_address, self.end_address + 1):
                 continue
 
-            if not Variable(self, address).exists():
+            if not Variable(**{
+                    'type': self,
+                    'address': address}).exists():
                 continue
 
-            new_var_value = VariableValue({
+            new_var_value = VariableValue(**{
                 'type': self,
                 'address': address,
                 'value': value})