[models] cast is a method again + fix bugs

pyheatpump/models/heatpump.py

@@ -47,10 +47,10 @@ class Heatpump:
         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
+        return {
+            var_type.label: var_type.get_variables_values()
+            for var_type in self.var_types.values()
+        }
 
     def get_var_values_since(self):
         r = {}

pyheatpump/models/variable.py

@@ -56,7 +56,7 @@ class Variable(RowClass):
     @staticmethod
     def getall():
         return {
-            str(row): Variable.getall_of_type(row)
+            row.slabel: Variable.getall_of_type(row)
             for _, row in VariableType.getall().items()
         }
 
@@ -89,8 +89,9 @@ class Variable(RowClass):
         floatcast = lambda x: round(float(x) / 10, 2)
         cast_fct = floatcast if type.slabel == 'A' else lambda x: x
         """
-        if not var_type.cast:
-            raise Exception('var_type has no cast property')
+        if not var_type.cast():
+            # Should not happen
+            return {}
 
         params = {
             'slabel': var_type.slabel,
@@ -100,7 +101,7 @@ class Variable(RowClass):
         }
 
         return {
-            row['address']: var_type.cast(row['value'])
+            row['address']: var_type.cast()(row['value'])
 
             for row in DB.sql(
             """SELECT var.address as address, val.value as value

pyheatpump/models/variable_type.py

@@ -19,11 +19,10 @@ class VariableType(RowClass):
         return self.slabel or self.label[0]
 
 
-    @property
     def cast(self):
+        # Function to convert numbers > 2**15 to negative numbers (issue #30)
         complement = lambda x: x - (1 << 16 if x & (1 << 15) else 0)
 
-        # Function to convert numbers > 2**15 to negative numbers (issue #30)
         if self.type == 'bool':
             # returns a boolean
             return lambda x: bool(x)
@@ -65,6 +64,7 @@ class VariableType(RowClass):
 
     def get_variables_values(self):
         from .variable import Variable
+        print(self)
         return Variable.getall_values_of_type(self)
 
     def get_variables_values_since(self, since: int):

pyheatpump/models/variable_value.py

@@ -51,7 +51,7 @@ class VariableValue(RowClass):
 
 
     def get_value(self):
-        return self.type.cast(self.value)
+        return self.type.cast()(self.value)
 
     def equals(self, var_value):
         return self.get_value() == var_value.get_value()