fix: the heat/cool fuction is not working with the fan-mode

Fixes #175

config/configuration.yaml

@@ -226,6 +226,22 @@ climate:
     target_temp_step: 0.5
     initial_hvac_mode: heat
 
+  - platform: dual_smart_thermostat
+    name: Edge Case 175
+    unique_id: edge_case_175
+    heater: switch.heater
+    cooler: switch.cooler
+    target_sensor: sensor.room_temp
+    heat_cool_mode: true
+    fan: switch.fan
+    fan_hot_tolerance: 1
+    target_temp_step: 0.5
+    min_temp: 9
+    max_temp: 32
+    target_temp: 19.5
+    target_temp_high: 20.5
+    target_temp_low: 19.5
+
   - platform: dual_smart_thermostat
     name: AUX Heat Room
     unique_id: aux_heat_room

custom_components/dual_smart_thermostat/climate.py

@@ -655,10 +655,11 @@ async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
             _LOGGER.debug("Unrecognized hvac mode: %s", hvac_mode)
             return
 
-        await self.hvac_device.async_set_hvac_mode(hvac_mode)
         self._hvac_mode = hvac_mode
         self._set_support_flags()
 
+        await self.hvac_device.async_set_hvac_mode(hvac_mode)
+
         self._hvac_action_reason = self.hvac_device.HVACActionReason
 
         # Ensure we update the current operation after changing the mode

custom_components/dual_smart_thermostat/hvac_device/cooler_device.py

@@ -7,6 +7,9 @@
 from custom_components.dual_smart_thermostat.hvac_device.specific_hvac_device import (
     SpecificHVACDevice,
 )
+from custom_components.dual_smart_thermostat.managers.feature_manager import (
+    FeatureManager,
+)
 from custom_components.dual_smart_thermostat.managers.opening_manager import (
     OpeningManager,
 )
@@ -29,7 +32,7 @@ def __init__(
         initial_hvac_mode: HVACMode,
         temperatures: TemperatureManager,
         openings: OpeningManager,
-        range_mode: bool = False,
+        features: FeatureManager,
     ) -> None:
         super().__init__(
             hass,
@@ -38,10 +41,16 @@ def __init__(
             initial_hvac_mode,
             temperatures,
             openings,
+            features,
         )
 
-        if range_mode:
-            self._target_temp_attr = "_target_temp_high"
+    @property
+    def target_temp_attr(self) -> str:
+        return (
+            "_target_temp_high"
+            if self.features.is_range_mode
+            else self._target_temp_attr
+        )
 
     @property
     def hvac_action(self) -> HVACAction:

custom_components/dual_smart_thermostat/hvac_device/cooler_fan_device.py

@@ -18,6 +18,9 @@
     HVACDevice,
     merge_hvac_modes,
 )
+from custom_components.dual_smart_thermostat.managers.feature_manager import (
+    FeatureManager,
+)
 from custom_components.dual_smart_thermostat.managers.opening_manager import (
     OpeningManager,
 )
@@ -38,19 +41,17 @@ def __init__(
         initial_hvac_mode: HVACMode,
         temperatures: TemperatureManager,
         openings: OpeningManager,
-        fan_on_with_cooler: bool = False,
-        range_mode: bool = False,
+        features: FeatureManager,
     ) -> None:
         super().__init__(hass, temperatures, openings)
 
+        self._features = features
+
         self._device_type = self.__class__.__name__
-        self._fan_on_with_cooler = fan_on_with_cooler
+        self._fan_on_with_cooler = features.is_configured_for_fan_on_with_cooler
         self.cooler_device = cooler_device
         self.fan_device = fan_device
 
