From a14826d75e4f6aac7579710c7bcce721a28f5807 Mon Sep 17 00:00:00 2001
From: Shay Levy <levyshay1@gmail.com>
Date: Wed, 4 Sep 2024 18:34:11 +0300
Subject: [PATCH 01/21] Fix BTHome validate triggers for device with multiple
 buttons (#125183)

* Fix BTHome validate triggers for device with multiple buttons

* Remove None default
---
 .../components/bthome/device_trigger.py       |  56 +++++---
 .../components/bthome/test_device_trigger.py  | 124 +++++++++++++++++-
 2 files changed, 158 insertions(+), 22 deletions(-)

diff --git a/homeassistant/components/bthome/device_trigger.py b/homeassistant/components/bthome/device_trigger.py
index c49664b1146b8..c50ffc0590015 100644
--- a/homeassistant/components/bthome/device_trigger.py
+++ b/homeassistant/components/bthome/device_trigger.py
@@ -7,6 +7,9 @@
 import voluptuous as vol
 
 from homeassistant.components.device_automation import DEVICE_TRIGGER_BASE_SCHEMA
+from homeassistant.components.device_automation.exceptions import (
+    InvalidDeviceAutomationConfig,
+)
 from homeassistant.components.homeassistant.triggers import event as event_trigger
 from homeassistant.const import (
     CONF_DEVICE_ID,
@@ -43,34 +46,47 @@
     EVENT_CLASS_DIMMER: {"rotate_left", "rotate_right"},
 }
 
-SCHEMA_BY_EVENT_CLASS = {
-    EVENT_CLASS_BUTTON: DEVICE_TRIGGER_BASE_SCHEMA.extend(
-        {
-            vol.Required(CONF_TYPE): vol.In([EVENT_CLASS_BUTTON]),
-            vol.Required(CONF_SUBTYPE): vol.In(
-                TRIGGERS_BY_EVENT_CLASS[EVENT_CLASS_BUTTON]
-            ),
-        }
-    ),
-    EVENT_CLASS_DIMMER: DEVICE_TRIGGER_BASE_SCHEMA.extend(
-        {
-            vol.Required(CONF_TYPE): vol.In([EVENT_CLASS_DIMMER]),
-            vol.Required(CONF_SUBTYPE): vol.In(
-                TRIGGERS_BY_EVENT_CLASS[EVENT_CLASS_DIMMER]
-            ),
-        }
-    ),
-}
+TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
+    {vol.Required(CONF_TYPE): str, vol.Required(CONF_SUBTYPE): str}
+)
 
 
 async def async_validate_trigger_config(
     hass: HomeAssistant, config: ConfigType
 ) -> ConfigType:
     """Validate trigger config."""
