fix: separates dual and heat-cool mode

swingerman · Apr 23, 2024 · dd67d9f · dd67d9f
1 parent 37b66c8
commit dd67d9f
Show file tree

Hide file tree

Showing 9 changed files with 592 additions and 196 deletions.
diff --git a/config/configuration.yaml b/config/configuration.yaml
@@ -206,6 +206,26 @@ climate:
     cold_tolerance: 1.0
     hot_tolerance: 1.0
 
+  - platform: dual_smart_thermostat
+    name: Edge Case 155
+    unique_id: edge_case_155
+    heater: switch.heater
+    cooler: switch.cooler
+    target_sensor: sensor.room_temp
+    openings:
+      - input_boolean.window_open
+      - input_boolean.window_open2
+    openings_scope:
+      - heat
+    min_temp: 18
+    max_temp: 27
+    target_temp: 23.0
+    hot_tolerance: 0
+    cold_tolerance: 0.20
+    precision: 0.1
+    target_temp_step: 0.5
+    initial_hvac_mode: heat
+
   - platform: dual_smart_thermostat
     name: AUX Heat Room
     unique_id: aux_heat_room
@@ -227,8 +247,8 @@ climate:
     unique_id: fan_cool_room
     heater: switch.heater
     fan: switch.fan
-    fan_cool_tolerance: 2
-    fan_turn_on_with_cooler: true
+    fan_hot_tolerance: 2
+    fan_on_with_ac: true
     ac_mode: true
     target_sensor: sensor.room_temp
     min_temp: 18
@@ -238,8 +258,8 @@ climate:
     name: FAN Only Room
     unique_id: fan_only_room
     fan: switch.fan
-    fan_cool_tolerance: 2
-    fan_turn_on_with_cooler: true
+    fan_hot_tolerance: 2
+    fan_on_with_ac: true
     target_sensor: sensor.room_temp
 
   # - platform: generic_thermostat

diff --git a/custom_components/dual_smart_thermostat/climate.py b/custom_components/dual_smart_thermostat/climate.py
@@ -259,7 +259,7 @@ async def async_setup_platform(
 
     preset_manager = PresetManager(hass, config, temperature_manager, feature_manager)
 
-    device_factory = HVACDeviceFactory(hass, config)
+    device_factory = HVACDeviceFactory(hass, config, feature_manager)
 
     hvac_device = device_factory.create_device(temperature_manager, opening_manager)
 
@@ -639,8 +639,9 @@ def extra_state_attributes(self) -> dict:
     def _set_support_flags(self) -> None:
         self.features.set_support_flags(
             self.presets.presets,
-            self.hvac_device.hvac_modes,
             self.presets.presets_range,
+            self.presets.preset_mode,
+            self.hvac_device.hvac_modes,
             self._hvac_mode,
         )
         self._attr_supported_features = self.features.supported_features

diff --git a/custom_components/dual_smart_thermostat/hvac_device/heater_cooler_device.py b/custom_components/dual_smart_thermostat/hvac_device/heater_cooler_device.py
@@ -38,6 +38,7 @@ def __init__(
         heater_device: HeaterDevice,
         cooler_device: CoolerDevice,
         initial_hvac_mode: HVACMode,
+        heat_cool_mode: bool,
         temperatures: TemperatureManager,
         openings: OpeningManager,
     ) -> None:
@@ -51,7 +52,10 @@ def __init__(
             heater_device.hvac_modes, cooler_device.hvac_modes
         )
 
-        self.hvac_modes = merge_hvac_modes(device_hvac_modes, [HVACMode.HEAT_COOL])
+        if heat_cool_mode:
+            self.hvac_modes = merge_hvac_modes(device_hvac_modes, [HVACMode.HEAT_COOL])
+        else:
+            self.hvac_modes = device_hvac_modes
 
         if initial_hvac_mode in self.hvac_modes:
             self._hvac_mode = initial_hvac_mode