-        if range_mode:
-            self._target_temp_attr = "_target_temp_high"
-
         # _hvac_modes are the combined values of the cooler_device.hvac_modes and fan_device.hvac_modes without duplicates
         self.hvac_modes = merge_hvac_modes(
             cooler_device.hvac_modes, fan_device.hvac_modes
@@ -135,7 +136,9 @@ async def async_control_hvac(self, time=None, force=False):
                     self.HVACActionReason = self.cooler_device.HVACActionReason
                 else:
 
-                    if self.temperatures.is_within_fan_tolerance:
+                    if self.temperatures.is_within_fan_tolerance(
+                        self.fan_device.target_temp_attr
+                    ):
                         _LOGGER.info("within fan tolerance")
                         await self.fan_device.async_control_hvac(time, force)
                         await self.cooler_device.async_turn_off()

custom_components/dual_smart_thermostat/hvac_device/heater_aux_heater_device.py

@@ -22,6 +22,9 @@
     HVACDevice,
     merge_hvac_modes,
 )
+from custom_components.dual_smart_thermostat.managers.feature_manager import (
+    FeatureManager,
+)
 from custom_components.dual_smart_thermostat.managers.opening_manager import (
     OpeningManager,
 )
@@ -46,7 +49,7 @@ def __init__(
         initial_hvac_mode: HVACMode,
         temperatures: TemperatureManager,
         openings: OpeningManager,
-        range_mode: bool = False,
+        features: FeatureManager,
     ) -> None:
         super().__init__(hass, temperatures, openings)
 
