CU3 controllers now use the last known value for COOL and HEAT when controlling from OFF

Author: epdevlab

inelsmqtt/devices/__init__.py

@@ -240,15 +240,18 @@ def last_values(self) -> DeviceValue:
         Returns:
             DeviceValue: latest values in many formats
         """
-        val = self.__mqtt.last_value(self.__state_topic)
-
-        dev_value = DeviceValue(
-            self.__device_type,
-            self.__inels_type,
-            self.__device_class,
-            inels_value=val.decode() if val is not None else None,  # type: ignore[attr-defined]
-        )
-        return dev_value
+        try:
+            if hasattr(self.__values.last_value.ha_value, "__dict__"):
+                return self.__values.last_value
+            raise AttributeError
+        except AttributeError:
+            val = self.__mqtt.last_value(self.__state_topic)
+            return DeviceValue(
+                self.__device_type,
+                self.__inels_type,
+                self.__device_class,
+                inels_value=val.decode() if val is not None else None,  # type: ignore[attr-defined]
+            )
 
     @property
     def mqtt(self) -> InelsMqtt:
@@ -267,7 +270,8 @@ def __get_value(self, val: Any) -> DeviceValue:
             self.__inels_type,
             self.__device_class,
             inels_value=(val.decode() if val is not None else None),
-            last_value=self.last_values,
+            # last_value=self.last_values,
+            last_value=self.__values,  # because it is already the last value at this moment
         )
         self.__state = dev_value.ha_value
         self.__values = dev_value
@@ -298,7 +302,8 @@ def set_ha_value(self, value: Any) -> bool:
             self.__inels_type,
             self.__device_class,
             ha_value=value,
-            last_value=self.__state,
+            # last_value=self.__state,
+            last_value=self.__values,  # because the last_value will be accessible
         )
 
         self.__state = dev.ha_value

inelsmqtt/protocols/cu3.py

@@ -1187,7 +1187,7 @@ def create_ha_value_object(cls, device_value: DeviceValue) -> Any:
         card_id_int = int(card_id, 16)
         # if card removed before
         if card_id_int == 0 and device_value.last_value is not None:
-            card_id = device_value.last_value.card_id
+            card_id = device_value.last_value.ha_value.card_id
 
         interface = [state[0] == "1", state[12] == "1", state[10] == "1"]
 
@@ -2041,6 +2041,9 @@ def create_command_payload(out1: int = 0, out2: int = 0) -> str:
 
     @classmethod
     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
         )
@@ -2063,8 +2066,15 @@ def create_ha_value_object(cls, device_value: DeviceValue) -> Any:
         )
         if temp_required_heat == 0x7FFFFFFB:
             temp_required_heat = 0
+            if hasattr(device_value.last_value, "ha_value"):
+                last_known_required = device_value.last_value.ha_value.climate_controller.last_known_required
         else:
             temp_required_heat /= 100
+            if temp_required_heat == 0 and hasattr(device_value.last_value, "ha_value"):
+                last_known_required = device_value.last_value.ha_value.climate_controller.last_known_required
+            else:
+                if temp_required_heat != 0:
+                    last_known_required = temp_required_heat
 
         temp_critical_min = (
             int(
@@ -2080,8 +2090,15 @@ def create_ha_value_object(cls, device_value: DeviceValue) -> Any:
         )
         if temp_required_cool == 0x7FFFFFFB:
             temp_required_cool = 0
+            if hasattr(device_value.last_value, "ha_value"):
+                last_known_required_cool = device_value.last_value.ha_value.climate_controller.last_known_required_cool
         else:
             temp_required_cool /= 100
+            if temp_required_cool == 0 and hasattr(device_value.last_value, "ha_value"):
+                last_known_required_cool = device_value.last_value.ha_value.climate_controller.last_known_required_cool
+            else:
+                if temp_required_cool != 0:
+                    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
@@ -2142,7 +2159,9 @@ def create_ha_value_object(cls, device_value: DeviceValue) -> Any:
             climate_controller=new_object(
                 current=temp_current,  # current_temperature
                 required=temp_required_heat,  # target_temperature / target_temperature_high
+                last_known_required=last_known_required,
                 required_cool=temp_required_cool,  # target_temperature_low
+                last_known_required_cool=last_known_required_cool,
                 climate_mode=climate_mode,  # hvac_mode: Off/Heat_cool/Heat/Cool
                 # Off -> controller is turned off
                 # Heat_cool -> follow temp range
@@ -2173,14 +2192,6 @@ def create_inels_set_value(cls, device_value: DeviceValue) -> str:
         critical_temp = [int(x, 16) for x in break_into_bytes(f"{int(cc.critical_temp * 100):08X}")]
         critical_temp.reverse()
 
-        manual_temp = [int(x, 16) for x in break_into_bytes(f"{int((cc.required + cc.correction_temp) * 100):08X}")]
-        manual_temp.reverse()
-
-        manual_cool_temp = [
-            int(x, 16) for x in break_into_bytes(f"{int((cc.required_cool + cc.correction_temp) * 100):08X}")
-        ]
-        manual_cool_temp.reverse()
-
         plan_in = 0
         if cc.public_holiday > 0:
             plan_in = 128  # 0x80
@@ -2200,6 +2211,24 @@ def create_inels_set_value(cls, device_value: DeviceValue) -> str:
             else:
                 byte18 = 1
 
+        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):
+            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
+            except AttributeError:
+                pass
+
+        manual_temp = [int(x, 16) for x in break_into_bytes(f"{int((required_heat + cc.correction_temp) * 100):08X}")]
+        manual_temp.reverse()
+
+        manual_cool_temp = [
+            int(x, 16) for x in break_into_bytes(f"{int((required_cool + cc.correction_temp) * 100):08X}")
+        ]
+        manual_cool_temp.reverse()
+
         set_val = current_temp + critical_temp + manual_temp + manual_cool_temp
         set_val += [plan_in, manual_in, byte18]
 

inelsmqtt/protocols/elanrf.py

@@ -225,7 +225,7 @@ def create_ha_value_object(cls, device_value: DeviceValue) -> Any:
         # So as to continue driving it down if it aisn't closed
         # and continue opening it if it isn't open
         if shutter_val not in [Shutter_state.Open, Shutter_state.Closed]:
-            shutter_val = device_value.last_value.shutters[0].state
+            shutter_val = device_value.last_value.ha_value.shutters[0].state
 
         shutters: List[Shutter] = []
         shutters.append(Shutter(state=shutter_val, is_closed=shutter_val == Shutter_state.Closed))
@@ -783,7 +783,7 @@ def create_ha_value_object(cls, device_value: DeviceValue) -> Any:
             shutter_val = Shutter_state.Open
 
         if (device_value.last_value is not None) and (shutter_val not in [Shutter_state.Open, Shutter_state.Closed]):
-            shutter_val = device_value.last_value.shutters_with_pos[0].state
+            shutter_val = device_value.last_value.ha_value.shutters_with_pos[0].state
 
         shutters_with_pos.append(
             Shutter_pos(

setup.py

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

tests/test_device.py

@@ -113,7 +113,7 @@ def test_device_callbacks(device):
 
 
 def test_device_callback_availability(device):
-    device.mqtt.messages.return_value.get.side_effect = [b"02\n01\n", b"02\n01\n"]
+    device.mqtt.messages.return_value.get.side_effect = [b"02\n01\n", b"02\n00\n"]
 
     callback = MagicMock()
     device.add_ha_callback("simple_relay", 0, callback)

tests/test_device_value.py

@@ -559,7 +559,7 @@ def test_create_ha_value_object_closed(self, device_value_closed):
         assert device_value_closed.ha_value.shutters_with_pos[0].state == 1
 
     def test_create_ha_value_object_last_value(self, device_value_open):
-        device_value = self.create_device_value(inels_value="03\n01\n64\n", last_value=device_value_open.ha_value)
+        device_value = self.create_device_value(inels_value="03\n01\n64\n", last_value=device_value_open)
         assert device_value.ha_value.shutters_with_pos[0].state == 0
 
     def test_format_inels_set_value_open(self, device_value_closed):
@@ -2003,15 +2003,15 @@ class Test_CU_DEVICE_TYPE_166(BaseDeviceTestClass):
     @pytest.fixture
     def device_value(self):
         return self.create_device_value(
-            inels_value="3F\n0A\n00\n00\nFB\nFF\nFF\n7F\nFB\nFF\nFF\n7F\n00\n00\n00\n00\n00\n00\n00\n00\nFB\nFF\nFF\n7F\n00\n00\n00\n00\n00\n00\n00\n"
+            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"
         )
 
     def test_create_ha_value_object(self, device_value):
-        assert device_value.ha_value.climate_controller.current == 26.23
-        assert device_value.ha_value.climate_controller.required == 0
+        assert device_value.ha_value.climate_controller.current == 27.81
+        assert device_value.ha_value.climate_controller.required == 32.0
         assert device_value.ha_value.climate_controller.required_cool == 0
-        assert device_value.ha_value.climate_controller.climate_mode == 0
-        assert device_value.ha_value.climate_controller.current_action == 0
+        assert device_value.ha_value.climate_controller.climate_mode == 1
+        assert device_value.ha_value.climate_controller.current_action == 2
         assert device_value.ha_value.climate_controller.critical_temp == 21474836.43
         assert device_value.ha_value.climate_controller.correction_temp == 0.0
         assert device_value.ha_value.climate_controller.public_holiday == 0
@@ -2025,7 +2025,31 @@ def test_format_inels_set_value_all_to_max(self, device_value):
         )
         assert (
             device_value.inels_set_value
-            == "3F\n0A\n00\n00\nFB\nFF\nFF\n7F\n00\n00\n00\n00\n00\n00\n00\n00\n00\n07\n00\n"
+            == "DD\n0A\n00\n00\nFB\nFF\nFF\n7F\n80\n0C\n00\n00\n00\n00\n00\n00\n00\n07\n01\n"
+        )
+
+    def test_create_ha_value_required_temp_after_hca_turned_off(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
+
+        hca_turned_off_device_value = self.create_device_value(
+            inels_value="DD\n0A\n00\n00\nFB\nFF\nFF\n7F\nFB\nFF\nFF\n7F\n88\n13\n00\n00\nBC\n02\n00\n00\nFB\nFF\nFF\n7F\n00\n00\n00\n00\n00\n00\n00\n",
+            last_value=device_value,
+        )
+
+        assert hca_turned_off_device_value.ha_value.climate_controller.required == 0
+        assert hca_turned_off_device_value.ha_value.climate_controller.last_known_required == 32.0
+
+        assert hca_turned_off_device_value.last_value.ha_value.climate_controller.last_known_required == 32.0
+
+        hca_turned_on_device_value = self.create_device_value(
+            inels_value="DD\n0A\n00\n00\nFB\nFF\nFF\n7F\n00\n00\n00\n00\n88\n13\n00\n00\nBC\n02\n00\n00\n00\n00\n00\n00\n00\n00\n00\n00\n00\n00\n05\n",
+            last_value=hca_turned_off_device_value,
+        )
+        # write back last known value: 80\n0C\n00\n00 == 32.0
+        assert (
+            hca_turned_on_device_value.inels_set_value
+            == "DD\n0A\n00\n00\nFB\nFF\nFF\n7F\n80\n0C\n00\n00\n00\n00\n00\n00\n00\n07\n01\n"
         )