fix: thermostat no longer turns on to heat/cool mode

Fixes #167
swingerman · May 9, 2024 · 2ffed06 · 2ffed06
1 parent f614a6b
commit 2ffed06
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 9 deletions.
diff --git a/config/configuration.yaml b/config/configuration.yaml
@@ -226,6 +226,19 @@ climate:
     target_temp_step: 0.5
     initial_hvac_mode: heat
 
+  - platform: dual_smart_thermostat
+    name: Edge Case 167
+    unique_id: edge_case_167
+    heater: switch.heater
+    cooler: switch.cooler
+    target_sensor: sensor.room_temp
+    min_temp: 55
+    max_temp: 110
+    heat_cool_mode: true
+    cold_tolerance: 0.3
+    hot_tolerance: 0.3
+    precision: 1.0
+
   - platform: dual_smart_thermostat
     name: Edge Case 175
     unique_id: edge_case_175

diff --git a/custom_components/dual_smart_thermostat/climate.py b/custom_components/dual_smart_thermostat/climate.py
@@ -656,6 +656,10 @@ async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
             _LOGGER.debug("Unrecognized hvac mode: %s", hvac_mode)
             return
 
+        if hvac_mode == HVACMode.OFF:
+            self._last_hvac_mode = self.hvac_device.hvac_mode
+            _LOGGER.debug("Turning off with hvac mode: %s", self._last_hvac_mode)
+
         self._hvac_mode = hvac_mode
         self._set_support_flags()
 
@@ -870,21 +874,27 @@ def _set_hvac_action_reason(self, *args) -> None:
 
     async def async_turn_on(self) -> None:
         """Turn on the device."""
-
-        if self._last_hvac_mode is not None:
+        _LOGGER.debug("Turning on with last hvac mode: %s", self._last_hvac_mode)
+        if self._last_hvac_mode is not None and self._last_hvac_mode != HVACMode.OFF:
             on_hvac_mode = self._last_hvac_mode
         else:
             device_hvac_modes_not_off = [
                 mode for mode in self.hvac_device.hvac_modes if mode != HVACMode.OFF
             ]
-            device_hvac_modes_not_off.sort()  # for sake of predictavility and consistency
-            on_hvac_mode = device_hvac_modes_not_off[0]
+            device_hvac_modes_not_off.sort()  # for sake of predictability and consistency
+
+            # prioritize heat_cool mode if available
+            if (
+                HVACMode.HEAT_COOL in device_hvac_modes_not_off
+                and device_hvac_modes_not_off.index(HVACMode.HEAT_COOL) != -1
+            ):
+                on_hvac_mode = HVACMode.HEAT_COOL
+            else:
+                on_hvac_mode = device_hvac_modes_not_off[0]
 
         _LOGGER.debug("Turning on with hvac mode: %s", on_hvac_mode)
         await self.async_set_hvac_mode(on_hvac_mode)
 
     async def async_turn_off(self) -> None:
         """Turn off the device."""
-        self._last_hvac_mode = self.hvac_device.hvac_mode
-        _LOGGER.debug("Turning off with hvac mode: %s", self._last_hvac_mode)
         await self.async_set_hvac_mode(HVACMode.OFF)
diff --git a/tests/test_dual_mode.py b/tests/test_dual_mode.py
@@ -1017,7 +1017,7 @@ async def test_heat_cool_fan_set_preset_mode_change_hvac_mode(
 @pytest.mark.parametrize(
     ["from_hvac_mode", "to_hvac_mode"],
     [
-        [HVACMode.OFF, HVACMode.COOL],
+        [HVACMode.OFF, HVACMode.HEAT],
         [HVACMode.COOL, HVACMode.OFF],
         [HVACMode.HEAT, HVACMode.OFF],
     ],
@@ -1046,7 +1046,7 @@ async def test_dual_toggle(
 @pytest.mark.parametrize(
     ["from_hvac_mode", "to_hvac_mode"],
     [
-        [HVACMode.OFF, HVACMode.COOL],
+        [HVACMode.OFF, HVACMode.HEAT_COOL],
         [HVACMode.COOL, HVACMode.OFF],
         [HVACMode.HEAT, HVACMode.OFF],
     ],
@@ -1111,7 +1111,7 @@ async def test_dual_toggle_with_fan(
 @pytest.mark.parametrize(
     ["from_hvac_mode", "to_hvac_mode"],
     [
-        [HVACMode.OFF, HVACMode.COOL],
+        [HVACMode.OFF, HVACMode.HEAT_COOL],
         [HVACMode.HEAT_COOL, HVACMode.OFF],
         [HVACMode.COOL, HVACMode.OFF],
         [HVACMode.FAN_ONLY, HVACMode.OFF],