[TASK] several fixes

KartoffelToby · KartoffelToby · commit c6d9f4cd15dd · 2022-09-30T18:26:28.000+02:00
diff --git a/README.md b/README.md
@@ -7,6 +7,7 @@
 # Better Thermostat
 
 **Important Notice: Consider this software as unfinished as it has not reached version 1.0.**
+**Don't select master on download, check `show beta version` install the latest one.**
 
 ### Requirements
 
diff --git a/blueprints/night_mode.yaml b/blueprints/night_mode.yaml
@@ -2,7 +2,7 @@ blueprint:
   name: BT Night mode
   description: Set BT Thermostats to night mode if Schedule event is active.
   domain: automation
-  source_url: https://github.com/KartoffelToby/better_thermostat/tree/master/blueprints/night_mode.yaml
+  source_url: https://github.com/KartoffelToby/better_thermostat/blob/master/blueprints/night_mode.yaml
   input:
     night_times_schedule:
       name: Schedule helper
diff --git a/custom_components/better_thermostat/climate.py b/custom_components/better_thermostat/climate.py
@@ -136,12 +136,13 @@ async def save_target_temperature(self):
         self.async_write_ha_state()
 
     async def restore_temp_temperature(self):
-        self._target_temp = convert_to_float(
-            self._saved_temperature, self.name, "service.restore_temp_temperature()"
-        )
-        self._saved_temperature = None
-        self.async_write_ha_state()
-        await self.control_queue_task.put(self)
+        if self._saved_temperature is not None:
+            self._target_temp = convert_to_float(
+                self._saved_temperature, self.name, "service.restore_temp_temperature()"
+            )
+            self._saved_temperature = None
+            self.async_write_ha_state()
+            await self.control_queue_task.put(self)
 
     @property
     def device_info(self):
@@ -385,11 +386,6 @@ async def startup(self):
                     await asyncio.sleep(10)
                     continue
 
