Fix climate controller issues:

- Only use last known temperature values when heat/cool values are non-zero
- Add support for negative temperature values

Author: epdevlab

inelsmqtt/protocols/cu3.py

@@ -133,6 +133,7 @@
     parse_formated_json,
     trim_inels_status_bytes,
     trim_inels_status_values,
+    twos_comp_4B,
 )
 
 
@@ -2044,25 +2045,22 @@ def create_ha_value_object(cls, device_value: DeviceValue) -> Any:
         last_known_required = None
         last_known_required_cool = None
 
-        temp_current: float = int(
-            trim_inels_status_values(device_value.inels_status_value, cls.DATA, CURRENT_TEMP, ""), 16
+        temp_current: float = twos_comp_4B(
+            int(trim_inels_status_values(device_value.inels_status_value, cls.DATA, CURRENT_TEMP, ""), 16)
         )
         if temp_current == 0x7FFFFFFB:
             temp_current = 0
         else:
             temp_current /= 100
 
         temp_critical_max = (
-            int(
-                trim_inels_status_values(  # check if 0x7F FF FF FB -> make it 50
-                    device_value.inels_status_value, cls.DATA, CRITICAL_MAX_TEMP, ""
-                ),
-                16,
+            twos_comp_4B(
+                int(trim_inels_status_values(device_value.inels_status_value, cls.DATA, CRITICAL_MAX_TEMP, ""), 16)
             )
             / 100
         )
-        temp_required_heat: float = int(
-            trim_inels_status_values(device_value.inels_status_value, cls.DATA, REQUIRED_HEAT_TEMP, ""), 16
+        temp_required_heat: float = twos_comp_4B(
+            int(trim_inels_status_values(device_value.inels_status_value, cls.DATA, REQUIRED_HEAT_TEMP, ""), 16)
         )
         if temp_required_heat == 0x7FFFFFFB:
             temp_required_heat = 0
@@ -2076,17 +2074,8 @@ def create_ha_value_object(cls, device_value: DeviceValue) -> Any:
                 if temp_required_heat != 0:
                     last_known_required = temp_required_heat
 
-        temp_critical_min = (
-            int(
-                trim_inels_status_values(  # check if 0x7F FF FF FB -> make it -50
-                    device_value.inels_status_value, cls.DATA, CRITICAL_MIN_TEMP, ""
-                ),
-                16,
-            )
-            / 100
-        )
-        temp_required_cool: float = int(
-            trim_inels_status_values(device_value.inels_status_value, cls.DATA, REQUIRED_COOL_TEMP, ""), 16
+        temp_required_cool: float = twos_comp_4B(
+            int(trim_inels_status_values(device_value.inels_status_value, cls.DATA, REQUIRED_COOL_TEMP, ""), 16)
         )
         if temp_required_cool == 0x7FFFFFFB:
             temp_required_cool = 0
@@ -2101,7 +2090,10 @@ def create_ha_value_object(cls, device_value: DeviceValue) -> Any:
                     last_known_required_cool = temp_required_cool
 
         temp_correction = (
-            int(trim_inels_status_values(device_value.inels_status_value, cls.DATA, TEMP_CORRECTION, ""), 16) / 100
+            twos_comp_4B(
+                int(trim_inels_status_values(device_value.inels_status_value, cls.DATA, TEMP_CORRECTION, ""), 16)
+            )
+            / 100
         )
         holiday_mode = int(trim_inels_status_values(device_value.inels_status_value, cls.DATA, PUBLIC_HOLIDAY, ""), 16)
         control_mode = int(trim_inels_status_values(device_value.inels_status_value, cls.DATA, CONTROL_MODE, ""))
@@ -2213,11 +2205,13 @@ def create_inels_set_value(cls, device_value: DeviceValue) -> str:
 
         required_heat = cc.required
         required_cool = cc.required_cool
-        if (required_heat == 0 or required_cool == 0) and manual_in == 7 and (byte18 == 1 or byte18 == 3):
+        if manual_in == 7 and byte18 in [1, 3]:
             try:
                 climate_controller = device_value.last_value.ha_value.climate_controller
-                required_heat = climate_controller.last_known_required or required_heat
-                required_cool = climate_controller.last_known_required_cool or required_cool
+                if required_heat == 0 and climate_controller.last_known_required:
+                    required_heat = climate_controller.last_known_required
+                if required_cool == 0 and climate_controller.last_known_required_cool:
+                    required_cool = climate_controller.last_known_required_cool
             except AttributeError:
                 pass
 

inelsmqtt/utils/common.py

@@ -108,6 +108,10 @@ def new_object(**kwargs: Any) -> Any:
     return cls
 
 
+def twos_comp_4B(i):
+    return -(i & 0b10000000000000000000000000000000) | (i & 0b01111111111111111111111111111111)
+
+
 def break_into_bytes(line: str) -> List[str]:
     if len(line) % 2 == 0:
         return [line[i : i + 2] for i in range(0, len(line), 2)]

setup.py

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

tests/test_device_value.py

@@ -2006,6 +2006,24 @@ def device_value(self):
             inels_value="DD\n0A\n00\n00\nFB\nFF\nFF\n7F\n80\n0C\n00\n00\n88\n13\n00\n00\nBC\n02\n00\n00\n00\n00\n00\n00\n00\n00\n00\n00\n00\n00\n05\n"
         )
 
+    @pytest.fixture
+    def device_value_all_negative(self):
+        return self.create_device_value(
+            inels_value="9C\nFF\nFF\nFF\n38\nFF\nFF\nFF\nD4\nFE\nFF\nFF\n70\nFE\nFF\nFF\n0C\nFE\nFF\nFF\nA8\nFD\nFF\nFF\n44\nFD\nFF\nFF\n00\n00\n00\n"
+        )
+
+    @pytest.fixture
+    def device_value_all_positive(self):
+        return self.create_device_value(
+            inels_value="64\n00\n00\n00\nC8\n00\n00\n00\n2C\n01\n00\n00\n90\n01\n00\n00\nF4\n01\n00\n00\n58\n02\n00\n00\nBC\n02\n00\n00\n00\n00\n00\n"
+        )
+
+    @pytest.fixture
+    def device_value_7FFFFFFB(self):
+        return self.create_device_value(
+            inels_value="FB\nFF\nFF\n7F\nC8\n00\n00\n00\nFB\nFF\nFF\n7F\n90\n01\n00\n00\nF4\n01\n00\n00\nFB\nFF\nFF\n7F\nBC\n02\n00\n00\n00\n00\n00\n"
+        )
+
     def test_create_ha_value_object(self, device_value):
         assert device_value.ha_value.climate_controller.current == 27.81
         assert device_value.ha_value.climate_controller.required == 32.0
@@ -2052,6 +2070,45 @@ def test_create_ha_value_required_temp_after_hca_turned_off(self, device_value):
             == "DD\n0A\n00\n00\nFB\nFF\nFF\n7F\n80\n0C\n00\n00\n00\n00\n00\n00\n00\n07\n01\n"
         )
 
+    def test_last_value_does_not_overwrite_current_value(self, device_value):
+        assert device_value.ha_value.climate_controller.required == 32.0
+        assert device_value.ha_value.climate_controller.last_known_required == 32.0
+
+        dev_value_current = self.create_device_value(
+            inels_value="DD\n0A\n00\n00\nFB\nFF\nFF\n7F\n80\n0C\n00\n00\n88\n13\n00\n00\nBC\n02\n00\n00\n00\n00\n00\n00\n00\n00\n00\n00\n00\n00\n05\n"
+        )
+        dev_value_current.ha_value.climate_controller.required = 16.0
+
+        hca_device_value = self.create_device_value(
+            ha_value=dev_value_current.ha_value,
+            last_value=device_value,
+        )
+
+        # the required value is 16.0, but the last known value is 32.0, so the set value must be 16.0
+        assert (
+            hca_device_value.inels_set_value
+            == "DD\n0A\n00\n00\nFB\nFF\nFF\n7F\n40\n06\n00\n00\n00\n00\n00\n00\n00\n07\n01\n"
+        )
+
+    def test_all_negative_temp(self, device_value_all_negative):
+        assert device_value_all_negative.ha_value.climate_controller.current == -1.0
+        assert device_value_all_negative.ha_value.climate_controller.critical_temp == -2.0
+        assert device_value_all_negative.ha_value.climate_controller.required == -3.0
+        assert device_value_all_negative.ha_value.climate_controller.required_cool == -6.0
+        assert device_value_all_negative.ha_value.climate_controller.correction_temp == -7.0
+
+    def test_all_positive_temp(self, device_value_all_positive):
+        assert device_value_all_positive.ha_value.climate_controller.current == 1.0
+        assert device_value_all_positive.ha_value.climate_controller.critical_temp == 2.0
+        assert device_value_all_positive.ha_value.climate_controller.required == 3.0
+        assert device_value_all_positive.ha_value.climate_controller.required_cool == 6.0
+        assert device_value_all_positive.ha_value.climate_controller.correction_temp == 7.0
+
+    def test_7FFFFFFB(self, device_value_7FFFFFFB):
+        assert device_value_7FFFFFFB.ha_value.climate_controller.current == 0
+        assert device_value_7FFFFFFB.ha_value.climate_controller.required == 0
+        assert device_value_7FFFFFFB.ha_value.climate_controller.required_cool == 0
+
 
 class Test_CU_DEVICE_TYPE_167(BaseDeviceTestClass):
     DEVICE_TYPE_ID = "167"