[pull] dev from home-assistant:dev

homeassistant/components/asuswrt/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["aioasuswrt", "asusrouter", "asyncssh"],
-  "requirements": ["aioasuswrt==1.4.0", "asusrouter==1.20.1"]
+  "requirements": ["aioasuswrt==1.4.0", "asusrouter==1.21.0"]
 }

homeassistant/components/cloud/manifest.json

@@ -13,6 +13,6 @@
   "integration_type": "system",
   "iot_class": "cloud_push",
   "loggers": ["acme", "hass_nabucasa", "snitun"],
-  "requirements": ["hass-nabucasa==1.0.0"],
+  "requirements": ["hass-nabucasa==1.1.0"],
   "single_config_entry": true
 }

homeassistant/components/deconz/entity.py

@@ -177,7 +177,7 @@ def device_info(self) -> DeviceInfo:
         """Return a device description for device registry."""
         return DeviceInfo(
             identifiers={(DOMAIN, self._group_identifier)},
-            manufacturer="Dresden Elektronik",
+            manufacturer="dresden elektronik",
             model="deCONZ group",
             name=self.group.name,
             via_device=(DOMAIN, self.hub.api.config.bridge_id),

homeassistant/components/deconz/hub/hub.py

@@ -14,7 +14,6 @@
 from homeassistant.config_entries import SOURCE_HASSIO
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 
 from ..const import CONF_MASTER_GATEWAY, DOMAIN, HASSIO_CONFIGURATION_URL, PLATFORMS
@@ -169,17 +168,8 @@ def async_connection_status_callback(self, available: bool) -> None:
 
     async def async_update_device_registry(self) -> None:
         """Update device registry."""
-        if self.api.config.mac is None:
-            return
-
         device_registry = dr.async_get(self.hass)
 
-        # Host device
-        device_registry.async_get_or_create(
-            config_entry_id=self.config_entry.entry_id,
-            connections={(CONNECTION_NETWORK_MAC, self.api.config.mac)},
-        )
-
         # Gateway service
         configuration_url = f"http://{self.config.host}:{self.config.port}"
         if self.config_entry.source == SOURCE_HASSIO:
@@ -189,11 +179,10 @@ async def async_update_device_registry(self) -> None:
             configuration_url=configuration_url,
             entry_type=dr.DeviceEntryType.SERVICE,
             identifiers={(DOMAIN, self.api.config.bridge_id)},
-            manufacturer="Dresden Elektronik",
+            manufacturer="dresden elektronik",
             model=self.api.config.model_id,
             name=self.api.config.name,
             sw_version=self.api.config.software_version,
-            via_device=(CONNECTION_NETWORK_MAC, self.api.config.mac),
         )
 
     @staticmethod

homeassistant/components/deconz/light.py

@@ -396,7 +396,7 @@ def device_info(self) -> DeviceInfo:
         """Return a device description for device registry."""
         return DeviceInfo(
             identifiers={(DOMAIN, self.unique_id)},
-            manufacturer="Dresden Elektronik",
+            manufacturer="dresden elektronik",
             model="deCONZ group",
             name=self._device.name,
             via_device=(DOMAIN, self.hub.api.config.bridge_id),

homeassistant/components/deconz/services.py

@@ -11,7 +11,6 @@
     device_registry as dr,
     entity_registry as er,
 )
-from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
 from homeassistant.util.read_only_dict import ReadOnlyDict
 
 from .const import CONF_BRIDGE_ID, DOMAIN, LOGGER
@@ -120,8 +119,8 @@ async def async_configure_service(hub: DeconzHub, data: ReadOnlyDict) -> None:
         "field": "/lights/1/state",
         "data": {"on": true}
     }