-            self._target_temp = (
-                trv_state.attributes.get("temperature")
-                or trv_state.attributes.get("current_heating_setpoint")
-                or 5
-            )
             self._trv_hvac_mode = trv_state.state
             self._last_reported_valve_position = (
                 trv_state.attributes.get("valve_position", None) or None
@@ -432,46 +428,50 @@ async def startup(self):
 
             self._config["has_system_mode"] = has_system_mode
             # Check If we have an old state
-            if (old_state := await self.async_get_last_state()) is not None:
+            old_state = await self.async_get_last_state()
+            _LOGGER.debug(old_state)
+
+            if old_state is not None:
                 # If we have no initial temperature, restore
-                if self._target_temp is None:
-                    # If we have a previously saved temperature
-                    if old_state.attributes.get(ATTR_TEMPERATURE) is None:
-                        self._target_temp = self._min_temp
-                        _LOGGER.debug(
-                            "better_thermostat %s: Undefined target temperature, falling back to %s",
+                # If we have a previously saved temperature
+                if old_state.attributes.get(ATTR_TEMPERATURE) is None:
+                    self._target_temp = (
+                        trv_state.attributes.get("current_heating_setpoint")
+                        or trv_state.attributes.get("temperature")
+                        or 5
+                    )
+                    _LOGGER.debug(
+                        "better_thermostat %s: Undefined target temperature, falling back to %s",
+                        self.name,
+                        self._target_temp,
+                    )
+                else:
+                    _old_target_temperature = float(
+                        old_state.attributes.get(ATTR_TEMPERATURE)
+                    )
+                    # if the saved temperature is lower than the _min_temp, set it to _min_temp
+                    if _old_target_temperature < self._min_temp:
+                        _LOGGER.warning(
+                            "better_thermostat %s: Saved target temperature %s is lower than _min_temp %s, setting to _min_temp",
                             self.name,
-                            self._target_temp,
+                            _old_target_temperature,
+                            self._min_temp,
                         )
-                    else:
-                        _old_target_temperature = float(
-                            old_state.attributes.get(ATTR_TEMPERATURE)
+                        _old_target_temperature = self._min_temp
+                    # if the saved temperature is higher than the _max_temp, set it to _max_temp
+                    elif _old_target_temperature > self._max_temp:
+                        _LOGGER.warning(
+                            "better_thermostat %s: Saved target temperature %s is higher than _max_temp %s, setting to _max_temp",
+                            self.name,
+                            _old_target_temperature,
+                            self._min_temp,
                         )
-                        # if the saved temperature is lower than the _min_temp, set it to _min_temp
-                        if _old_target_temperature < self._min_temp:
-                            _LOGGER.warning(
-                                "better_thermostat %s: Saved target temperature %s is lower than _min_temp %s, setting to _min_temp",
-                                self.name,
-                                _old_target_temperature,
-                                self._min_temp,
-                            )
-                            _old_target_temperature = self._min_temp
-                        # if the saved temperature is higher than the _max_temp, set it to _max_temp
-                        elif _old_target_temperature > self._max_temp:
-                            _LOGGER.warning(
-                                "better_thermostat %s: Saved target temperature %s is higher than _max_temp %s, setting to _max_temp",
-                                self.name,
-                                _old_target_temperature,
-                                self._min_temp,
-                            )
-                            _old_target_temperature = self._max_temp
-                        self._target_temp = _old_target_temperature
+                        _old_target_temperature = self._max_temp
+                    self._target_temp = _old_target_temperature
                 if not self._bt_hvac_mode and old_state.state:
                     self._bt_hvac_mode = old_state.state
                 if not old_state.attributes.get(ATTR_STATE_LAST_CHANGE):
                     self.last_change = old_state.attributes.get(ATTR_STATE_LAST_CHANGE)
-                else:
-                    self.last_change = datetime.now()
                 if not old_state.attributes.get(ATTR_STATE_DAY_SET_TEMP):
                     self.last_daytime_temp = old_state.attributes.get(
                         ATTR_STATE_DAY_SET_TEMP
@@ -484,19 +484,32 @@ async def startup(self):
                 # No previous state, try and restore defaults
                 if self._target_temp is None:
                     _LOGGER.info(
-                        "better_thermostat %s: No previously saved temperature found on startup, turning heat off",
+                        "better_thermostat %s: No previously saved temperature found on startup, get it from the TRV",
                         self.name,
                     )
+                    self._target_temp = (
+                        trv_state.attributes.get("current_heating_setpoint")
+                        or trv_state.attributes.get("temperature")
+                        or 5
+                    )
             # if hvac mode could not be restored, turn heat off
             if self._trv_hvac_mode is None:
                 self._trv_hvac_mode = HVAC_MODE_OFF
-            if self._bt_hvac_mode is None:
+            if self._bt_hvac_mode in (STATE_UNAVAILABLE, STATE_UNKNOWN, None):
                 _LOGGER.warning(
                     "better_thermostat %s: No previously hvac mode found on startup, turn heat off",
                     self.name,
                 )
                 self._bt_hvac_mode = mode_remap(self, self._trv_hvac_mode, True)
 
+            _LOGGER.debug(
+                "better_thermostat %s: Startup config, TRV hvac mode is %s, BT hvac mode is %s, Target temp %s",
+                self.name,
+                self._trv_hvac_mode,
+                self._bt_hvac_mode,
+                self._target_temp,
+            )
+
             self._config["system_mode"] = self._bt_hvac_mode
             self._last_window_state = self.window_open
             self._available = True
diff --git a/custom_components/better_thermostat/controlling.py b/custom_components/better_thermostat/controlling.py
@@ -33,10 +33,10 @@ async def control_queue(self):
             if self.ignore_states:
                 await asyncio.sleep(1)
                 continue
-
-            _LOGGER.debug(f"better_thermostat {self.name}: processing controls")
-            await control_trv(controls_to_process)
-            self.control_queue_task.task_done()
+            else:
+                _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):
@@ -267,10 +267,10 @@ async def set_trv_values(self, key, value, hvac_mode=None):
 
         max_calibration = self.hass.states.get(
             self.local_temperature_calibration_entity
-        ).attributes.get("max")
+        ).attributes.get("max", 127)
         min_calibration = self.hass.states.get(
             self.local_temperature_calibration_entity
-        ).attributes.get("min")
+        ).attributes.get("min", -128)
         if value > max_calibration:
             value = max_calibration
         if value < min_calibration:
diff --git a/custom_components/better_thermostat/events/trv.py b/custom_components/better_thermostat/events/trv.py
@@ -143,12 +143,14 @@ async def trigger_trv_change(self, event):
     if _updated_needed or child_lock:
         self.async_write_ha_state()
         # make sure we only update the latest user interaction
+        """
         try:
             if self.control_queue_task.qsize() > 0:
                 while self.control_queue_task.qsize() > 1:
                     self.control_queue_task.task_done()
         except AttributeError:
             pass
+        """
         await self.control_queue_task.put(self)
 
 
@@ -273,8 +275,6 @@ def convert_outbound_states(self, hvac_mode) -> Union[dict, None]:
                     _new_local_calibration = round_to_half_degree(
                         calculate_local_setpoint_delta(self)
                     )
-                    if _new_local_calibration is None:
-                        return None
                 else:
                     _new_local_calibration = calculate_local_setpoint_delta(self)
 
@@ -329,6 +329,16 @@ 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"),
diff --git a/docs/schedule.md b/docs/schedule.md
@@ -21,14 +21,14 @@ Services you can call from Home Assistant to set a temporary target temperature
 Basically you can setup a automation that triggers a service call for every climate entity.
 As a example you can use this blueprint:
 
-<a href="https://my.home-assistant.io/redirect/blueprint_import/?blueprint_url=https%3A%2F%2Fgithub.com%2FKartoffelToby%2Fbetter_thermostat%2Ftree%2Fmaster%2Fblueprints%2Fnight_mode.yaml" target="_blank"><img src="https://my.home-assistant.io/badges/blueprint_import.svg" alt="Open your Home Assistant instance and show the blueprint import dialog with a specific blueprint pre-filled." /></a>
+<a href="https://my.home-assistant.io/redirect/blueprint_import/?blueprint_url=https://github.com/KartoffelToby/better_thermostat/blob/master/blueprints/night_mode.yaml" target="_blank"><img src="https://my.home-assistant.io/badges/blueprint_import.svg" alt="Open your Home Assistant instance and show the blueprint import dialog with a specific blueprint pre-filled." /></a>
 
 ```yaml
 blueprint:
   name: BT Night mode
   description: Set BT Thermostats to night mode if Schedule event is active.
   domain: automation
-  source_url: https://github.com/KartoffelToby/better_thermostat/tree/master/blueprints/night_mode.yaml
+  source_url: https://github.com/KartoffelToby/better_thermostat/blob/master/blueprints/night_mode.yaml
   input:
     night_times_schedule:
       name: Schedule helper
diff --git a/hacs.json b/hacs.json
@@ -2,5 +2,5 @@
   "name": "Better Thermostat",
   "render_readme": true,
   "homeassistant": "2021.12.0",
-  "hide_default_branch": true
+  "hide_default_branch": false
 }

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`	`"name": "Better Thermostat",`
`3`	`3`	`"render_readme": true,`
`4`	`4`	`"homeassistant": "2021.12.0",`
`5`		`- "hide_default_branch": true`
	`5`	`+ "hide_default_branch": false`
`6`	`6`	`}`