-    return SCHEMA_BY_EVENT_CLASS.get(config[CONF_TYPE], DEVICE_TRIGGER_BASE_SCHEMA)(  # type: ignore[no-any-return]
-        config
+    config = TRIGGER_SCHEMA(config)
+    event_class = config[CONF_TYPE]
+    event_type = config[CONF_SUBTYPE]
+
+    device_registry = dr.async_get(hass)
+    device = device_registry.async_get(config[CONF_DEVICE_ID])
+    assert device is not None
+    config_entries = [
+        hass.config_entries.async_get_entry(entry_id)
+        for entry_id in device.config_entries
+    ]
+    bthome_config_entry = next(
+        iter(entry for entry in config_entries if entry and entry.domain == DOMAIN)
+    )
+    event_classes: list[str] = bthome_config_entry.data.get(
+        CONF_DISCOVERED_EVENT_CLASSES, []
     )
 
+    if event_class not in event_classes:
+        raise InvalidDeviceAutomationConfig(
+            f"BTHome trigger {event_class} is not valid for device "
+            f"{device} ({config[CONF_DEVICE_ID]})"
+        )
+
+    if event_type not in TRIGGERS_BY_EVENT_CLASS.get(event_class.split("_")[0], ()):
+        raise InvalidDeviceAutomationConfig(
+            f"BTHome trigger {event_type} is not valid for device "
+            f"{device} ({config[CONF_DEVICE_ID]})"
+        )
+
+    return config
+
 
 async def async_get_triggers(
     hass: HomeAssistant, device_id: str
diff --git a/tests/components/bthome/test_device_trigger.py b/tests/components/bthome/test_device_trigger.py
index 459654826f94f..c4c900ef6e103 100644
--- a/tests/components/bthome/test_device_trigger.py
+++ b/tests/components/bthome/test_device_trigger.py
@@ -1,10 +1,19 @@
 """Test BTHome BLE events."""
 
+import pytest
+
 from homeassistant.components import automation
 from homeassistant.components.bluetooth import DOMAIN as BLUETOOTH_DOMAIN
 from homeassistant.components.bthome.const import CONF_SUBTYPE, DOMAIN
 from homeassistant.components.device_automation import DeviceAutomationType
-from homeassistant.const import CONF_DEVICE_ID, CONF_DOMAIN, CONF_PLATFORM, CONF_TYPE
+from homeassistant.const import (
+    CONF_DEVICE_ID,
+    CONF_DOMAIN,
+    CONF_PLATFORM,
+    CONF_TYPE,
+    STATE_ON,
+    STATE_UNAVAILABLE,
+)
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.helpers import device_registry as dr
 from homeassistant.setup import async_setup_component
@@ -121,6 +130,117 @@ async def test_get_triggers_button(
     await hass.async_block_till_done()
 
 
+async def test_get_triggers_multiple_buttons(
+    hass: HomeAssistant, device_registry: dr.DeviceRegistry
+) -> None:
+    """Test that we get the expected triggers for multiple buttons device."""
+    mac = "A4:C1:38:8D:18:B2"
+    entry = await _async_setup_bthome_device(hass, mac)
+    events = async_capture_events(hass, "bthome_ble_event")
+
+    # Emit button_1 long press and button_2 press events
+    # so it creates the device in the registry
+    inject_bluetooth_service_info_bleak(
+        hass,
+        make_bthome_v2_adv(mac, b"\x40\x3a\x04\x3a\x01"),
+    )
+
+    # wait for the event
+    await hass.async_block_till_done()
+    assert len(events) == 2
+
+    device = device_registry.async_get_device(identifiers={get_device_id(mac)})
+    assert device
+    expected_trigger1 = {
+        CONF_PLATFORM: "device",
+        CONF_DOMAIN: DOMAIN,
+        CONF_DEVICE_ID: device.id,
+        CONF_TYPE: "button_1",
+        CONF_SUBTYPE: "long_press",
+        "metadata": {},
+    }
+    expected_trigger2 = {
+        CONF_PLATFORM: "device",
+        CONF_DOMAIN: DOMAIN,
+        CONF_DEVICE_ID: device.id,
+        CONF_TYPE: "button_2",
+        CONF_SUBTYPE: "press",
+        "metadata": {},
+    }
+    triggers = await async_get_device_automations(
+        hass, DeviceAutomationType.TRIGGER, device.id
+    )
+    assert expected_trigger1 in triggers
+    assert expected_trigger2 in triggers
+
+    assert await hass.config_entries.async_unload(entry.entry_id)
+    await hass.async_block_till_done()
+
+
+@pytest.mark.parametrize(
+    ("event_class", "event_type", "expected"),
+    [
+        ("button_1", "long_press", STATE_ON),
+        ("button_2", "press", STATE_ON),
+        ("button_3", "long_press", STATE_UNAVAILABLE),
+        ("button", "long_press", STATE_UNAVAILABLE),
+        ("button_1", "invalid_press", STATE_UNAVAILABLE),
+    ],
+)
+async def test_validate_trigger_config(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    event_class: str,
+    event_type: str,
+    expected: str,
+) -> None:
+    """Test unsupported trigger does not return a trigger config."""
+    mac = "A4:C1:38:8D:18:B2"
+    entry = await _async_setup_bthome_device(hass, mac)
+
+    # Emit button_1 long press and button_2 press events
+    # so it creates the device in the registry
+    inject_bluetooth_service_info_bleak(
+        hass,
+        make_bthome_v2_adv(mac, b"\x40\x3a\x04\x3a\x01"),
+    )
+
+    # wait for the event
+    await hass.async_block_till_done()
+
+    device = device_registry.async_get_device(identifiers={get_device_id(mac)})
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        CONF_PLATFORM: "device",
+                        CONF_DOMAIN: DOMAIN,
+                        CONF_DEVICE_ID: device.id,
+                        CONF_TYPE: event_class,
+                        CONF_SUBTYPE: event_type,
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {"some": "test_trigger_button_long_press"},
+                    },
+                },
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+
+    automations = hass.states.async_entity_ids(automation.DOMAIN)
+    assert len(automations) == 1
+    assert hass.states.get(automations[0]).state == expected
+
+    assert await hass.config_entries.async_unload(entry.entry_id)
+    await hass.async_block_till_done()
+
+
 async def test_get_triggers_dimmer(
     hass: HomeAssistant, device_registry: dr.DeviceRegistry
 ) -> None:
@@ -235,7 +355,7 @@ async def test_if_fires_on_motion_detected(
         make_bthome_v2_adv(mac, b"\x40\x3a\x03"),
     )
 
-    #     # wait for the event
+    # wait for the event
     await hass.async_block_till_done()
 
     device = device_registry.async_get_device(identifiers={get_device_id(mac)})

From 3c13f4b4ccf64104e97b2d25ec395efb1947a205 Mon Sep 17 00:00:00 2001
From: Simon Lamon <32477463+silamon@users.noreply.github.com>
Date: Fri, 6 Sep 2024 15:02:38 +0200
Subject: [PATCH 02/21] Improve play media support in LinkPlay (#125205)

Improve play media support in linkplay
---
 homeassistant/components/linkplay/media_player.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/homeassistant/components/linkplay/media_player.py b/homeassistant/components/linkplay/media_player.py
index 0b62b4dbceedb..9eed51241cbed 100644
--- a/homeassistant/components/linkplay/media_player.py
+++ b/homeassistant/components/linkplay/media_player.py
@@ -20,6 +20,9 @@
     MediaType,
     RepeatMode,
 )
+from homeassistant.components.media_player.browse_media import (
+    async_process_play_media_url,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr
@@ -233,10 +236,14 @@ async def async_play_media(
         self, media_type: MediaType | str, media_id: str, **kwargs: Any
     ) -> None:
         """Play a piece of media."""
-        media = await media_source.async_resolve_media(
-            self.hass, media_id, self.entity_id
-        )
-        await self._bridge.player.play(media.url)
+        if media_source.is_media_source_id(media_id):
+            play_item = await media_source.async_resolve_media(
+                self.hass, media_id, self.entity_id
+            )
+            media_id = play_item.url
+
+        url = async_process_play_media_url(self.hass, media_id)
+        await self._bridge.player.play(url)
 
     def _update_properties(self) -> None:
         """Update the properties of the media player."""

From 48fcf58eb9e2e0a596d941a904b95a0b2acf198d Mon Sep 17 00:00:00 2001
From: Joost Lekkerkerker <joostlek@outlook.com>
Date: Fri, 6 Sep 2024 15:42:56 +0200
Subject: [PATCH 03/21] Revert #122676 Yamaha discovery (#125216)

Revert Yamaha discovery
---
 .../components/yamaha/media_player.py         | 30 +------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/homeassistant/components/yamaha/media_player.py b/homeassistant/components/yamaha/media_player.py
index 58f501b99be50..bccb7b437f8d6 100644
--- a/homeassistant/components/yamaha/media_player.py
+++ b/homeassistant/components/yamaha/media_player.py
@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import contextlib
 import logging
 from typing import Any
 
@@ -130,34 +129,7 @@ def _discovery(config_info):
             zones.extend(recv.zone_controllers())
     else:
         _LOGGER.debug("Config Zones")
-        zones = None
-
-        # Fix for upstream issues in rxv.find() with some hardware.
-        with contextlib.suppress(AttributeError, ValueError):
-            for recv in rxv.find(DISCOVER_TIMEOUT):
-                _LOGGER.debug(
-                    "Found Serial %s %s %s",
-                    recv.serial_number,
-                    recv.ctrl_url,
-                    recv.zone,
-                )
-                if recv.ctrl_url == config_info.ctrl_url:
-                    _LOGGER.debug(
-                        "Config Zones Matched Serial %s: %s",
-                        recv.ctrl_url,
-                        recv.serial_number,
-                    )
-                    zones = rxv.RXV(
-                        config_info.ctrl_url,
-                        friendly_name=config_info.name,
-                        serial_number=recv.serial_number,
-                        model_name=recv.model_name,
-                    ).zone_controllers()
-                    break
-
-        if not zones:
-            _LOGGER.debug("Config Zones Fallback")
-            zones = rxv.RXV(config_info.ctrl_url, config_info.name).zone_controllers()
+        zones = rxv.RXV(config_info.ctrl_url, config_info.name).zone_controllers()
 
     _LOGGER.debug("Returned _discover zones: %s", zones)
     return zones

From 6c15f251c67c28c122b6e7813bc8efe697195aa0 Mon Sep 17 00:00:00 2001
From: G Johansson <goran.johansson@shiftit.se>
Date: Wed, 4 Sep 2024 21:14:54 +0200
Subject: [PATCH 04/21] Fix blocking call in yale_smart_alarm (#125255)

---
 homeassistant/components/yale_smart_alarm/coordinator.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/yale_smart_alarm/coordinator.py b/homeassistant/components/yale_smart_alarm/coordinator.py
index 1067b9279a4ab..b47545ea88b78 100644
--- a/homeassistant/components/yale_smart_alarm/coordinator.py
+++ b/homeassistant/components/yale_smart_alarm/coordinator.py
@@ -36,8 +36,10 @@ def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
     async def _async_setup(self) -> None:
         """Set up connection to Yale."""
         try:
-            self.yale = YaleSmartAlarmClient(
-                self.entry.data[CONF_USERNAME], self.entry.data[CONF_PASSWORD]
+            self.yale = await self.hass.async_add_executor_job(
+                YaleSmartAlarmClient,
+                self.entry.data[CONF_USERNAME],
+                self.entry.data[CONF_PASSWORD],
             )
         except AuthenticationError as error:
             raise ConfigEntryAuthFailed from error

From 84c204a7b3a5e0adf35ffb71f748893b9141146f Mon Sep 17 00:00:00 2001
From: G Johansson <goran.johansson@shiftit.se>
Date: Wed, 4 Sep 2024 21:49:28 +0200
Subject: [PATCH 05/21] Don't show input panel if default code provided in
 envisalink (#125256)

---
 homeassistant/components/envisalink/alarm_control_panel.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/envisalink/alarm_control_panel.py b/homeassistant/components/envisalink/alarm_control_panel.py
index d4bbe174f207e..ea8b639017883 100644
--- a/homeassistant/components/envisalink/alarm_control_panel.py
+++ b/homeassistant/components/envisalink/alarm_control_panel.py
@@ -119,7 +119,7 @@ def __init__(
         self._partition_number = partition_number
         self._panic_type = panic_type
         self._alarm_control_panel_option_default_code = code
-        self._attr_code_format = CodeFormat.NUMBER
+        self._attr_code_format = CodeFormat.NUMBER if not code else None
 
         _LOGGER.debug("Setting up alarm: %s", alarm_name)
         super().__init__(alarm_name, info, controller)

From 5c2073481d6e0a8652cfada896a7e2c6fbf5d8fd Mon Sep 17 00:00:00 2001
From: Jordi <Jordi1990@users.noreply.github.com>
Date: Wed, 4 Sep 2024 23:22:31 +0200
Subject: [PATCH 06/21] Increase AquaCell timeout and handle timeout exception
 properly (#125263)

* Increase timeout and add handling of timeout exception

* Raise update failed instead of config entry error
---
 homeassistant/components/aquacell/config_flow.py | 2 +-
 homeassistant/components/aquacell/coordinator.py | 4 ++--
 tests/components/aquacell/test_config_flow.py    | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/aquacell/config_flow.py b/homeassistant/components/aquacell/config_flow.py
index 332cd16e74952..1ee89035d93d9 100644
--- a/homeassistant/components/aquacell/config_flow.py
+++ b/homeassistant/components/aquacell/config_flow.py
@@ -56,7 +56,7 @@ async def async_step_user(
                 refresh_token = await api.authenticate(
                     user_input[CONF_EMAIL], user_input[CONF_PASSWORD]
                 )
-            except ApiException:
+            except (ApiException, TimeoutError):
                 errors["base"] = "cannot_connect"
             except AuthenticationFailed:
                 errors["base"] = "invalid_auth"
diff --git a/homeassistant/components/aquacell/coordinator.py b/homeassistant/components/aquacell/coordinator.py
index dd5dfcd2d0d12..ee4afb451b996 100644
--- a/homeassistant/components/aquacell/coordinator.py
+++ b/homeassistant/components/aquacell/coordinator.py
@@ -56,7 +56,7 @@ async def _async_update_data(self) -> dict[str, Softener]:
         so entities can quickly look up their data.
         """
 
-        async with asyncio.timeout(10):
+        async with asyncio.timeout(30):
             # Check if the refresh token is expired
             expiry_time = (
                 self.refresh_token_creation_time
@@ -72,7 +72,7 @@ async def _async_update_data(self) -> dict[str, Softener]:
                 softeners = await self.aquacell_api.get_all_softeners()
             except AuthenticationFailed as err:
                 raise ConfigEntryError from err
-            except AquacellApiException as err:
+            except (AquacellApiException, TimeoutError) as err:
                 raise UpdateFailed(f"Error communicating with API: {err}") from err
 
         return {softener.dsn: softener for softener in softeners}
diff --git a/tests/components/aquacell/test_config_flow.py b/tests/components/aquacell/test_config_flow.py
index b73852d513f1b..f677b3f8348fe 100644
--- a/tests/components/aquacell/test_config_flow.py
+++ b/tests/components/aquacell/test_config_flow.py
@@ -79,6 +79,7 @@ async def test_full_flow(
     ("exception", "error"),
     [
         (ApiException, "cannot_connect"),
+        (TimeoutError, "cannot_connect"),
         (AuthenticationFailed, "invalid_auth"),
         (Exception, "unknown"),
     ],

From 5c8b2cde925cb491b000fdc41b8d0a59a5048ce7 Mon Sep 17 00:00:00 2001
From: Noah Husby <32528627+noahhusby@users.noreply.github.com>
Date: Fri, 6 Sep 2024 09:22:39 -0400
Subject: [PATCH 07/21] Bump aiorussound to 3.0.4 (#125285)

feat: bump aiorussound to 3.0.4
---
 .../components/russound_rio/__init__.py       | 10 ++++-----
 .../components/russound_rio/config_flow.py    |  9 ++++----
 .../components/russound_rio/const.py          |  4 ++--
 .../components/russound_rio/entity.py         | 15 +++++++++----
 .../components/russound_rio/manifest.json     |  2 +-
 .../components/russound_rio/media_player.py   | 22 ++++++++++---------
 requirements_all.txt                          |  2 +-
 requirements_test_all.txt                     |  2 +-
 tests/components/russound_rio/conftest.py     |  4 ++--
 9 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/homeassistant/components/russound_rio/__init__.py b/homeassistant/components/russound_rio/__init__.py
index 8627c636ef2ee..823d0736037b2 100644
--- a/homeassistant/components/russound_rio/__init__.py
+++ b/homeassistant/components/russound_rio/__init__.py
@@ -3,7 +3,7 @@
 import asyncio
 import logging
 
-from aiorussound import Russound
+from aiorussound import RussoundClient, RussoundTcpConnectionHandler
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PORT, Platform
@@ -16,7 +16,7 @@
 
 _LOGGER = logging.getLogger(__name__)
 
-type RussoundConfigEntry = ConfigEntry[Russound]
+type RussoundConfigEntry = ConfigEntry[RussoundClient]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: RussoundConfigEntry) -> bool:
@@ -24,7 +24,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: RussoundConfigEntry) ->
 
     host = entry.data[CONF_HOST]
     port = entry.data[CONF_PORT]
-    russ = Russound(hass.loop, host, port)
+    russ = RussoundClient(RussoundTcpConnectionHandler(hass.loop, host, port))
 
     @callback
     def is_connected_updated(connected: bool) -> None:
@@ -37,14 +37,12 @@ def is_connected_updated(connected: bool) -> None:
                 port,
             )
 
-    russ.add_connection_callback(is_connected_updated)
-
+    russ.connection_handler.add_connection_callback(is_connected_updated)
     try:
         async with asyncio.timeout(CONNECT_TIMEOUT):
             await russ.connect()
     except RUSSOUND_RIO_EXCEPTIONS as err:
         raise ConfigEntryNotReady(f"Error while connecting to {host}:{port}") from err
-
     entry.runtime_data = russ
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
diff --git a/homeassistant/components/russound_rio/config_flow.py b/homeassistant/components/russound_rio/config_flow.py
index df173d29f6118..03e32f39c084b 100644
--- a/homeassistant/components/russound_rio/config_flow.py
+++ b/homeassistant/components/russound_rio/config_flow.py
@@ -6,7 +6,7 @@
 import logging
 from typing import Any
 
-from aiorussound import Controller, Russound
+from aiorussound import Controller, RussoundClient, RussoundTcpConnectionHandler
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
@@ -54,8 +54,9 @@ async def async_step_user(
             host = user_input[CONF_HOST]
             port = user_input[CONF_PORT]
 
-            controllers = None
-            russ = Russound(self.hass.loop, host, port)
+            russ = RussoundClient(
+                RussoundTcpConnectionHandler(self.hass.loop, host, port)
+            )
             try:
                 async with asyncio.timeout(CONNECT_TIMEOUT):
                     await russ.connect()
@@ -87,7 +88,7 @@ async def async_step_import(self, import_data: dict[str, Any]) -> ConfigFlowResu
         port = import_data.get(CONF_PORT, 9621)
 
         # Connection logic is repeated here since this method will be removed in future releases
-        russ = Russound(self.hass.loop, host, port)
+        russ = RussoundClient(RussoundTcpConnectionHandler(self.hass.loop, host, port))
         try:
             async with asyncio.timeout(CONNECT_TIMEOUT):
                 await russ.connect()
diff --git a/homeassistant/components/russound_rio/const.py b/homeassistant/components/russound_rio/const.py
index d1f4e1c4c0e00..42a1db5f2ad4a 100644
--- a/homeassistant/components/russound_rio/const.py
+++ b/homeassistant/components/russound_rio/const.py
@@ -2,7 +2,7 @@
 
 import asyncio
 
-from aiorussound import CommandException
+from aiorussound import CommandError
 from aiorussound.const import FeatureFlag
 
 from homeassistant.components.media_player import MediaPlayerEntityFeature
@@ -10,7 +10,7 @@
 DOMAIN = "russound_rio"
 
 RUSSOUND_RIO_EXCEPTIONS = (
-    CommandException,
+    CommandError,
     ConnectionRefusedError,
     TimeoutError,
     asyncio.CancelledError,
diff --git a/homeassistant/components/russound_rio/entity.py b/homeassistant/components/russound_rio/entity.py
index 0e4d5cf7dde7d..4d458118939ce 100644
--- a/homeassistant/components/russound_rio/entity.py
+++ b/homeassistant/components/russound_rio/entity.py
@@ -4,7 +4,7 @@
 from functools import wraps
 from typing import Any, Concatenate
 
-from aiorussound import Controller
+from aiorussound import Controller, RussoundTcpConnectionHandler
 
 from homeassistant.core import callback
 from homeassistant.exceptions import HomeAssistantError
@@ -53,7 +53,6 @@ def __init__(
             or f"{self._primary_mac_address}-{self._controller.controller_id}"
         )
         self._attr_device_info = DeviceInfo(
-            configuration_url=f"http://{self._instance.host}",
             # Use MAC address of Russound device as identifier
             identifiers={(DOMAIN, self._device_identifier)},
             manufacturer="Russound",
@@ -61,6 +60,10 @@ def __init__(
             model=controller.controller_type,
             sw_version=controller.firmware_version,
         )
+        if isinstance(self._instance.connection_handler, RussoundTcpConnectionHandler):
+            self._attr_device_info["configuration_url"] = (
+                f"http://{self._instance.connection_handler.host}"
+            )
         if controller.parent_controller:
             self._attr_device_info["via_device"] = (
                 DOMAIN,
@@ -79,8 +82,12 @@ def _is_connected_updated(self, connected: bool) -> None:
 
     async def async_added_to_hass(self) -> None:
         """Register callbacks."""
-        self._instance.add_connection_callback(self._is_connected_updated)
+        self._instance.connection_handler.add_connection_callback(
+            self._is_connected_updated
+        )
 
     async def async_will_remove_from_hass(self) -> None:
         """Remove callbacks."""
-        self._instance.remove_connection_callback(self._is_connected_updated)
+        self._instance.connection_handler.remove_connection_callback(
+            self._is_connected_updated
+        )
diff --git a/homeassistant/components/russound_rio/manifest.json b/homeassistant/components/russound_rio/manifest.json
index 6c473d948744d..19273de92ee6d 100644
--- a/homeassistant/components/russound_rio/manifest.json
+++ b/homeassistant/components/russound_rio/manifest.json
@@ -7,5 +7,5 @@
   "iot_class": "local_push",
   "loggers": ["aiorussound"],
   "quality_scale": "silver",
-  "requirements": ["aiorussound==2.3.2"]
+  "requirements": ["aiorussound==3.0.4"]
 }
diff --git a/homeassistant/components/russound_rio/media_player.py b/homeassistant/components/russound_rio/media_player.py
index 20aaf0f3c08a2..a5bb392a02852 100644
--- a/homeassistant/components/russound_rio/media_player.py
+++ b/homeassistant/components/russound_rio/media_player.py
@@ -84,14 +84,16 @@ async def async_setup_entry(
     """Set up the Russound RIO platform."""
     russ = entry.runtime_data
 
+    await russ.init_sources()
+    sources = russ.sources
+    for source in sources.values():
+        await source.watch()
+
     # Discover controllers
     controllers = await russ.enumerate_controllers()
 
     entities = []
     for controller in controllers.values():
-        sources = controller.sources
-        for source in sources.values():
-            await source.watch()
         for zone in controller.zones.values():
             await zone.watch()
             mp = RussoundZoneDevice(zone, sources)
@@ -154,7 +156,7 @@ def _current_source(self) -> Source:
     @property
     def state(self) -> MediaPlayerState | None:
         """Return the state of the device."""
-        status = self._zone.status
+        status = self._zone.properties.status
         if status == "ON":
             return MediaPlayerState.ON
         if status == "OFF":
@@ -174,22 +176,22 @@ def source_list(self):
     @property
     def media_title(self):
         """Title of current playing media."""
-        return self._current_source().song_name
+        return self._current_source().properties.song_name
 
     @property
     def media_artist(self):
         """Artist of current playing media, music track only."""
-        return self._current_source().artist_name
+        return self._current_source().properties.artist_name
 
     @property
     def media_album_name(self):
         """Album name of current playing media, music track only."""
-        return self._current_source().album_name
+        return self._current_source().properties.album_name
 
     @property
     def media_image_url(self):
         """Image url of current playing media."""
-        return self._current_source().cover_art_url
+        return self._current_source().properties.cover_art_url
 
     @property
     def volume_level(self):
@@ -198,7 +200,7 @@ def volume_level(self):
         Value is returned based on a range (0..50).
         Therefore float divide by 50 to get to the required range.
         """
-        return float(self._zone.volume or "0") / 50.0
+        return float(self._zone.properties.volume or "0") / 50.0
 
     @command
     async def async_turn_off(self) -> None:
@@ -214,7 +216,7 @@ async def async_turn_on(self) -> None:
     async def async_set_volume_level(self, volume: float) -> None:
         """Set the volume level."""
         rvol = int(volume * 50.0)
-        await self._zone.set_volume(rvol)
+        await self._zone.set_volume(str(rvol))
 
     @command
     async def async_select_source(self, source: str) -> None:
diff --git a/requirements_all.txt b/requirements_all.txt
index 59e9f95e93efe..b4599b7cde933 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -350,7 +350,7 @@ aioridwell==2024.01.0
 aioruckus==0.41
 
 # homeassistant.components.russound_rio
-aiorussound==2.3.2
+aiorussound==3.0.4
 
 # homeassistant.components.ruuvi_gateway
 aioruuvigateway==0.1.0
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index ace1c743fe0be..511974f85f7fb 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -332,7 +332,7 @@ aioridwell==2024.01.0
 aioruckus==0.41
 
 # homeassistant.components.russound_rio
-aiorussound==2.3.2
+aiorussound==3.0.4
 
 # homeassistant.components.ruuvi_gateway
 aioruuvigateway==0.1.0
diff --git a/tests/components/russound_rio/conftest.py b/tests/components/russound_rio/conftest.py
index a87d0a74fa8d4..344c743d0b39c 100644
--- a/tests/components/russound_rio/conftest.py
+++ b/tests/components/russound_rio/conftest.py
@@ -37,10 +37,10 @@ def mock_russound() -> Generator[AsyncMock]:
     """Mock the Russound RIO client."""
     with (
         patch(
-            "homeassistant.components.russound_rio.Russound", autospec=True
+            "homeassistant.components.russound_rio.RussoundClient", autospec=True
         ) as mock_client,
         patch(
-            "homeassistant.components.russound_rio.config_flow.Russound",
+            "homeassistant.components.russound_rio.config_flow.RussoundClient",
             return_value=mock_client,
         ),
     ):

From 4ed18495f36e5ee9e31b24261c66c0ee65cbc646 Mon Sep 17 00:00:00 2001
From: Simon Lamon <32477463+silamon@users.noreply.github.com>
Date: Thu, 5 Sep 2024 08:50:49 +0200
Subject: [PATCH 08/21] Add follower to the PlayingMode enum  (#125294)

Update media_player.py
---
 homeassistant/components/linkplay/media_player.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/homeassistant/components/linkplay/media_player.py b/homeassistant/components/linkplay/media_player.py
index 9eed51241cbed..c538c9c3219c4 100644
--- a/homeassistant/components/linkplay/media_player.py
+++ b/homeassistant/components/linkplay/media_player.py
@@ -62,6 +62,7 @@
     PlayingMode.FM: "FM Radio",
     PlayingMode.RCA: "RCA",
     PlayingMode.UDISK: "USB",
+    PlayingMode.FOLLOWER: "Follower",
 }
 
 SOURCE_MAP_INV: dict[str, PlayingMode] = {v: k for k, v in SOURCE_MAP.items()}

From 61ee3a9412aab2e4a84dbabc58b9c5c6a4509769 Mon Sep 17 00:00:00 2001
From: Erik Montnemery <erik@montnemery.com>
Date: Fri, 6 Sep 2024 07:59:22 +0200
Subject: [PATCH 09/21] Don't allow templating min, max, step in config entry
 template number (#125342)

---
 homeassistant/components/template/__init__.py | 20 ++++++--
 .../components/template/config_flow.py        | 18 +++----
 homeassistant/components/template/const.py    |  9 ++--
 homeassistant/components/template/number.py   |  5 +-
 tests/components/template/test_config_flow.py | 48 +++++++++---------
 tests/components/template/test_init.py        | 49 ++++++++++++++++---
 tests/components/template/test_number.py      | 12 ++---
 7 files changed, 106 insertions(+), 55 deletions(-)

diff --git a/homeassistant/components/template/__init__.py b/homeassistant/components/template/__init__.py
index efa9934269907..d3cfda2d4eb98 100644
--- a/homeassistant/components/template/__init__.py
+++ b/homeassistant/components/template/__init__.py
@@ -7,9 +7,14 @@
 
 from homeassistant import config as conf_util
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_DEVICE_ID, CONF_UNIQUE_ID, SERVICE_RELOAD
+from homeassistant.const import (
+    CONF_DEVICE_ID,
+    CONF_NAME,
+    CONF_UNIQUE_ID,
+    SERVICE_RELOAD,
+)
 from homeassistant.core import Event, HomeAssistant, ServiceCall
-from homeassistant.exceptions import HomeAssistantError
+from homeassistant.exceptions import ConfigEntryError, HomeAssistantError
 from homeassistant.helpers import discovery
 from homeassistant.helpers.device import (
     async_remove_stale_devices_links_keep_current_device,
@@ -19,7 +24,7 @@
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import async_get_integration
 
-from .const import CONF_TRIGGER, DOMAIN, PLATFORMS
+from .const import CONF_MAX, CONF_MIN, CONF_STEP, CONF_TRIGGER, DOMAIN, PLATFORMS
 from .coordinator import TriggerUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
@@ -67,6 +72,15 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         entry.options.get(CONF_DEVICE_ID),
     )
 
+    for key in (CONF_MAX, CONF_MIN, CONF_STEP):
+        if key not in entry.options:
+            continue
+        if isinstance(entry.options[key], str):
+            raise ConfigEntryError(
+                f"The '{entry.options.get(CONF_NAME) or ""}' number template needs to "
+                f"be reconfigured, {key} must be a number, got '{entry.options[key]}'"
+            )
+
     await hass.config_entries.async_forward_entry_setups(
         entry, (entry.options["template_type"],)
     )
diff --git a/homeassistant/components/template/config_flow.py b/homeassistant/components/template/config_flow.py
index 2c12a0d03e90a..ba4f4a78f530d 100644
--- a/homeassistant/components/template/config_flow.py
+++ b/homeassistant/components/template/config_flow.py
@@ -107,15 +107,15 @@ def generate_schema(domain: str, flow_type: str) -> vol.Schema:
     if domain == Platform.NUMBER:
         schema |= {
             vol.Required(CONF_STATE): selector.TemplateSelector(),
-            vol.Required(
-                CONF_MIN, default=f"{{{{{DEFAULT_MIN_VALUE}}}}}"
-            ): selector.TemplateSelector(),
-            vol.Required(
-                CONF_MAX, default=f"{{{{{DEFAULT_MAX_VALUE}}}}}"
-            ): selector.TemplateSelector(),
-            vol.Required(
-                CONF_STEP, default=f"{{{{{DEFAULT_STEP}}}}}"
-            ): selector.TemplateSelector(),
+            vol.Required(CONF_MIN, default=DEFAULT_MIN_VALUE): selector.NumberSelector(
+                selector.NumberSelectorConfig(mode=selector.NumberSelectorMode.BOX),
+            ),
+            vol.Required(CONF_MAX, default=DEFAULT_MAX_VALUE): selector.NumberSelector(
+                selector.NumberSelectorConfig(mode=selector.NumberSelectorMode.BOX),
+            ),
+            vol.Required(CONF_STEP, default=DEFAULT_STEP): selector.NumberSelector(
+                selector.NumberSelectorConfig(mode=selector.NumberSelectorMode.BOX),
+            ),
             vol.Optional(CONF_SET_VALUE): selector.ActionSelector(),
         }
 
diff --git a/homeassistant/components/template/const.py b/homeassistant/components/template/const.py
index 8b4e46ba3834c..89df87b4031f4 100644
--- a/homeassistant/components/template/const.py
+++ b/homeassistant/components/template/const.py
@@ -28,11 +28,14 @@
     Platform.WEATHER,
 ]
 
-CONF_AVAILABILITY = "availability"
-CONF_ATTRIBUTES = "attributes"
 CONF_ATTRIBUTE_TEMPLATES = "attribute_templates"
+CONF_ATTRIBUTES = "attributes"
+CONF_AVAILABILITY = "availability"
+CONF_MAX = "max"
+CONF_MIN = "min"
+CONF_OBJECT_ID = "object_id"
 CONF_PICTURE = "picture"
 CONF_PRESS = "press"
-CONF_OBJECT_ID = "object_id"
+CONF_STEP = "step"
 CONF_TURN_OFF = "turn_off"
 CONF_TURN_ON = "turn_on"
diff --git a/homeassistant/components/template/number.py b/homeassistant/components/template/number.py
index 499ddc192ccb7..e051f1241493c 100644
--- a/homeassistant/components/template/number.py
+++ b/homeassistant/components/template/number.py
@@ -31,7 +31,7 @@
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import TriggerUpdateCoordinator
-from .const import DOMAIN
+from .const import CONF_MAX, CONF_MIN, CONF_STEP, DOMAIN
 from .template_entity import (
     TEMPLATE_ENTITY_AVAILABILITY_SCHEMA,
     TEMPLATE_ENTITY_ICON_SCHEMA,
@@ -42,9 +42,6 @@
 _LOGGER = logging.getLogger(__name__)
 
 CONF_SET_VALUE = "set_value"
-CONF_MIN = "min"
-CONF_MAX = "max"
-CONF_STEP = "step"
 
 DEFAULT_NAME = "Template Number"
 DEFAULT_OPTIMISTIC = False
diff --git a/tests/components/template/test_config_flow.py b/tests/components/template/test_config_flow.py
index f8ab190e664da..ee748ce41f522 100644
--- a/tests/components/template/test_config_flow.py
+++ b/tests/components/template/test_config_flow.py
@@ -98,9 +98,9 @@
             {"one": "30.0", "two": "20.0"},
             {},
             {
-                "min": "{{ 0 }}",
-                "max": "{{ 100 }}",
-                "step": "{{ 0.1 }}",
+                "min": "0",
+                "max": "100",
+                "step": "0.1",
                 "set_value": {
                     "action": "input_number.set_value",
                     "target": {"entity_id": "input_number.test"},
@@ -108,9 +108,9 @@
                 },
             },
             {
-                "min": "{{ 0 }}",
-                "max": "{{ 100 }}",
-                "step": "{{ 0.1 }}",
+                "min": 0,
+                "max": 100,
+                "step": 0.1,
                 "set_value": {
                     "action": "input_number.set_value",
                     "target": {"entity_id": "input_number.test"},
@@ -258,14 +258,14 @@ async def test_config_flow(
             "number",
             {"state": "{{ states('number.one') }}"},
             {
-                "min": "{{ 0 }}",
-                "max": "{{ 100 }}",
-                "step": "{{ 0.1 }}",
+                "min": "0",
+                "max": "100",
+                "step": "0.1",
             },
             {
-                "min": "{{ 0 }}",
-                "max": "{{ 100 }}",
-                "step": "{{ 0.1 }}",
+                "min": 0,
+                "max": 100,
+                "step": 0.1,
             },
         ),
         (
@@ -451,9 +451,9 @@ def get_suggested(schema, key):
             ["30.0", "20.0"],
             {"one": "30.0", "two": "20.0"},
             {
-                "min": "{{ 0 }}",
-                "max": "{{ 100 }}",
-                "step": "{{ 0.1 }}",
+                "min": 0,
+                "max": 100,
+                "step": 0.1,
                 "set_value": {
                     "action": "input_number.set_value",
                     "target": {"entity_id": "input_number.test"},
@@ -461,9 +461,9 @@ def get_suggested(schema, key):
                 },
             },
             {
-                "min": "{{ 0 }}",
-                "max": "{{ 100 }}",
-                "step": "{{ 0.1 }}",
+                "min": 0,
+                "max": 100,
+                "step": 0.1,
                 "set_value": {
                     "action": "input_number.set_value",
                     "target": {"entity_id": "input_number.test"},
@@ -1230,14 +1230,14 @@ async def test_option_flow_sensor_preview_config_entry_removed(
             "number",
             {"state": "{{ states('number.one') }}"},
             {
-                "min": "{{ 0 }}",
-                "max": "{{ 100 }}",
-                "step": "{{ 0.1 }}",
+                "min": 0,
+                "max": 100,
+                "step": 0.1,
             },
             {
-                "min": "{{ 0 }}",
-                "max": "{{ 100 }}",
-                "step": "{{ 0.1 }}",
+                "min": 0,
+                "max": 100,
+                "step": 0.1,
             },
         ),
         (
diff --git a/tests/components/template/test_init.py b/tests/components/template/test_init.py
index 3b4db4bf668c6..0de57062984c6 100644
--- a/tests/components/template/test_init.py
+++ b/tests/components/template/test_init.py
@@ -319,9 +319,9 @@ async def async_yaml_patch_helper(hass: HomeAssistant, filename: str) -> None:
                 "template_type": "number",
                 "name": "My template",
                 "state": "{{ 10 }}",
-                "min": "{{ 0 }}",
-                "max": "{{ 100 }}",
-                "step": "{{ 0.1 }}",
+                "min": 0,
+                "max": 100,
+                "step": 0.1,
                 "set_value": {
                     "action": "input_number.set_value",
                     "target": {"entity_id": "input_number.test"},
@@ -330,9 +330,9 @@ async def async_yaml_patch_helper(hass: HomeAssistant, filename: str) -> None:
             },
             {
                 "state": "{{ 11 }}",
-                "min": "{{ 0 }}",
-                "max": "{{ 100 }}",
-                "step": "{{ 0.1 }}",
+                "min": 0,
+                "max": 100,
+                "step": 0.1,
                 "set_value": {
                     "action": "input_number.set_value",
                     "target": {"entity_id": "input_number.test"},
@@ -454,3 +454,40 @@ async def test_change_device(
         )
         == []
     )
+
+
+async def test_fail_non_numerical_number_settings(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test that non numerical number options causes config entry setup to fail.
+
+    Support for non numerical max, min and step was added in HA Core 2024.9.0 and
+    removed in HA Core 2024.9.1.
+    """
+
+    options = {
+        "template_type": "number",
+        "name": "My template",
+        "state": "{{ 10 }}",
+        "min": "{{ 0 }}",
+        "max": "{{ 100 }}",
+        "step": "{{ 0.1 }}",
+        "set_value": {
+            "action": "input_number.set_value",
+            "target": {"entity_id": "input_number.test"},
+            "data": {"value": "{{ value }}"},
+        },
+    }
+    # Setup the config entry
+    template_config_entry = MockConfigEntry(
+        data={},
+        domain=DOMAIN,
+        options=options,
+        title="Template",
+    )
+    template_config_entry.add_to_hass(hass)
+    assert not await hass.config_entries.async_setup(template_config_entry.entry_id)
+    assert (
+        "The 'My template' number template needs to be reconfigured, "
+        "max must be a number, got '{{ 100 }}'" in caplog.text
+    )
diff --git a/tests/components/template/test_number.py b/tests/components/template/test_number.py
index fdca94d9fa424..43decf848ff13 100644
--- a/tests/components/template/test_number.py
+++ b/tests/components/template/test_number.py
@@ -58,9 +58,9 @@ async def test_setup_config_entry(
             "name": "My template",
             "template_type": "number",
             "state": "{{ 10 }}",
-            "min": "{{ 0 }}",
-            "max": "{{ 100 }}",
-            "step": "{{ 0.1 }}",
+            "min": 0,
+            "max": 100,
+            "step": 0.1,
             "set_value": {
                 "action": "input_number.set_value",
                 "target": {"entity_id": "input_number.test"},
@@ -524,9 +524,9 @@ async def test_device_id(
             "name": "My template",
             "template_type": "number",
             "state": "{{ 10 }}",
-            "min": "{{ 0 }}",
-            "max": "{{ 100 }}",
-            "step": "{{ 0.1 }}",
+            "min": 0,
+            "max": 100,
+            "step": 0.1,
             "set_value": {
                 "action": "input_number.set_value",
                 "target": {"entity_id": "input_number.test"},

From 6c640d2abef30e827249897616caf09c1a673678 Mon Sep 17 00:00:00 2001
From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Fri, 6 Sep 2024 14:06:46 +0200
Subject: [PATCH 10/21] Fix for Hue sending effect None at turn_on command
 while no effect is active (#125377)

* Fix for Hue sending effect None at turn_on command while no effect is active

* typo

* update tests
---
 homeassistant/components/hue/v2/light.py |  6 ++-
 tests/components/hue/test_light_v2.py    | 54 +++++++++++++++++++-----
 2 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/homeassistant/components/hue/v2/light.py b/homeassistant/components/hue/v2/light.py
index b908ec83877d3..6fd0eea7a0b35 100644
--- a/homeassistant/components/hue/v2/light.py
+++ b/homeassistant/components/hue/v2/light.py
@@ -226,7 +226,11 @@ async def async_turn_on(self, **kwargs: Any) -> None:
         flash = kwargs.get(ATTR_FLASH)
         effect = effect_str = kwargs.get(ATTR_EFFECT)
         if effect_str in (EFFECT_NONE, EFFECT_NONE.lower()):
-            effect = EffectStatus.NO_EFFECT
+            # ignore effect if set to "None" and we have no effect active
+            # the special effect "None" is only used to stop an active effect
+            # but sending it while no effect is active can actually result in issues
+            # https://github.com/home-assistant/core/issues/122165
+            effect = None if self.effect == EFFECT_NONE else EffectStatus.NO_EFFECT
         elif effect_str is not None:
             # work out if we got a regular effect or timed effect
             effect = EffectStatus(effect_str)
diff --git a/tests/components/hue/test_light_v2.py b/tests/components/hue/test_light_v2.py
index 417670a3769b1..2b978ffc33fdf 100644
--- a/tests/components/hue/test_light_v2.py
+++ b/tests/components/hue/test_light_v2.py
@@ -175,7 +175,7 @@ async def test_light_turn_on_service(
     assert len(mock_bridge_v2.mock_requests) == 6
     assert mock_bridge_v2.mock_requests[5]["json"]["color_temperature"]["mirek"] == 500
 
-    # test enable effect
+    # test enable an effect
     await hass.services.async_call(
         "light",
         "turn_on",
@@ -184,8 +184,20 @@ async def test_light_turn_on_service(
     )
     assert len(mock_bridge_v2.mock_requests) == 7
     assert mock_bridge_v2.mock_requests[6]["json"]["effects"]["effect"] == "candle"
+    # fire event to update effect in HA state
+    event = {
+        "id": "3a6710fa-4474-4eba-b533-5e6e72968feb",
+        "type": "light",
+        "effects": {"status": "candle"},
+    }
+    mock_bridge_v2.api.emit_event("update", event)
+    await hass.async_block_till_done()
+    test_light = hass.states.get(test_light_id)
+    assert test_light is not None
+    assert test_light.attributes["effect"] == "candle"
 
     # test disable effect
+    # it should send a request with effect set to "no_effect"
     await hass.services.async_call(
         "light",
         "turn_on",
@@ -194,6 +206,28 @@ async def test_light_turn_on_service(
     )
     assert len(mock_bridge_v2.mock_requests) == 8
     assert mock_bridge_v2.mock_requests[7]["json"]["effects"]["effect"] == "no_effect"
+    # fire event to update effect in HA state
+    event = {
+        "id": "3a6710fa-4474-4eba-b533-5e6e72968feb",
+        "type": "light",
+        "effects": {"status": "no_effect"},
+    }
+    mock_bridge_v2.api.emit_event("update", event)
+    await hass.async_block_till_done()
+    test_light = hass.states.get(test_light_id)
+    assert test_light is not None
+    assert test_light.attributes["effect"] == "None"
+
+    # test turn on with useless effect
+    # it should send a effect in the request if the device has no effect active
+    await hass.services.async_call(
+        "light",
+        "turn_on",
+        {"entity_id": test_light_id, "effect": "None"},
+        blocking=True,
+    )
+    assert len(mock_bridge_v2.mock_requests) == 9
+    assert "effects" not in mock_bridge_v2.mock_requests[8]["json"]
 
     # test timed effect
     await hass.services.async_call(
@@ -202,11 +236,11 @@ async def test_light_turn_on_service(
         {"entity_id": test_light_id, "effect": "sunrise", "transition": 6},
         blocking=True,
     )
-    assert len(mock_bridge_v2.mock_requests) == 9
+    assert len(mock_bridge_v2.mock_requests) == 10
     assert (
-        mock_bridge_v2.mock_requests[8]["json"]["timed_effects"]["effect"] == "sunrise"
+        mock_bridge_v2.mock_requests[9]["json"]["timed_effects"]["effect"] == "sunrise"
     )
-    assert mock_bridge_v2.mock_requests[8]["json"]["timed_effects"]["duration"] == 6000
+    assert mock_bridge_v2.mock_requests[9]["json"]["timed_effects"]["duration"] == 6000
 
     # test enabling effect should ignore color temperature
     await hass.services.async_call(
@@ -215,9 +249,9 @@ async def test_light_turn_on_service(
         {"entity_id": test_light_id, "effect": "candle", "color_temp": 500},
         blocking=True,
     )
-    assert len(mock_bridge_v2.mock_requests) == 10
-    assert mock_bridge_v2.mock_requests[9]["json"]["effects"]["effect"] == "candle"
-    assert "color_temperature" not in mock_bridge_v2.mock_requests[9]["json"]
+    assert len(mock_bridge_v2.mock_requests) == 11
+    assert mock_bridge_v2.mock_requests[10]["json"]["effects"]["effect"] == "candle"
+    assert "color_temperature" not in mock_bridge_v2.mock_requests[10]["json"]
 
     # test enabling effect should ignore xy color
     await hass.services.async_call(
@@ -226,9 +260,9 @@ async def test_light_turn_on_service(
         {"entity_id": test_light_id, "effect": "candle", "xy_color": [0.123, 0.123]},
         blocking=True,
     )
-    assert len(mock_bridge_v2.mock_requests) == 11
-    assert mock_bridge_v2.mock_requests[10]["json"]["effects"]["effect"] == "candle"
-    assert "xy_color" not in mock_bridge_v2.mock_requests[9]["json"]
+    assert len(mock_bridge_v2.mock_requests) == 12
+    assert mock_bridge_v2.mock_requests[11]["json"]["effects"]["effect"] == "candle"
+    assert "xy_color" not in mock_bridge_v2.mock_requests[11]["json"]
 
 
 async def test_light_turn_off_service(

From 7859d31ca0e5bf90e77d203992bdbf981860144f Mon Sep 17 00:00:00 2001
From: Ryan Mattson <dalinicus@pm.me>
Date: Fri, 6 Sep 2024 04:45:39 -0500
Subject: [PATCH 11/21] Lyric: fixed missed snake case conversions (#125382)

fixed missed snake case conversions
---
 homeassistant/components/lyric/climate.py | 26 +++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/homeassistant/components/lyric/climate.py b/homeassistant/components/lyric/climate.py
index 1c459c2c66a42..bd9cf4997eb48 100644
--- a/homeassistant/components/lyric/climate.py
+++ b/homeassistant/components/lyric/climate.py
@@ -358,8 +358,8 @@ async def async_set_temperature(self, **kwargs: Any) -> None:
                 await self._update_thermostat(
                     self.location,
                     device,
-                    coolSetpoint=target_temp_high,
-                    heatSetpoint=target_temp_low,
+                    cool_setpoint=target_temp_high,
+                    heat_setpoint=target_temp_low,
                     mode=mode,
                 )
             except LYRIC_EXCEPTIONS as exception:
@@ -371,11 +371,11 @@ async def async_set_temperature(self, **kwargs: Any) -> None:
             try:
                 if self.hvac_mode == HVACMode.COOL:
                     await self._update_thermostat(
-                        self.location, device, coolSetpoint=temp
+                        self.location, device, cool_setpoint=temp
                     )
                 else:
                     await self._update_thermostat(
-                        self.location, device, heatSetpoint=temp
+                        self.location, device, heat_setpoint=temp
                     )
             except LYRIC_EXCEPTIONS as exception:
                 _LOGGER.error(exception)
@@ -410,7 +410,7 @@ async def _async_set_hvac_mode_tcc(self, hvac_mode: HVACMode) -> None:
                     self.location,
                     self.device,
                     mode=HVAC_MODES[LYRIC_HVAC_MODE_HEAT],
-                    autoChangeoverActive=False,
+                    auto_changeover_active=False,
                 )
                 # Sleep 3 seconds before proceeding
                 await asyncio.sleep(3)
@@ -422,7 +422,7 @@ async def _async_set_hvac_mode_tcc(self, hvac_mode: HVACMode) -> None:
                     self.location,
                     self.device,
                     mode=HVAC_MODES[LYRIC_HVAC_MODE_HEAT],
-                    autoChangeoverActive=True,
+                    auto_changeover_active=True,
                 )
             else:
                 _LOGGER.debug(
@@ -430,7 +430,7 @@ async def _async_set_hvac_mode_tcc(self, hvac_mode: HVACMode) -> None:
                     HVAC_MODES[self.device.changeable_values.mode],
                 )
                 await self._update_thermostat(
-                    self.location, self.device, autoChangeoverActive=True
+                    self.location, self.device, auto_changeover_active=True
                 )
         else:
             _LOGGER.debug("HVAC mode passed to lyric: %s", LYRIC_HVAC_MODES[hvac_mode])
@@ -438,13 +438,13 @@ async def _async_set_hvac_mode_tcc(self, hvac_mode: HVACMode) -> None:
                 self.location,
                 self.device,
                 mode=LYRIC_HVAC_MODES[hvac_mode],
-                autoChangeoverActive=False,
+                auto_changeover_active=False,
             )
 
     async def _async_set_hvac_mode_lcc(self, hvac_mode: HVACMode) -> None:
         """Set hvac mode for LCC devices (e.g., T5,6)."""
         _LOGGER.debug("HVAC mode passed to lyric: %s", LYRIC_HVAC_MODES[hvac_mode])
-        # Set autoChangeoverActive to True if the mode being passed is Auto
+        # Set auto_changeover_active to True if the mode being passed is Auto
         # otherwise leave unchanged.
         if (
             LYRIC_HVAC_MODES[hvac_mode] == LYRIC_HVAC_MODE_HEAT_COOL
@@ -458,7 +458,7 @@ async def _async_set_hvac_mode_lcc(self, hvac_mode: HVACMode) -> None:
             self.location,
             self.device,
             mode=LYRIC_HVAC_MODES[hvac_mode],
-            autoChangeoverActive=auto_changeover,
+            auto_changeover_active=auto_changeover,
         )
 
     async def async_set_preset_mode(self, preset_mode: str) -> None:
@@ -466,7 +466,7 @@ async def async_set_preset_mode(self, preset_mode: str) -> None:
         _LOGGER.debug("Set preset mode: %s", preset_mode)
         try:
             await self._update_thermostat(
-                self.location, self.device, thermostatSetpointStatus=preset_mode
+                self.location, self.device, thermostat_setpoint_status=preset_mode
             )
         except LYRIC_EXCEPTIONS as exception:
             _LOGGER.error(exception)
@@ -479,8 +479,8 @@ async def async_set_hold_time(self, time_period: str) -> None:
             await self._update_thermostat(
                 self.location,
                 self.device,
-                thermostatSetpointStatus=PRESET_HOLD_UNTIL,
-                nextPeriodTime=time_period,
+                thermostat_setpoint_status=PRESET_HOLD_UNTIL,
+                next_period_time=time_period,
             )
         except LYRIC_EXCEPTIONS as exception:
             _LOGGER.error(exception)

From edb7c76caa1ad358fa35c3a9a7a621cc1d10d60b Mon Sep 17 00:00:00 2001
From: TimL <tl@smlight.tech>
Date: Fri, 6 Sep 2024 18:20:12 +1000
Subject: [PATCH 12/21] Bump pysmlight to 0.0.14 (#125387)

Bump pysmlight 0.0.14 for smlight
---
 homeassistant/components/smlight/manifest.json | 2 +-
 requirements_all.txt                           | 2 +-
 requirements_test_all.txt                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/smlight/manifest.json b/homeassistant/components/smlight/manifest.json
index 72d915666e520..1a91b29234c99 100644
--- a/homeassistant/components/smlight/manifest.json
+++ b/homeassistant/components/smlight/manifest.json
@@ -6,7 +6,7 @@
   "documentation": "https://www.home-assistant.io/integrations/smlight",
   "integration_type": "device",
   "iot_class": "local_polling",
-  "requirements": ["pysmlight==0.0.13"],
+  "requirements": ["pysmlight==0.0.14"],
   "zeroconf": [
     {
       "type": "_slzb-06._tcp.local."
diff --git a/requirements_all.txt b/requirements_all.txt
index b4599b7cde933..6528e09aa1d26 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -2214,7 +2214,7 @@ pysmartthings==0.7.8
 pysml==0.0.12
 
 # homeassistant.components.smlight
-pysmlight==0.0.13
+pysmlight==0.0.14
 
 # homeassistant.components.snmp
 pysnmp==6.2.5
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 511974f85f7fb..0696f65449fe5 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -1768,7 +1768,7 @@ pysmartthings==0.7.8
 pysml==0.0.12
 
 # homeassistant.components.smlight
-pysmlight==0.0.13
+pysmlight==0.0.14
 
 # homeassistant.components.snmp
 pysnmp==6.2.5

From 27dc2e1b9de9699e1146e53c63054949b52cee60 Mon Sep 17 00:00:00 2001
From: Andre Lengwenus <alengwenus@gmail.com>
Date: Fri, 6 Sep 2024 08:29:49 +0200
Subject: [PATCH 13/21] Bump pypck to 0.7.22 (#125389)

---
 homeassistant/components/lcn/manifest.json | 2 +-
 requirements_all.txt                       | 2 +-
 requirements_test_all.txt                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/lcn/manifest.json b/homeassistant/components/lcn/manifest.json
index f8b7d02b103ac..9023941277f9b 100644
--- a/homeassistant/components/lcn/manifest.json
+++ b/homeassistant/components/lcn/manifest.json
@@ -8,5 +8,5 @@
   "documentation": "https://www.home-assistant.io/integrations/lcn",
   "iot_class": "local_push",
   "loggers": ["pypck"],
-  "requirements": ["pypck==0.7.21", "lcn-frontend==0.1.6"]
+  "requirements": ["pypck==0.7.22", "lcn-frontend==0.1.6"]
 }
diff --git a/requirements_all.txt b/requirements_all.txt
index 6528e09aa1d26..e86c21d012416 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -2109,7 +2109,7 @@ pyownet==0.10.0.post1
 pypca==0.0.7
 
 # homeassistant.components.lcn
-pypck==0.7.21
+pypck==0.7.22
 
 # homeassistant.components.pjlink
 pypjlink2==1.2.1
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 0696f65449fe5..8bb92e7d2e8e6 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -1687,7 +1687,7 @@ pyoverkiz==1.13.14
 pyownet==0.10.0.post1
 
 # homeassistant.components.lcn
-pypck==0.7.21
+pypck==0.7.22
 
 # homeassistant.components.pjlink
 pypjlink2==1.2.1

From e80e189e6bbb8679c08d42aa87b06fe3a8e021db Mon Sep 17 00:00:00 2001
From: dontinelli <73341522+dontinelli@users.noreply.github.com>
Date: Fri, 6 Sep 2024 10:23:30 +0200
Subject: [PATCH 14/21] Increase coordinator update_interval for fyta (#125393)

* Increase update_interval

* Update homeassistant/components/fyta/coordinator.py

---------

Co-authored-by: Joost Lekkerkerker <joostlek@outlook.com>
---
 homeassistant/components/fyta/coordinator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/fyta/coordinator.py b/homeassistant/components/fyta/coordinator.py
index c92a96eed63d6..df607de76b087 100644
--- a/homeassistant/components/fyta/coordinator.py
+++ b/homeassistant/components/fyta/coordinator.py
@@ -39,7 +39,7 @@ def __init__(self, hass: HomeAssistant, fyta: FytaConnector) -> None:
             hass,
             _LOGGER,
             name="FYTA Coordinator",
-            update_interval=timedelta(seconds=60),
+            update_interval=timedelta(minutes=4),
         )
         self.fyta = fyta
 

From 973e43ae6abde5a606db7a8824a451169df9ca7e Mon Sep 17 00:00:00 2001
From: Dave Leaver <danzel@localhost.geek.nz>
Date: Fri, 6 Sep 2024 19:06:33 +1200
Subject: [PATCH 15/21] Fix controlling AC temperature in airtouch5 (#125394)

Fix controlling AC temperature
---
 homeassistant/components/airtouch5/climate.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/airtouch5/climate.py b/homeassistant/components/airtouch5/climate.py
index 2d5740b183714..dfc34c1beaf5f 100644
--- a/homeassistant/components/airtouch5/climate.py
+++ b/homeassistant/components/airtouch5/climate.py
@@ -262,7 +262,7 @@ async def async_set_temperature(self, **kwargs: Any) -> None:
             _LOGGER.debug("Argument `temperature` is missing in set_temperature")
             return
 
-        await self._control(temp=temp)
+        await self._control(setpoint=SetpointControl.CHANGE_SETPOINT, temp=temp)
 
 
 class Airtouch5Zone(Airtouch5ClimateEntity):

From a3f42e36ac74869eed819e7b476be1c5fa9e53b5 Mon Sep 17 00:00:00 2001
From: Alexandre TRUPIN <72858385+AlexT59@users.noreply.github.com>
Date: Fri, 6 Sep 2024 16:18:47 +0200
Subject: [PATCH 16/21] Bump sfrbox-api to 0.0.10 (#125405)

* bump sfr_box requirement to 0.0.10

* upate manifest file

* Handle None values

---------

Co-authored-by: epenet <6771947+epenet@users.noreply.github.com>
---
 homeassistant/components/sfr_box/__init__.py  |  3 ++
 .../components/sfr_box/binary_sensor.py       | 14 +++++---
 homeassistant/components/sfr_box/button.py    |  8 +++--
 .../components/sfr_box/config_flow.py         |  4 ++-
 .../components/sfr_box/coordinator.py         |  6 ++--
 .../components/sfr_box/diagnostics.py         | 31 ++++++++----------
 .../components/sfr_box/manifest.json          |  2 +-
 homeassistant/components/sfr_box/sensor.py    | 32 +++++++++++++++----
 requirements_all.txt                          |  2 +-
 requirements_test_all.txt                     |  2 +-
 .../sfr_box/snapshots/test_diagnostics.ambr   |  4 +--
 11 files changed, 68 insertions(+), 40 deletions(-)

diff --git a/homeassistant/components/sfr_box/__init__.py b/homeassistant/components/sfr_box/__init__.py
index dade1af0e52b0..d386c67036536 100644
--- a/homeassistant/components/sfr_box/__init__.py
+++ b/homeassistant/components/sfr_box/__init__.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import asyncio
+from typing import TYPE_CHECKING
 
 from sfrbox_api.bridge import SFRBox
 from sfrbox_api.exceptions import SFRBoxAuthenticationError, SFRBoxError
@@ -46,6 +47,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     # Preload system information
     await data.system.async_config_entry_first_refresh()
     system_info = data.system.data
+    if TYPE_CHECKING:
+        assert system_info is not None
 
     # Preload other coordinators (based on net infrastructure)
     tasks = [data.wan.async_config_entry_first_refresh()]
diff --git a/homeassistant/components/sfr_box/binary_sensor.py b/homeassistant/components/sfr_box/binary_sensor.py
index b299af33513be..4ef5e87761d29 100644
--- a/homeassistant/components/sfr_box/binary_sensor.py
+++ b/homeassistant/components/sfr_box/binary_sensor.py
@@ -4,6 +4,7 @@
 
 from collections.abc import Callable
 from dataclasses import dataclass
+from typing import TYPE_CHECKING
 
 from sfrbox_api.models import DslInfo, FtthInfo, SystemInfo, WanInfo
 
@@ -65,19 +66,22 @@ async def async_setup_entry(
 ) -> None:
     """Set up the sensors."""
     data: DomainData = hass.data[DOMAIN][entry.entry_id]
+    system_info = data.system.data
+    if TYPE_CHECKING:
+        assert system_info is not None
 
     entities: list[SFRBoxBinarySensor] = [
-        SFRBoxBinarySensor(data.wan, description, data.system.data)
+        SFRBoxBinarySensor(data.wan, description, system_info)
         for description in WAN_SENSOR_TYPES
     ]
-    if (net_infra := data.system.data.net_infra) == "adsl":
+    if (net_infra := system_info.net_infra) == "adsl":
         entities.extend(
-            SFRBoxBinarySensor(data.dsl, description, data.system.data)
+            SFRBoxBinarySensor(data.dsl, description, system_info)
             for description in DSL_SENSOR_TYPES
         )
     elif net_infra == "ftth":
         entities.extend(
-            SFRBoxBinarySensor(data.ftth, description, data.system.data)
+            SFRBoxBinarySensor(data.ftth, description, system_info)
             for description in FTTH_SENSOR_TYPES
         )
 
@@ -111,4 +115,6 @@ def __init__(
     @property
     def is_on(self) -> bool | None:
         """Return the native value of the device."""
+        if self.coordinator.data is None:
+            return None
         return self.entity_description.value_fn(self.coordinator.data)
diff --git a/homeassistant/components/sfr_box/button.py b/homeassistant/components/sfr_box/button.py
index f6d3100d692a3..bddb1e8f9263a 100644
--- a/homeassistant/components/sfr_box/button.py
+++ b/homeassistant/components/sfr_box/button.py
@@ -5,7 +5,7 @@
 from collections.abc import Awaitable, Callable, Coroutine
 from dataclasses import dataclass
 from functools import wraps
-from typing import Any, Concatenate
+from typing import TYPE_CHECKING, Any, Concatenate
 
 from sfrbox_api.bridge import SFRBox
 from sfrbox_api.exceptions import SFRBoxError
@@ -69,10 +69,12 @@ async def async_setup_entry(
 ) -> None:
     """Set up the buttons."""
     data: DomainData = hass.data[DOMAIN][entry.entry_id]
+    system_info = data.system.data
+    if TYPE_CHECKING:
+        assert system_info is not None
 
     entities = [
-        SFRBoxButton(data.box, description, data.system.data)
-        for description in BUTTON_TYPES
+        SFRBoxButton(data.box, description, system_info) for description in BUTTON_TYPES
     ]
     async_add_entities(entities)
 
diff --git a/homeassistant/components/sfr_box/config_flow.py b/homeassistant/components/sfr_box/config_flow.py
index f7d72c01ccd88..a4f14e5906973 100644
--- a/homeassistant/components/sfr_box/config_flow.py
+++ b/homeassistant/components/sfr_box/config_flow.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import Mapping
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from sfrbox_api.bridge import SFRBox
 from sfrbox_api.exceptions import SFRBoxAuthenticationError, SFRBoxError
@@ -51,6 +51,8 @@ async def async_step_user(
             except SFRBoxError:
                 errors["base"] = "cannot_connect"
             else:
+                if TYPE_CHECKING:
+                    assert system_info is not None
                 await self.async_set_unique_id(system_info.mac_addr)
                 self._abort_if_unique_id_configured()
                 self._async_abort_entries_match({CONF_HOST: user_input[CONF_HOST]})
diff --git a/homeassistant/components/sfr_box/coordinator.py b/homeassistant/components/sfr_box/coordinator.py
index af3195723f4a6..5877d5a454ab5 100644
--- a/homeassistant/components/sfr_box/coordinator.py
+++ b/homeassistant/components/sfr_box/coordinator.py
@@ -15,7 +15,7 @@
 _SCAN_INTERVAL = timedelta(minutes=1)
 
 
-class SFRDataUpdateCoordinator[_DataT](DataUpdateCoordinator[_DataT]):
+class SFRDataUpdateCoordinator[_DataT](DataUpdateCoordinator[_DataT | None]):
     """Coordinator to manage data updates."""
 
     def __init__(
@@ -23,14 +23,14 @@ def __init__(
         hass: HomeAssistant,
         box: SFRBox,
         name: str,
-        method: Callable[[SFRBox], Coroutine[Any, Any, _DataT]],
+        method: Callable[[SFRBox], Coroutine[Any, Any, _DataT | None]],
     ) -> None:
         """Initialize coordinator."""
         self.box = box
         self._method = method
         super().__init__(hass, _LOGGER, name=name, update_interval=_SCAN_INTERVAL)
 
-    async def _async_update_data(self) -> _DataT:
+    async def _async_update_data(self) -> _DataT | None:
         """Update data."""
         try:
             return await self._method(self.box)
diff --git a/homeassistant/components/sfr_box/diagnostics.py b/homeassistant/components/sfr_box/diagnostics.py
index b5aca834af5ad..0553bfe42331a 100644
--- a/homeassistant/components/sfr_box/diagnostics.py
+++ b/homeassistant/components/sfr_box/diagnostics.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import dataclasses
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.config_entries import ConfigEntry
@@ -12,9 +12,18 @@
 from .const import DOMAIN
 from .models import DomainData
 
+if TYPE_CHECKING:
+    from _typeshed import DataclassInstance
+
 TO_REDACT = {"mac_addr", "serial_number", "ip_addr", "ipv6_addr"}
 
 
+def _async_redact_data(obj: DataclassInstance | None) -> dict[str, Any] | None:
+    if obj is None:
+        return None
+    return async_redact_data(dataclasses.asdict(obj), TO_REDACT)
+
+
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, entry: ConfigEntry
 ) -> dict[str, Any]:
@@ -27,21 +36,9 @@ async def async_get_config_entry_diagnostics(
             "data": dict(entry.data),
         },
         "data": {
-            "dsl": async_redact_data(
-                dataclasses.asdict(await data.system.box.dsl_get_info()),
-                TO_REDACT,
-            ),
-            "ftth": async_redact_data(
-                dataclasses.asdict(await data.system.box.ftth_get_info()),
-                TO_REDACT,
-            ),
-            "system": async_redact_data(
-                dataclasses.asdict(await data.system.box.system_get_info()),
-                TO_REDACT,
-            ),
-            "wan": async_redact_data(
-                dataclasses.asdict(await data.system.box.wan_get_info()),
-                TO_REDACT,
-            ),
+            "dsl": _async_redact_data(await data.system.box.dsl_get_info()),
+            "ftth": _async_redact_data(await data.system.box.ftth_get_info()),
+            "system": _async_redact_data(await data.system.box.system_get_info()),
+            "wan": _async_redact_data(await data.system.box.wan_get_info()),
         },
     }
diff --git a/homeassistant/components/sfr_box/manifest.json b/homeassistant/components/sfr_box/manifest.json
index bf4d91a50f154..cd42997cec5f2 100644
--- a/homeassistant/components/sfr_box/manifest.json
+++ b/homeassistant/components/sfr_box/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/sfr_box",
   "integration_type": "device",
   "iot_class": "local_polling",
-  "requirements": ["sfrbox-api==0.0.8"]
+  "requirements": ["sfrbox-api==0.0.10"]
 }
diff --git a/homeassistant/components/sfr_box/sensor.py b/homeassistant/components/sfr_box/sensor.py
index d19ff82b39389..ee3285a8f3813 100644
--- a/homeassistant/components/sfr_box/sensor.py
+++ b/homeassistant/components/sfr_box/sensor.py
@@ -2,6 +2,7 @@
 
 from collections.abc import Callable
 from dataclasses import dataclass
+from typing import TYPE_CHECKING
 
 from sfrbox_api.models import DslInfo, SystemInfo, WanInfo
 
@@ -129,7 +130,7 @@ class SFRBoxSensorEntityDescription[_T](SensorEntityDescription):
             "unknown",
         ],
         translation_key="dsl_line_status",
-        value_fn=lambda x: x.line_status.lower().replace(" ", "_"),
+        value_fn=lambda x: _value_to_option(x.line_status),
     ),
     SFRBoxSensorEntityDescription[DslInfo](
         key="training",
@@ -149,7 +150,7 @@ class SFRBoxSensorEntityDescription[_T](SensorEntityDescription):
             "unknown",
         ],
         translation_key="dsl_training",
-        value_fn=lambda x: x.training.lower().replace(" ", "_").replace(".", "_"),
+        value_fn=lambda x: _value_to_option(x.training),
     ),
 )
 SYSTEM_SENSOR_TYPES: tuple[SFRBoxSensorEntityDescription[SystemInfo], ...] = (
@@ -181,7 +182,7 @@ class SFRBoxSensorEntityDescription[_T](SensorEntityDescription):
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        value_fn=lambda x: None if x.temperature is None else x.temperature / 1000,
+        value_fn=lambda x: _get_temperature(x.temperature),
     ),
 )
 WAN_SENSOR_TYPES: tuple[SFRBoxSensorEntityDescription[WanInfo], ...] = (
@@ -203,23 +204,38 @@ class SFRBoxSensorEntityDescription[_T](SensorEntityDescription):
 )
 
 
+def _value_to_option(value: str | None) -> str | None:
+    if value is None:
+        return value
+    return value.lower().replace(" ", "_").replace(".", "_")
+
+
+def _get_temperature(value: float | None) -> float | None:
+    if value is None or value < 1000:
+        return value
+    return value / 1000
+
+
 async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Set up the sensors."""
     data: DomainData = hass.data[DOMAIN][entry.entry_id]
+    system_info = data.system.data
+    if TYPE_CHECKING:
+        assert system_info is not None
 
     entities: list[SFRBoxSensor] = [
-        SFRBoxSensor(data.system, description, data.system.data)
+        SFRBoxSensor(data.system, description, system_info)
         for description in SYSTEM_SENSOR_TYPES
     ]
     entities.extend(
-        SFRBoxSensor(data.wan, description, data.system.data)
+        SFRBoxSensor(data.wan, description, system_info)
         for description in WAN_SENSOR_TYPES
     )
-    if data.system.data.net_infra == "adsl":
+    if system_info.net_infra == "adsl":
         entities.extend(
-            SFRBoxSensor(data.dsl, description, data.system.data)
+            SFRBoxSensor(data.dsl, description, system_info)
             for description in DSL_SENSOR_TYPES
         )
 
@@ -251,4 +267,6 @@ def __init__(
     @property
     def native_value(self) -> StateType:
         """Return the native value of the device."""
+        if self.coordinator.data is None:
+            return None
         return self.entity_description.value_fn(self.coordinator.data)
diff --git a/requirements_all.txt b/requirements_all.txt
index e86c21d012416..d2f60f1a0bfbf 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -2595,7 +2595,7 @@ sensorpush-ble==1.6.2
 sentry-sdk==1.40.3
 
 # homeassistant.components.sfr_box
-sfrbox-api==0.0.8
+sfrbox-api==0.0.10
 
 # homeassistant.components.sharkiq
 sharkiq==1.0.2
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 8bb92e7d2e8e6..95919b5d9c93e 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -2053,7 +2053,7 @@ sensorpush-ble==1.6.2
 sentry-sdk==1.40.3
 
 # homeassistant.components.sfr_box
-sfrbox-api==0.0.8
+sfrbox-api==0.0.10
 
 # homeassistant.components.sharkiq
 sharkiq==1.0.2
diff --git a/tests/components/sfr_box/snapshots/test_diagnostics.ambr b/tests/components/sfr_box/snapshots/test_diagnostics.ambr
index 22a914f8a79d4..69139c2c37499 100644
--- a/tests/components/sfr_box/snapshots/test_diagnostics.ambr
+++ b/tests/components/sfr_box/snapshots/test_diagnostics.ambr
@@ -31,7 +31,7 @@
         'product_id': 'NB6VAC-FXC-r0',
         'refclient': '',
         'serial_number': '**REDACTED**',
-        'temperature': 27560,
+        'temperature': 27560.0,
         'uptime': 2353575,
         'version_bootloader': 'NB6VAC-BOOTLOADER-R4.0.8',
         'version_dsldriver': 'NB6VAC-XDSL-A2pv6F039p',
@@ -90,7 +90,7 @@
         'product_id': 'NB6VAC-FXC-r0',
         'refclient': '',
         'serial_number': '**REDACTED**',
-        'temperature': 27560,
+        'temperature': 27560.0,
         'uptime': 2353575,
         'version_bootloader': 'NB6VAC-BOOTLOADER-R4.0.8',
         'version_dsldriver': 'NB6VAC-XDSL-A2pv6F039p',

From 0b95cf125137edb32c7770da3ec2c5afacdf9d69 Mon Sep 17 00:00:00 2001
From: TimL <tl@smlight.tech>
Date: Fri, 6 Sep 2024 23:46:08 +1000
Subject: [PATCH 17/21] Improve handling of old firmware versions (#125406)

* Update Info fixture with new fields from pysmlight 0.0.14

* Create repair if device is running unsupported firmware

* Add test for legacy firmware info

* Add strings for repair issue
---
 .../components/smlight/coordinator.py         | 22 +++++++++++-
 homeassistant/components/smlight/strings.json |  6 ++++
 tests/components/smlight/fixtures/info.json   |  4 ++-
 .../smlight/snapshots/test_init.ambr          |  2 +-
 tests/components/smlight/test_init.py         | 36 +++++++++++++++++--
 5 files changed, 65 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/smlight/coordinator.py b/homeassistant/components/smlight/coordinator.py
index 6a29f14fafdfb..2c8f09766e7b1 100644
--- a/homeassistant/components/smlight/coordinator.py
+++ b/homeassistant/components/smlight/coordinator.py
@@ -9,8 +9,10 @@
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryError
+from homeassistant.helpers import issue_registry as ir
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.device_registry import format_mac
+from homeassistant.helpers.issue_registry import IssueSeverity
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DOMAIN, LOGGER, SCAN_INTERVAL
@@ -40,6 +42,7 @@ def __init__(self, hass: HomeAssistant, host: str) -> None:
 
         self.unique_id: str | None = None
         self.client = Api2(host=host, session=async_get_clientsession(hass))
+        self.legacy_api: int = 0
 
     async def _async_setup(self) -> None:
         """Authenticate if needed during initial setup."""
@@ -60,11 +63,28 @@ async def _async_setup(self) -> None:
         info = await self.client.get_info()
         self.unique_id = format_mac(info.MAC)
 
+        if info.legacy_api:
+            self.legacy_api = info.legacy_api
+            ir.async_create_issue(
+                self.hass,
+                DOMAIN,
+                "unsupported_firmware",
+                is_fixable=False,
+                is_persistent=False,
+                learn_more_url="https://smlight.tech/flasher/#SLZB-06",
+                severity=IssueSeverity.ERROR,
+                translation_key="unsupported_firmware",
+            )
+
     async def _async_update_data(self) -> SmData:
         """Fetch data from the SMLIGHT device."""
         try:
+            sensors = Sensors()
+            if not self.legacy_api:
+                sensors = await self.client.get_sensors()
+
             return SmData(
-                sensors=await self.client.get_sensors(),
+                sensors=sensors,
                 info=await self.client.get_info(),
             )
         except SmlightConnectionError as err:
diff --git a/homeassistant/components/smlight/strings.json b/homeassistant/components/smlight/strings.json
index 02b9ebcc4e81b..abe88caff850c 100644
--- a/homeassistant/components/smlight/strings.json
+++ b/homeassistant/components/smlight/strings.json
@@ -45,5 +45,11 @@
         "name": "RAM usage"
       }
     }
+  },
+  "issues": {
+    "unsupported_firmware": {
+      "title": "SLZB core firmware update required",
+      "description": "Your SMLIGHT SLZB-06x device is running an unsupported core firmware version. Please update it to the latest version to enjoy all the features of this integration."
+    }
   }
 }
diff --git a/tests/components/smlight/fixtures/info.json b/tests/components/smlight/fixtures/info.json
index 72bb7c1ed9b6c..070232512f338 100644
--- a/tests/components/smlight/fixtures/info.json
+++ b/tests/components/smlight/fixtures/info.json
@@ -3,10 +3,12 @@
   "device_ip": "192.168.1.161",
   "fs_total": 3456,
   "fw_channel": "dev",
+  "legacy_api": 0,
+  "hostname": "SLZB-06p7",
   "MAC": "AA:BB:CC:DD:EE:FF",
   "model": "SLZB-06p7",
   "ram_total": 296,
-  "sw_version": "v2.3.1.dev",
+  "sw_version": "v2.3.6",
   "wifi_mode": 0,
   "zb_flash_size": 704,
   "zb_hw": "CC2652P7",
diff --git a/tests/components/smlight/snapshots/test_init.ambr b/tests/components/smlight/snapshots/test_init.ambr
index 528a7b7b340f6..bb6a6c50f9b59 100644
--- a/tests/components/smlight/snapshots/test_init.ambr
+++ b/tests/components/smlight/snapshots/test_init.ambr
@@ -27,7 +27,7 @@
     'primary_config_entry': <ANY>,
     'serial_number': None,
     'suggested_area': None,
-    'sw_version': 'core: v2.3.1.dev / zigbee: -1',
+    'sw_version': 'core: v2.3.6 / zigbee: -1',
     'via_device_id': None,
   })
 # ---
diff --git a/tests/components/smlight/test_init.py b/tests/components/smlight/test_init.py
index 682993cb9430e..d4b4b30d4655a 100644
--- a/tests/components/smlight/test_init.py
+++ b/tests/components/smlight/test_init.py
@@ -3,15 +3,17 @@
 from unittest.mock import MagicMock
 
 from freezegun.api import FrozenDateTimeFactory
-from pysmlight.exceptions import SmlightAuthError, SmlightConnectionError
+from pysmlight import Info
+from pysmlight.exceptions import SmlightAuthError, SmlightConnectionError, SmlightError
 import pytest
 from syrupy.assertion import SnapshotAssertion
 
-from homeassistant.components.smlight.const import SCAN_INTERVAL
+from homeassistant.components.smlight.const import DOMAIN, SCAN_INTERVAL
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers.issue_registry import IssueRegistry
 
 from .conftest import setup_integration
 
@@ -92,3 +94,33 @@ async def test_device_info(
     )
     assert device_entry is not None
     assert device_entry == snapshot
+
+
+async def test_device_legacy_firmware(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_smlight_client: MagicMock,
+    device_registry: dr.DeviceRegistry,
+    issue_registry: IssueRegistry,
+) -> None:
+    """Test device setup for old firmware version that dont support required API."""
+    LEGACY_VERSION = "v2.3.1"
+    mock_smlight_client.get_sensors.side_effect = SmlightError
+    mock_smlight_client.get_info.return_value = Info(
+        legacy_api=1, sw_version=LEGACY_VERSION, MAC="AA:BB:CC:DD:EE:FF"
+    )
+    entry = await setup_integration(hass, mock_config_entry)
+
+    assert entry.unique_id == "aa:bb:cc:dd:ee:ff"
+
+    device_entry = device_registry.async_get_device(
+        connections={(dr.CONNECTION_NETWORK_MAC, entry.unique_id)}
+    )
+    assert LEGACY_VERSION in device_entry.sw_version
+
+    issue = issue_registry.async_get_issue(
+        domain=DOMAIN, issue_id="unsupported_firmware"
+    )
+    assert issue is not None
+    assert issue.domain == DOMAIN
+    assert issue.issue_id == "unsupported_firmware"

From 5cf89bf2bbbae1790d710dabb30b6acff2a97e38 Mon Sep 17 00:00:00 2001
From: Marlon <git@mawoka.eu>
Date: Fri, 6 Sep 2024 16:52:32 +0200
Subject: [PATCH 18/21] Set min_power similar to max_power to support all
 inverters from apsystems (#124247)

Set min_power similar to max_power to support all inverters from apsystems ez1 series
---
 homeassistant/components/apsystems/coordinator.py | 5 +++--
 homeassistant/components/apsystems/number.py      | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/apsystems/coordinator.py b/homeassistant/components/apsystems/coordinator.py
index 6ba4f01dbc8e2..b6e951343f7ef 100644
--- a/homeassistant/components/apsystems/coordinator.py
+++ b/homeassistant/components/apsystems/coordinator.py
@@ -36,10 +36,11 @@ def __init__(self, hass: HomeAssistant, api: APsystemsEZ1M) -> None:
 
     async def _async_setup(self) -> None:
         try:
-            max_power = (await self.api.get_device_info()).maxPower
+            device_info = await self.api.get_device_info()
         except (ConnectionError, TimeoutError):
             raise UpdateFailed from None
-        self.api.max_power = max_power
+        self.api.max_power = device_info.maxPower
+        self.api.min_power = device_info.minPower
 
     async def _async_update_data(self) -> ApSystemsSensorData:
         output_data = await self.api.get_output_data()
diff --git a/homeassistant/components/apsystems/number.py b/homeassistant/components/apsystems/number.py
index 51e7130587ff7..01e991f5188a2 100644
--- a/homeassistant/components/apsystems/number.py
+++ b/homeassistant/components/apsystems/number.py
@@ -26,7 +26,6 @@ async def async_setup_entry(
 class ApSystemsMaxOutputNumber(ApSystemsEntity, NumberEntity):
     """Base sensor to be used with description."""
 
-    _attr_native_min_value = 30
     _attr_native_step = 1
     _attr_device_class = NumberDeviceClass.POWER
     _attr_mode = NumberMode.BOX
@@ -42,6 +41,7 @@ def __init__(
         self._api = data.coordinator.api
         self._attr_unique_id = f"{data.device_id}_output_limit"
         self._attr_native_max_value = data.coordinator.api.max_power
+        self._attr_native_min_value = data.coordinator.api.min_power
 
     async def async_update(self) -> None:
         """Set the state with the value fetched from the inverter."""

From 1c7c6d6592d62280f08f20ba386372b8a0f96178 Mon Sep 17 00:00:00 2001
From: Paul Bottein <paul.bottein@gmail.com>
Date: Fri, 6 Sep 2024 14:49:58 +0200
Subject: [PATCH 19/21] Update frontend to 20240906.0 (#125409)

---
 homeassistant/components/frontend/manifest.json | 2 +-
 homeassistant/package_constraints.txt           | 2 +-
 requirements_all.txt                            | 2 +-
 requirements_test_all.txt                       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/homeassistant/components/frontend/manifest.json b/homeassistant/components/frontend/manifest.json
index fbdafe6025d18..e40832e47330e 100644
--- a/homeassistant/components/frontend/manifest.json
+++ b/homeassistant/components/frontend/manifest.json
@@ -20,5 +20,5 @@
   "documentation": "https://www.home-assistant.io/integrations/frontend",
   "integration_type": "system",
   "quality_scale": "internal",
-  "requirements": ["home-assistant-frontend==20240904.0"]
+  "requirements": ["home-assistant-frontend==20240906.0"]
 }
diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index fd878c1ffcfcf..1b9b4fa9ebf4c 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -31,7 +31,7 @@ habluetooth==3.4.0
 hass-nabucasa==0.81.1
 hassil==1.7.4
 home-assistant-bluetooth==1.12.2
-home-assistant-frontend==20240904.0
+home-assistant-frontend==20240906.0
 home-assistant-intents==2024.9.4
 httpx==0.27.0
 ifaddr==0.2.0
diff --git a/requirements_all.txt b/requirements_all.txt
index d2f60f1a0bfbf..a8977d706de20 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1102,7 +1102,7 @@ hole==0.8.0
 holidays==0.56
 
 # homeassistant.components.frontend
-home-assistant-frontend==20240904.0
+home-assistant-frontend==20240906.0
 
 # homeassistant.components.conversation
 home-assistant-intents==2024.9.4
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 95919b5d9c93e..5bee8d3c0e551 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -925,7 +925,7 @@ hole==0.8.0
 holidays==0.56
 
 # homeassistant.components.frontend
-home-assistant-frontend==20240904.0
+home-assistant-frontend==20240906.0
 
 # homeassistant.components.conversation
 home-assistant-intents==2024.9.4

From b50d8fca16d4dae8d017d5b1a11c8af360dcc621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20St=C3=A5hl?= <pierre.staahl@gmail.com>
Date: Fri, 6 Sep 2024 15:43:16 +0200
Subject: [PATCH 20/21] Bump pyatv to 0.15.1 (#125412)

---
 homeassistant/components/apple_tv/manifest.json | 2 +-
 requirements_all.txt                            | 2 +-
 requirements_test_all.txt                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/apple_tv/manifest.json b/homeassistant/components/apple_tv/manifest.json
index 9a05382951649..b4e1b3548783c 100644
--- a/homeassistant/components/apple_tv/manifest.json
+++ b/homeassistant/components/apple_tv/manifest.json
@@ -7,7 +7,7 @@
   "documentation": "https://www.home-assistant.io/integrations/apple_tv",
   "iot_class": "local_push",
   "loggers": ["pyatv", "srptools"],
-  "requirements": ["pyatv==0.15.0"],
+  "requirements": ["pyatv==0.15.1"],
   "zeroconf": [
     "_mediaremotetv._tcp.local.",
     "_companion-link._tcp.local.",
diff --git a/requirements_all.txt b/requirements_all.txt
index a8977d706de20..ca4610d1ec2d2 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1744,7 +1744,7 @@ pyatag==0.3.5.3
 pyatmo==8.1.0
 
 # homeassistant.components.apple_tv
-pyatv==0.15.0
+pyatv==0.15.1
 
 # homeassistant.components.aussie_broadband
 pyaussiebb==0.0.15
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 5bee8d3c0e551..b80096cda5467 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -1412,7 +1412,7 @@ pyatag==0.3.5.3
 pyatmo==8.1.0
 
 # homeassistant.components.apple_tv
-pyatv==0.15.0
+pyatv==0.15.1
 
 # homeassistant.components.aussie_broadband
 pyaussiebb==0.0.15

From ed2d321746eeb80ad3e3c03a5dba933e41020f07 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Fri, 6 Sep 2024 14:57:08 +0000
Subject: [PATCH 21/21] Bump version to 2024.9.1

---
 homeassistant/const.py | 2 +-
 pyproject.toml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index 5c61650ec32a3..49f4914e4b989 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -24,7 +24,7 @@
 APPLICATION_NAME: Final = "HomeAssistant"
 MAJOR_VERSION: Final = 2024
 MINOR_VERSION: Final = 9
-PATCH_VERSION: Final = "0"
+PATCH_VERSION: Final = "1"
 __short_version__: Final = f"{MAJOR_VERSION}.{MINOR_VERSION}"
 __version__: Final = f"{__short_version__}.{PATCH_VERSION}"
 REQUIRED_PYTHON_VER: Final[tuple[int, int, int]] = (3, 12, 0)
diff --git a/pyproject.toml b/pyproject.toml
index 9a935b3a5fed2..0af28ce0fe8c1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name        = "homeassistant"
-version     = "2024.9.0"
+version     = "2024.9.1"
 license     = {text = "Apache-2.0"}
 description = "Open-source home automation platform running on Python 3."
 readme      = "README.rst"