Bug fix: Support negative temperature values for all inputs/outputs

Author: epdevlab

inelsmqtt/__init__.py

@@ -195,7 +195,7 @@ def on_connect(client, userdata, flags, rc):
             if rc != 0:
                 self.__connection_error = rc
             else:
-                self.__try_connect  = True
+                self.__try_connect = True
 
         try:
             default_connect_handler = self.__client.on_connect

inelsmqtt/protocols/elanrf.py

@@ -66,6 +66,7 @@
     WarmLight,
     new_object,
     trim_inels_status_values,
+    twos_comp_1B,
 )
 
 
@@ -464,9 +465,9 @@ def create_command_payload(temp_required: int) -> str:
     def create_ha_value_object(cls, device_value: DeviceValue) -> Any:
         # fetches all the status values and compacts them into a new object
         temp_current_hex = trim_inels_status_values(device_value.inels_status_value, cls.DATA, CURRENT_TEMP, "")
-        temp_current = int(temp_current_hex, 16) * 0.5
+        temp_current = twos_comp_1B(int(temp_current_hex, 16)) * 0.5
         temp_required_hex = trim_inels_status_values(device_value.inels_status_value, cls.DATA, REQUIRED_TEMP, "")
-        temp_required = int(temp_required_hex, 16) * 0.5
+        temp_required = twos_comp_1B(int(temp_required_hex, 16)) * 0.5
         battery = int(trim_inels_status_values(device_value.inels_status_value, cls.DATA, BATTERY, ""), 16)
         open_to_hex = trim_inels_status_values(device_value.inels_status_value, cls.DATA, OPEN_IN_PERCENTAGE, "")
         open_to_percentage = int(open_to_hex, 16) * 0.5
@@ -520,7 +521,10 @@ class DT_12(CommTest):
 
     @classmethod
     def create_ha_value_object(cls, device_value: DeviceValue) -> Any:
