modification related to VariableType.__str__

pyheatpump/cli.py

@@ -60,7 +60,7 @@ def fetch():
     res = modbus.read_holding_registers(analog.start_address, analog.end_address)
 
     for r in range(len(res)):
-        val = VariableValue(str(analog), r + analog.start_address, res[r])
+        val = VariableValue(analog, r + analog.start_address, res[r])
         val.insert()
 
 
@@ -69,7 +69,7 @@ def fetch():
     res = modbus.read_holding_registers(integer.start_address, integer.end_address)
 
     for r in res:
-        val = VariableValue(str(integer), r + integer.start_address, res[r])
+        val = VariableValue(integer, r + integer.start_address, res[r])
         val.insert()
 
     # Digital - bool
@@ -77,5 +77,5 @@ def fetch():
     res = modbus.read_coils(digital.start_address, digital.end_address)
 
     for r in res:
-        val = VariableValue(str(integer), r + integer.start_address, res[r])
+        val = VariableValue(integer), r + integer.start_address, res[r])
         val.insert()

pyheatpump/models/variable.py

@@ -10,7 +10,7 @@ class Variable(RowClass):
     address: int = None
     unit: str = None
     last_update: date = None
-    type: str = None
+    type: VariableType = None
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
@@ -19,7 +19,7 @@ class Variable(RowClass):
     @staticmethod
     def getall():
         return dict([
-            (row.slabel, Variable.getall_of_type(row))
+            (str(row), Variable.getall_of_type(row))
             for _, row in VariableType.getall().items()
         ])
 
@@ -34,7 +34,7 @@ class Variable(RowClass):
             WHERE type = '{}'
                 AND address >= {}
                 AND address <= {}
-            """.format(type.slabel, type.start_address, type.end_address))
+            """.format(type, type.start_address, type.end_address))
         ])
 
 
@@ -53,7 +53,7 @@ class Variable(RowClass):
                 var.type = '{}'
                 AND var.address >= {}
                 AND var.address <= {}
-            """.format(type.slabel, type.start_address, type.end_address))
+            """.format(type, type.start_address, type.end_address))
         ])
 
 

pyheatpump/models/variable_type.py

@@ -20,6 +20,15 @@ class VariableType(RowClass):
         return self.slabel or self.label[0]
 
 
+    def cast(self):
+        if self.type == 'float':
+            return float
+        if self.type == 'int':
+            return int
+        if self.type == 'bool':
+            return bool
+
+
     def select():
         try:
             elt = next(super().select('slabel', 'var_type'))