-    See Dresden Elektroniks REST API documentation for details:
-    http://dresden-elektronik.github.io/deconz-rest-doc/rest/
+    See deCONZ REST-API documentation for details:
+    https://dresden-elektronik.github.io/deconz-rest-doc/
     """
     field = data.get(SERVICE_FIELD, "")
     entity_id = data.get(SERVICE_ENTITY)
@@ -162,14 +161,6 @@ async def async_remove_orphaned_entries_service(hub: DeconzHub) -> None:
         )
     ]
 
-    # Don't remove the Gateway host entry
-    if hub.api.config.mac:
-        hub_host = device_registry.async_get_device(
-            connections={(CONNECTION_NETWORK_MAC, hub.api.config.mac)},
-        )
-        if hub_host and hub_host.id in devices_to_be_removed:
-            devices_to_be_removed.remove(hub_host.id)
-
     # Don't remove the Gateway service entry
     hub_service = device_registry.async_get_device(
         identifiers={(DOMAIN, hub.api.config.bridge_id)}

homeassistant/components/ecowitt/manifest.json

@@ -6,5 +6,5 @@
   "dependencies": ["webhook"],
   "documentation": "https://www.home-assistant.io/integrations/ecowitt",
   "iot_class": "local_push",
-  "requirements": ["aioecowitt==2025.3.1"]
+  "requirements": ["aioecowitt==2025.9.0"]
 }

homeassistant/components/flo/coordinator.py

@@ -190,7 +190,7 @@ def has_alerts(self) -> bool:
         return bool(
             self.pending_info_alerts_count
             or self.pending_warning_alerts_count
-            or self.pending_warning_alerts_count
+            or self.pending_critical_alerts_count
         )
 
     @property

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==20250902.1"]
+  "requirements": ["home-assistant-frontend==20250903.2"]
 }

homeassistant/components/growatt_server/strings.json

@@ -86,7 +86,7 @@
         "name": "Inverter temperature"
       },
       "mix_statement_of_charge": {
-        "name": "Statement of charge"
+        "name": "State of charge"
       },
       "mix_battery_charge_today": {
         "name": "Battery charged today"
@@ -425,7 +425,7 @@
         "name": "Lifetime total load consumption"
       },
       "tlx_statement_of_charge": {
-        "name": "Statement of charge (SoC)"
+        "name": "State of charge (SoC)"
       },
       "total_money_today": {
         "name": "Total money today"

homeassistant/components/modbus/binary_sensor.py

@@ -157,5 +157,8 @@ async def async_added_to_hass(self) -> None:
     def _handle_coordinator_update(self) -> None:
         """Handle updated data from the coordinator."""
         result = self.coordinator.data
-        self._attr_is_on = bool(result[self._result_inx] & 1) if result else None
+        if not result or self._result_inx >= len(result):
+            self._attr_is_on = None
+        else:
+            self._attr_is_on = bool(result[self._result_inx] & 1)
         super()._handle_coordinator_update()

homeassistant/components/modbus/climate.py

@@ -363,7 +363,7 @@ async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
                         )
                     break
 
-        await self._async_update_write_state()
+        await self.async_local_update(cancel_pending_update=True)
 
     async def async_set_fan_mode(self, fan_mode: str) -> None:
         """Set new target fan mode."""
@@ -385,7 +385,7 @@ async def async_set_fan_mode(self, fan_mode: str) -> None:
                     CALL_TYPE_WRITE_REGISTER,
                 )
 
-        await self._async_update_write_state()
+        await self.async_local_update(cancel_pending_update=True)
 
     async def async_set_swing_mode(self, swing_mode: str) -> None:
         """Set new target swing mode."""
@@ -408,7 +408,7 @@ async def async_set_swing_mode(self, swing_mode: str) -> None:
                             CALL_TYPE_WRITE_REGISTER,
                         )
                     break
-        await self._async_update_write_state()
+        await self.async_local_update(cancel_pending_update=True)
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
@@ -463,7 +463,7 @@ async def async_set_temperature(self, **kwargs: Any) -> None:
                 CALL_TYPE_WRITE_REGISTERS,
             )
         self._attr_available = result is not None
-        await self._async_update_write_state()
+        await self.async_local_update(cancel_pending_update=True)
 
     async def _async_update(self) -> None:
         """Update Target & Current Temperature."""

homeassistant/components/modbus/cover.py

@@ -111,15 +111,15 @@ async def async_open_cover(self, **kwargs: Any) -> None:
             self._slave, self._write_address, self._state_open, self._write_type
         )
         self._attr_available = result is not None
-        await self._async_update_write_state()
+        await self.async_local_update(cancel_pending_update=True)
 
     async def async_close_cover(self, **kwargs: Any) -> None:
         """Close cover."""
         result = await self._hub.async_pb_call(
             self._slave, self._write_address, self._state_closed, self._write_type
         )
         self._attr_available = result is not None
-        await self._async_update_write_state()
+        await self.async_local_update(cancel_pending_update=True)
 
     async def _async_update(self) -> None:
         """Update the state of the cover."""

homeassistant/components/modbus/entity.py

@@ -112,14 +112,16 @@ def get_optional_numeric_config(config_name: str) -> int | float | None:
     async def _async_update(self) -> None:
         """Virtual function to be overwritten."""
 
-    async def async_update(self) -> None:
+    async def async_update(self, now: datetime | None = None) -> None:
         """Update the entity state."""
-        if self._cancel_call:
-            self._cancel_call()
-        await self.async_local_update()
+        await self.async_local_update(cancel_pending_update=True)
 
-    async def async_local_update(self, now: datetime | None = None) -> None:
+    async def async_local_update(
+        self, now: datetime | None = None, cancel_pending_update: bool = False
+    ) -> None:
         """Update the entity state."""
+        if cancel_pending_update and self._cancel_call:
+            self._cancel_call()
         await self._async_update()
         self.async_write_ha_state()
         if self._scan_interval > 0:
@@ -131,62 +133,22 @@ async def async_local_update(self, now: datetime | None = None) -> None:
 
     async def async_will_remove_from_hass(self) -> None:
         """Remove entity from hass."""
-        _LOGGER.debug(f"Removing entity {self._attr_name}")
-        if self._cancel_call:
-            self._cancel_call()
-            self._cancel_call = None
+        self.async_disable()
 
     @callback
-    def async_hold(self) -> None:
+    def async_disable(self) -> None:
         """Remote stop entity."""
-        _LOGGER.debug(f"hold entity {self._attr_name}")
-        self._async_cancel_future_pending_update()
-        self._attr_available = False
-        self.async_write_ha_state()
-
-    async def _async_update_write_state(self) -> None:
-        """Update the entity state and write it to the state machine."""
+        _LOGGER.info(f"hold entity {self._attr_name}")
         if self._cancel_call:
             self._cancel_call()
             self._cancel_call = None
-        await self.async_local_update()
-
-    async def _async_update_if_not_in_progress(
-        self, now: datetime | None = None
-    ) -> None:
-        """Update the entity state if not already in progress."""
-        await self._async_update_write_state()
-
-    @callback
-    def async_run(self) -> None:
-        """Remote start entity."""
-        _LOGGER.info(f"start entity {self._attr_name}")
-        self._async_schedule_future_update(0.1)
-        self._cancel_call = async_call_later(
-            self.hass, timedelta(seconds=0.1), self.async_local_update
-        )
-        self._attr_available = True
+        self._attr_available = False
         self.async_write_ha_state()
 
-    @callback
-    def _async_schedule_future_update(self, delay: float) -> None:
-        """Schedule an update in the future."""
-        self._async_cancel_future_pending_update()
-        self._cancel_call = async_call_later(
-            self.hass, delay, self._async_update_if_not_in_progress
-        )
-
-    @callback
-    def _async_cancel_future_pending_update(self) -> None:
-        """Cancel a future pending update."""
-        if self._cancel_call:
-            self._cancel_call()
-            self._cancel_call = None
-
     async def async_await_connection(self, _now: Any) -> None:
         """Wait for first connect."""
         await self._hub.event_connected.wait()
-        self.async_run()
+        await self.async_local_update(cancel_pending_update=True)
 
     async def async_base_added_to_hass(self) -> None:
         """Handle entity which will be added."""
@@ -198,10 +160,12 @@ async def async_base_added_to_hass(self) -> None:
             )
         )
         self.async_on_remove(
-            async_dispatcher_connect(self.hass, SIGNAL_STOP_ENTITY, self.async_hold)
+            async_dispatcher_connect(self.hass, SIGNAL_STOP_ENTITY, self.async_disable)
         )
         self.async_on_remove(
-            async_dispatcher_connect(self.hass, SIGNAL_START_ENTITY, self.async_run)
+            async_dispatcher_connect(
+                self.hass, SIGNAL_START_ENTITY, self.async_local_update
+            )
         )
 
 
@@ -388,10 +352,15 @@ async def async_turn(self, command: int) -> None:
             return
 
         if self._verify_delay:
-            self._async_schedule_future_update(self._verify_delay)
+            assert self._verify_delay == 1
+            if self._cancel_call:
+                self._cancel_call()
+                self._cancel_call = None
+            self._cancel_call = async_call_later(
+                self.hass, self._verify_delay, self.async_update
+            )
             return
-
-        await self._async_update_write_state()
+        await self.async_local_update(cancel_pending_update=True)
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Set switch off."""