-        temp_in = int(trim_inels_status_values(device_value.inels_status_value, cls.DATA, TEMP_IN, ""), 16) * 0.5
+        temp_in = (
+            twos_comp_1B(int(trim_inels_status_values(device_value.inels_status_value, cls.DATA, TEMP_IN, ""), 16))
+            * 0.5
+        )
         battery = int(trim_inels_status_values(device_value.inels_status_value, cls.DATA, BATTERY, ""), 16)
 
         return new_object(

inelsmqtt/utils/common.py

@@ -108,6 +108,14 @@ def new_object(**kwargs: Any) -> Any:
     return cls
 
 
+def twos_comp_1B(b):
+    return -(b & 0b10000000) | (b & 0b01111111)
+
+
+def twos_comp_2B(h):
+    return -(h & 0b1000000000000000) | (h & 0b0111111111111111)
+
+
 def twos_comp_4B(i):
     return -(i & 0b10000000000000000000000000000000) | (i & 0b01111111111111111111111111111111)
 

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name="elkoep-mqtt",
-    version="0.2.33.beta.19",
+    version="0.2.33.beta.20",
     url="https://github.com/epdevlab/elkoep-mqtt",
     license="MIT",
     author="Elko EP s.r.o.",

tests/test_device_value.py

@@ -372,13 +372,24 @@ class Test_RF_DEVICE_TYPE_09(BaseDeviceTestClass):
     def device_value(self):
         return self.create_device_value(inels_value="64\n3C\n08\n40\n00\n")
 
+    @pytest.fixture
+    def device_value_negative(self):
+        return self.create_device_value(inels_value="64\nC4\n08\nC0\n00\n")
+
     def test_create_ha_value_object(self, device_value):
         assert device_value.ha_value.low_battery == True
         assert device_value.ha_value.thermovalve.current == 30
         assert device_value.ha_value.thermovalve.required == 32
         assert device_value.ha_value.thermovalve.climate_mode == 1
         assert device_value.ha_value.thermovalve.open_in_percentage == 50
 
+    def test_create_ha_value_object_negative(self, device_value_negative):
+        assert device_value_negative.ha_value.low_battery == True
+        assert device_value_negative.ha_value.thermovalve.current == -30
+        assert device_value_negative.ha_value.thermovalve.required == -32
+        assert device_value_negative.ha_value.thermovalve.climate_mode == 0
+        assert device_value_negative.ha_value.thermovalve.open_in_percentage == 50
+
     def test_format_inels_set_value(self, device_value):
         device_value.ha_value.thermovalve.required = 25
         device_value = self.create_device_value(
@@ -413,10 +424,18 @@ class Test_RF_DEVICE_TYPE_12(BaseDeviceTestClass):
     def device_value(self):
         return self.create_device_value(inels_value="30\n00\n81\n00\n00\n")
 
+    @pytest.fixture
+    def device_value_negative(self):
+        return self.create_device_value(inels_value="F2\n00\n80\n00\n00\n")
+
     def test_create_ha_value_object(self, device_value):
         assert device_value.ha_value.low_battery == True
         assert device_value.ha_value.temp_in == 24.0
 
+    def test_create_ha_value_object_negative(self, device_value_negative):
+        assert device_value_negative.ha_value.low_battery == False
+        assert device_value_negative.ha_value.temp_in == -7.0
+
 
 class Test_RF_DEVICE_TYPE_13(BaseDeviceTestClass):
     DEVICE_TYPE_ID = "13"
@@ -611,11 +630,20 @@ class Test_RF_DEVICE_TYPE_30(BaseDeviceTestClass):
     def device_value(self):
         return self.create_device_value(inels_value="01\nD8\n09\n24\n00")
 
+    @pytest.fixture
+    def device_value_negative(self):
+        return self.create_device_value(inels_value="01\nF6\nFF\n24\n00")
+
     def test_create_ha_value_object(self, device_value):
         assert device_value.ha_value.low_battery
         assert device_value.ha_value.temp_in == "09D8"
         assert device_value.ha_value.humidity == 36
 
+    def test_create_ha_value_object_negative(self, device_value_negative):
+        assert device_value_negative.ha_value.low_battery
+        assert device_value_negative.ha_value.temp_in == "FFF6"
+        assert device_value_negative.ha_value.humidity == 36
+
 
 class Test_CU_DEVICE_TYPE_100(BaseDeviceTestClass):
     DEVICE_TYPE_ID = "100"
@@ -1070,27 +1098,27 @@ class Test_CU_DEVICE_TYPE_112(BaseDeviceTestClass):
     @pytest.fixture
     def device_value_all_on(self):
         return self.create_device_value(
-            inels_value="07\n07\n07\n07\n07\n07\n07\n07\n7F\nFF\nFF\nFF\n7F\nFF\nFF\nFF\n00\n00\n00\n00\n00\n00\n00\n00\nFF\nFF\nFF\n"
+            inels_value="07\n07\n07\n07\n07\n07\n07\n07\n00\n00\n12\n33\n7F\nFF\nFF\nFF\n00\n00\n00\n00\n00\n00\n00\n00\nFF\nFF\nFF\n"
         )
 
     @pytest.fixture
     def device_value_all_off(self):
         return self.create_device_value(
-            inels_value="06\n06\n06\n06\n06\n06\n06\n06\n7F\nFF\nFF\nFF\n7F\nFF\nFF\nFF\n00\n00\n00\n00\n00\n00\n00\n00\n00\n00\n00\n"
+            inels_value="06\n06\n06\n06\n06\n06\n06\n06\nFF\nFF\nFB\n33\n7F\nFF\nFF\nFF\n00\n00\n00\n00\n00\n00\n00\n00\n00\n00\n00\n"
         )
 
     def test_create_ha_value_object_all_on(self, device_value_all_on):
         assert isinstance(device_value_all_on.ha_value.relay[0], Relay)
         assert device_value_all_on.ha_value.din == [True] * 8
-        assert device_value_all_on.ha_value.temps == ["7FFFFFFF", "7FFFFFFF"]
+        assert device_value_all_on.ha_value.temps == ["00001233", "7FFFFFFF"]
         for r in device_value_all_on.ha_value.relay:
             assert r.is_on
             assert r.overflow
 
     def test_create_ha_value_object_all_off(self, device_value_all_off):
         assert isinstance(device_value_all_off.ha_value.relay[0], Relay)
         assert device_value_all_off.ha_value.din == [False] * 8
-        assert device_value_all_off.ha_value.temps == ["7FFFFFFF", "7FFFFFFF"]
+        assert device_value_all_off.ha_value.temps == ["FFFFFB33", "7FFFFFFF"]
         for r in device_value_all_off.ha_value.relay:
             assert not r.is_on
             assert not r.overflow