Merge pull request #311 from PeteRager/2024.2.1

2024.2.1

custom_components/lennoxs30/__init__.py

@@ -471,7 +471,7 @@ def __init__(
         else:
             if ip_address is None:
                 e_name = email.split("@")
-                redacted_email: str = e_name[0].replace(".", "_")
+                redacted_email: str = e_name[0].replace(".", "_").replace("__","_")
                 self.connection_state = "lennoxs30.conn_" + redacted_email
             else:
                 self.connection_state = "lennoxs30.conn_" + self._ip_address.replace(".", "_").replace(":", "_")

custom_components/lennoxs30/climate.py

@@ -106,6 +106,7 @@ def __init__(self, hass, manager: Manager, system: lennox_system, zone: lennox_z
         self.hass: HomeAssistant = hass
         self._zone = zone
         self._myname = self._system.name + "_" + self._zone.name
+        self._enable_turn_on_off_backwards_compatibility = False
 
     async def async_added_to_hass(self) -> None:
         """Run when entity about to be added to hass."""
@@ -214,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)

custom_components/lennoxs30/manifest.json

@@ -9,5 +9,5 @@
   "issue_tracker" : "https://github.com/PeteRager/lennoxs30/issues",
   "quality_scale": "platinum",
   "requirements": ["lennoxs30api==0.2.13"],
-  "version": "2024.2.0"
+  "version": "2024.2.1"
 }

tests/test_async_setup_entry.py

@@ -320,7 +320,7 @@ async def test_async_setup_entry_multiple(hass, caplog):
 
     data = {
         "cloud_connection": True,
-        "email": "pete.rage@rage.com",
+        "email": "pete._rage@rage.com",
         "password": "rage",
         "app_id": "homeassistant",
         "create_sensors": True,
@@ -354,7 +354,7 @@ async def test_async_setup_entry_multiple(hass, caplog):
         assert manager._poll_interval == 1
         assert manager._fast_poll_interval == 0.75
         assert manager._fast_poll_count == 5
-        assert manager.api._username == "pete.rage@rage.com"
+        assert manager.api._username == "pete._rage@rage.com"
         assert manager.api._password == "rage"
         assert manager._pii_message_log is False
         assert manager._message_debug_logging is True

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