homeassistant/components/modbus/modbus.py

@@ -312,15 +312,14 @@ def _log_error(self, text: str) -> None:
     async def async_pb_connect(self) -> None:
         """Connect to device, async."""
         while True:
-            async with self._lock:
-                try:
-                    if await self._client.connect():  # type: ignore[union-attr]
-                        _LOGGER.info(f"modbus {self.name} communication open")
-                        break
-                except ModbusException as exception_error:
-                    self._log_error(
-                        f"{self.name} connect failed, please check your configuration ({exception_error!s})"
-                    )
+            try:
+                if await self._client.connect():  # type: ignore[union-attr]
+                    _LOGGER.info(f"modbus {self.name} communication open")
+                    break
+            except ModbusException as exception_error:
+                self._log_error(
+                    f"{self.name} connect failed, please check your configuration ({exception_error!s})"
+                )
             _LOGGER.info(
                 f"modbus {self.name} connect NOT a success ! retrying in {PRIMARY_RECONNECT_DELAY} seconds"
             )

homeassistant/components/modbus/sensor.py

@@ -181,6 +181,10 @@ async def async_added_to_hass(self) -> None:
     def _handle_coordinator_update(self) -> None:
         """Handle updated data from the coordinator."""
         result = self.coordinator.data
-        self._attr_native_value = result[self._idx] if result else None
-        self._attr_available = result is not None
+        if not result or self._idx >= len(result):
+            self._attr_native_value = None
+            self._attr_available = False
+        else:
+            self._attr_native_value = result[self._idx]
+            self._attr_available = True
         super()._handle_coordinator_update()

homeassistant/components/template/config_flow.py

@@ -514,7 +514,7 @@ async def _validate_user_input(
 ]
 
 CONFIG_FLOW = {
-    "user": SchemaFlowMenuStep(TEMPLATE_TYPES),
+    "user": SchemaFlowMenuStep(TEMPLATE_TYPES, True),
     Platform.ALARM_CONTROL_PANEL: SchemaFlowFormStep(
         config_schema(Platform.ALARM_CONTROL_PANEL),
         preview="template",