[TASK] fix controller

Author: KartoffelToby

custom_components/better_thermostat/climate.py

@@ -231,6 +231,7 @@ def __init__(
         self.valve_position_entity = None
         self.version = VERSION
         self.last_change = datetime.now() - timedelta(hours=2)
+        self._last_calibration = datetime.now() - timedelta(hours=2)
         self._last_window_state = None
         self._temp_lock = asyncio.Lock()
         self._last_reported_valve_position = None
@@ -241,13 +242,12 @@ def __init__(
         self._last_send_target_temp = None
         self._last_avg_outdoor_temp = None
         self._available = False
-        self.control_queue_task = asyncio.Queue()
+        self.control_queue_task = asyncio.Queue(maxsize=-1)
         if self.window_id is not None:
-            self.window_queue_task = asyncio.Queue()
-        for i in range(3):
-            asyncio.create_task(control_queue(self))
-            if self.window_id is not None:
-                asyncio.create_task(window_queue(self))
+            self.window_queue_task = asyncio.Queue(maxsize=-1)
+        asyncio.create_task(control_queue(self))
+        if self.window_id is not None:
+            asyncio.create_task(window_queue(self))
 
     async def async_added_to_hass(self):
         """Run when entity about to be added.
@@ -480,6 +480,10 @@ async def startup(self):
                     self.call_for_heat = old_state.attributes.get(
                         ATTR_STATE_CALL_FOR_HEAT
                     )
+                if not old_state.attributes.get(ATTR_STATE_SAVED_TEMPERATURE):
+                    self._saved_temperature = old_state.attributes.get(
+                        ATTR_STATE_SAVED_TEMPERATURE
+                    )
             else:
                 # No previous state, try and restore defaults
                 if self._target_temp is None:

custom_components/better_thermostat/controlling.py

@@ -28,15 +28,14 @@ async def control_queue(self):
     None
     """
     while True:
+        if self.ignore_states:
+            await asyncio.sleep(1)
+            continue
         controls_to_process = await self.control_queue_task.get()
         if controls_to_process is not None:
-            if self.ignore_states:
-                await asyncio.sleep(1)
-                continue
-            else:
-                _LOGGER.debug(f"better_thermostat {self.name}: processing controls")
-                await control_trv(controls_to_process)
-                self.control_queue_task.task_done()
+            _LOGGER.debug(f"better_thermostat {self.name}: processing controls")
+            await control_trv(controls_to_process)
+            self.control_queue_task.task_done()
 
 
 async def control_trv(self, force_mode_change: bool = False):
@@ -114,10 +113,10 @@ async def control_trv(self, force_mode_change: bool = False):
             calibration = remapped_states.get("local_temperature_calibration") or None
 
             if converted_hvac_mode is not None:
-                _LOGGER.debug(
-                    f"better_thermostat {self.name}: control_trv: current TRV mode: {_current_TRV_mode} new TRV mode: {converted_hvac_mode}"
-                )
                 if _current_TRV_mode != converted_hvac_mode or force_mode_change:
+                    _LOGGER.debug(
+                        f"better_thermostat {self.name}: control_trv: current TRV mode: {_current_TRV_mode} new TRV mode: {converted_hvac_mode}"
+                    )
                     system_mode_change = True
                     await set_trv_values(self, "hvac_mode", converted_hvac_mode)
             if current_heating_setpoint is not None:
@@ -264,23 +263,37 @@ async def set_trv_values(self, key, value, hvac_mode=None):
         )
     elif key == "local_temperature_calibration":
         value = round_to_hundredth_degree(value)
-
-        max_calibration = self.hass.states.get(
-            self.local_temperature_calibration_entity
-        ).attributes.get("max", 127)
-        min_calibration = self.hass.states.get(
+        current_calibration = self.hass.states.get(
             self.local_temperature_calibration_entity
-        ).attributes.get("min", -128)
-        if value > max_calibration:
-            value = max_calibration
-        if value < min_calibration:
-            value = min_calibration
-        await self.hass.services.async_call(
-            "number",
-            SERVICE_SET_VALUE,
-            {"entity_id": self.local_temperature_calibration_entity, "value": value},
-            blocking=True,
-        )
+        ).state
+        if current_calibration != value and (
+            (self._last_calibration + timedelta(minutes=5)).timestamp()
+            < datetime.now().timestamp()
+        ):
+            max_calibration = self.hass.states.get(
+                self.local_temperature_calibration_entity
+            ).attributes.get("max", 127)
+            min_calibration = self.hass.states.get(
+                self.local_temperature_calibration_entity
+            ).attributes.get("min", -128)
+            if value > max_calibration:
+                value = max_calibration
+            if value < min_calibration:
+                value = min_calibration
+            await self.hass.services.async_call(
+                "number",
+                SERVICE_SET_VALUE,
+                {
+                    "entity_id": self.local_temperature_calibration_entity,
+                    "value": value,
+                },
+                blocking=True,
+            )
+            self._last_calibration = datetime.now()
+        else:
+            _LOGGER.debug(
+                f"better_thermostat {self.name}: set_trv_values: skipping local calibration because of throttling"
+            )
     elif key == "valve_position":
         await self.hass.services.async_call(
             "number",

custom_components/better_thermostat/events/trv.py

@@ -329,16 +329,6 @@ def convert_outbound_states(self, hvac_mode) -> Union[dict, None]:
                     _new_heating_setpoint = 5
                 hvac_mode = None
 
-    # check if the last local_calibration was in the last 5 minutes
-    if _new_local_calibration is not None:
-        if (
-            self.last_change + timedelta(minutes=5)
-        ).timestamp() > datetime.now().timestamp():
-            _LOGGER.debug(
-                f"better_thermostat {self.name}: last local calibration was in the last 5 minutes, skip calibration"
-            )
-            _new_local_calibration = None
-
     return {
         "current_heating_setpoint": _new_heating_setpoint,
         "local_temperature": state.get("current_temperature"),