@@ -56,7 +59,7 @@ def __init__(
         self._aux_heater_timeout = aux_heater_timeout
         self._aux_heater_dual_mode = aux_heater_dual_mode
 
-        if range_mode:
+        if features.is_range_mode:
             self._target_temp_attr = "_target_temp_low"
 
         self._aux_heater_last_run: datetime = None

custom_components/dual_smart_thermostat/hvac_device/heater_device.py

@@ -10,6 +10,9 @@
 from custom_components.dual_smart_thermostat.hvac_device.specific_hvac_device import (
     SpecificHVACDevice,
 )
+from custom_components.dual_smart_thermostat.managers.feature_manager import (
+    FeatureManager,
+)
 from custom_components.dual_smart_thermostat.managers.opening_manager import (
     OpeningManager,
 )
@@ -32,7 +35,7 @@ def __init__(
         initial_hvac_mode: HVACMode,
         temperatures: TemperatureManager,
         openings: OpeningManager,
-        range_mode: bool = False,
+        features: FeatureManager,
     ) -> None:
         super().__init__(
             hass,
@@ -41,10 +44,16 @@ def __init__(
             initial_hvac_mode,
             temperatures,
             openings,
+            features,
         )
 
-        if range_mode:
-            self._target_temp_attr = "_target_temp_low"
+    @property
+    def target_temp_attr(self) -> str:
+        return (
+            "_target_temp_low"
+            if self.features.is_range_mode
+            else self._target_temp_attr
+        )
 
     @property
     def hvac_action(self) -> HVACAction:
@@ -72,7 +81,7 @@ async def async_control_hvac(self, time=None, force=False):
 
     async def _async_control_device_when_on(self, time=None) -> None:
         """Check if we need to turn heating on or off when theheater is on."""
-        too_hot = self.temperatures.is_too_hot(self._target_temp_attr)
+        too_hot = self.temperatures.is_too_hot(self.target_temp_attr)
         is_floor_hot = self.temperatures.is_floor_hot
         is_floor_cold = self.temperatures.is_floor_cold
         any_opening_open = self.openings.any_opening_open(self.hvac_mode)
@@ -104,7 +113,7 @@ async def _async_control_device_when_off(self, time=None) -> None:
         """Check if we need to turn heating on or off when the heater is off."""
         _LOGGER.debug("%s _async_control_device_when_off", self.__class__.__name__)
 
-        too_cold = self.temperatures.is_too_cold(self._target_temp_attr)
+        too_cold = self.temperatures.is_too_cold(self.target_temp_attr)
         is_floor_hot = self.temperatures.is_floor_hot
         is_floor_cold = self.temperatures.is_floor_cold
         any_opening_open = self.openings.any_opening_open(self.hvac_mode)

custom_components/dual_smart_thermostat/hvac_device/hvac_device.py

@@ -28,6 +28,16 @@ async def async_turn_off(self):
         pass
 
 
+class CanTargetTemperature(ABC):
+
+    _target_temp_attr: str = "_target_temp"
+
+    @property
+    @abstractmethod
+    def target_temp_attr(self) -> str:
+        pass
+
+
 class HVACDevice:
 
     _active: bool

custom_components/dual_smart_thermostat/hvac_device/hvac_device_factory.py

@@ -96,6 +96,7 @@ def create_device(
                 self._initial_hvac_mode,
                 temperatures,
                 openings,
+                self._features,
             )
 
         if (
@@ -114,6 +115,7 @@ def create_device(
                 self._initial_hvac_mode,
                 temperatures,
                 openings,
+                self._features,
             )
 
         elif (
@@ -127,6 +129,7 @@ def create_device(
                 None,
                 temperatures,
                 openings,
+                self._features,
             )
             fan_device = FanDevice(
                 self.hass,
@@ -135,6 +138,7 @@ def create_device(
                 None,
                 temperatures,
                 openings,
+                self._features,
             )
 
             _LOGGER.info(
@@ -150,7 +154,7 @@ def create_device(
                 self._initial_hvac_mode,
                 temperatures,
                 openings,
-                fan_on_with_cooler=self._fan_on_with_cooler,
+                self._features,
             )
 
         elif self._features.is_configured_for_dual_mode:
@@ -168,6 +172,7 @@ def _create_heater_device(
             self._initial_hvac_mode,
             temperatures,
             openings,
+            self._features,
         )
         if self._features.is_configured_for_aux_heating_mode:
             aux_heater_device = HeaterDevice(
@@ -177,6 +182,7 @@ def _create_heater_device(
                 self._initial_hvac_mode,
                 temperatures,
                 openings,
+                self._features,
             )
             return HeaterAUXHeaterDevice(
                 self.hass,
@@ -187,6 +193,7 @@ def _create_heater_device(
                 self._initial_hvac_mode,
                 temperatures,
                 openings,
+                self._features,
             )
         _LOGGER.info(
             "Creating HeaterDevice device, _is_configured_for_aux_heating_mode: %s",
@@ -204,7 +211,7 @@ def _create_heat_cool_device(
             self._initial_hvac_mode,
             temperatures,
             openings,
-            range_mode=self._features.is_configured_for_heat_cool_mode,
+            self._features,
         )
 
         if self._features.is_configured_for_aux_heating_mode:
@@ -215,7 +222,7 @@ def _create_heat_cool_device(
                 self._initial_hvac_mode,
                 temperatures,
                 openings,
-                range_mode=self._features.is_configured_for_heat_cool_mode,
+                self._features,
             )
             return HeaterAUXHeaterDevice(
                 self.hass,
@@ -226,6 +233,7 @@ def _create_heat_cool_device(
                 self._initial_hvac_mode,
                 temperatures,
                 openings,
+                self._features,
             )
 
         cooler_device = CoolerDevice(
@@ -235,7 +243,7 @@ def _create_heat_cool_device(
             self._initial_hvac_mode,
             temperatures,
             openings,
-            range_mode=self._features.is_configured_for_heat_cool_mode,
+            self._features,
         )
 
         cooler_fan_device = None
@@ -248,7 +256,7 @@ def _create_heat_cool_device(
                 self._initial_hvac_mode,
                 temperatures,
                 openings,
-                range_mode=self._features.is_configured_for_heat_cool_mode,
+                self._features,
             )
             cooler_fan_device = CoolerFanDevice(
                 self.hass,
@@ -257,7 +265,7 @@ def _create_heat_cool_device(
                 self._initial_hvac_mode,
                 temperatures,
                 openings,
-                fan_on_with_cooler=self._fan_on_with_cooler,
+                self._features,
             )
 
         _LOGGER.info(