[variable_type] update complement function to a simpler version + tests

pyheatpump/models/variable_type.py

@@ -23,7 +23,8 @@ class VariableType(RowClass):
 
     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)
+        #complement = lambda x: x - (1 << 16 if x & (1 << 15) else 0)
+        complement = lambda x: x - (1 << 16) if x >> 15 else x
 
         if self.type == 'bool':
             # returns a boolean
@@ -69,7 +70,7 @@ class VariableType(RowClass):
         values = Variable.getall_values_of_type(self)
         res = {}
         for address, variable in values.items():
-            logger.error('address: %s, start_addres: %s, calc: %s',
+            logger.debug('address: %s, start_addres: %s, calc: %s',
                 address, self.start_address, address - self.start_address + 1)
             res[str(address - self.start_address + 1)] = variable
         return res

tests/test_variable_values.py

@@ -84,15 +84,15 @@ def test_get_type_address(set_test_db):
 
         r = c.get('/D/10')
         d_resp = r.content.decode()
-        assert d_resp == 'True'
+        assert d_resp == '1'
 
         r = c.get('/D/11')
         d_resp = r.content.decode()
-        assert d_resp == 'True'
+        assert d_resp == '1'
 
         r = c.get('/D/12')
         d_resp = r.content.decode()
-        assert d_resp == 'False'
+        assert d_resp == '0'
     except AssertionError as exc:
         print(d_resp)
         raise exc