Merge pull request #308 from PeteRager/emergency_heat

Fix check for emergency heat
PeteRager · Feb 20, 2024 · 3c00601 · 3c00601
2 parents bc1f1d0 + f7e68ec
commit 3c00601
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/custom_components/lennoxs30/climate.py b/custom_components/lennoxs30/climate.py
@@ -215,7 +215,7 @@ def supported_features(self):
         ):
             mask |= ClimateEntityFeature.TARGET_HUMIDITY
 
-        if self._zone.heatingOption and self._system.has_emergency_heat():
+        if self._zone.emergencyHeatingOption or self._system.has_emergency_heat():
             mask |= ClimateEntityFeature.AUX_HEAT
 
         _LOGGER.debug("climate:supported_features name [%s] support_flags [%d]", self._myname, SUPPORT_FLAGS)

diff --git a/tests/test_climate.py b/tests/test_climate.py
@@ -757,12 +757,24 @@ async def test_climate_supported_features(hass, manager_mz: Manager):
     assert feat & SUPPORT_PRESET_MODE != 0
     assert feat & SUPPORT_FAN_MODE != 0
 
-    c._zone.heatingOption = True
+    c._zone.emergencyHeatingOption = False
     with patch.object(system, "has_emergency_heat") as has_emergency_heat:
         has_emergency_heat.return_value = True
         feat = c.supported_features
         assert feat & SUPPORT_AUX_HEAT != 0
 
+    c._zone.emergencyHeatingOption = True
+    with patch.object(system, "has_emergency_heat") as has_emergency_heat:
+        has_emergency_heat.return_value = False
+        feat = c.supported_features
+        assert feat & SUPPORT_AUX_HEAT != 0
+
+    c._zone.emergencyHeatingOption = False
+    with patch.object(system, "has_emergency_heat") as has_emergency_heat:
+        has_emergency_heat.return_value = False
+        feat = c.supported_features
+        assert feat & SUPPORT_AUX_HEAT == 0
+
     zone1: lennox_zone = system.zone_list[1]
     c1 = S30Climate(hass, manager, system, zone1)
     feat = c1.supported_features