Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions homeassistant/components/asuswrt/bridge.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
from __future__ import annotations

from abc import ABC, abstractmethod
from collections import namedtuple
from collections.abc import Awaitable, Callable, Coroutine
import functools
import logging
from typing import Any
from typing import Any, NamedTuple

from aioasuswrt.asuswrt import AsusWrt as AsusWrtLegacy
from aiohttp import ClientSession
Expand Down Expand Up @@ -61,7 +60,14 @@
SENSORS_TYPE_TEMPERATURES = "sensors_temperatures"
SENSORS_TYPE_UPTIME = "sensors_uptime"

WrtDevice = namedtuple("WrtDevice", ["ip", "name", "connected_to"]) # noqa: PYI024

class WrtDevice(NamedTuple):
"""WrtDevice structure."""

ip: str | None
name: str | None
conneted_to: str | None


_LOGGER = logging.getLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/foscam/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"documentation": "https://www.home-assistant.io/integrations/foscam",
"iot_class": "local_polling",
"loggers": ["libpyfoscamcgi"],
"requirements": ["libpyfoscamcgi==0.0.7"]
"requirements": ["libpyfoscamcgi==0.0.8"]
}
2 changes: 1 addition & 1 deletion homeassistant/components/mqtt/strings.json
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@
"state_topic": "The MQTT topic subscribed to receive {platform} state values. [Learn more.]({url}#state_topic)",
"step": "Step value. Smallest value 0.001.",
"support_duration": "The siren supports setting a duration in second. The `duration` variable will become available for use in the \"Command template\" setting. [Learn more.]({url}#support_duration)",
"support_volume_set": "The siren supports setting a volume. The `tone` variable will become available for use in the \"Command template\" setting. [Learn more.]({url}#support_volume_set)",
"support_volume_set": "The siren supports setting a volume. The `volume_level` variable will become available for use in the \"Command template\" setting. [Learn more.]({url}#support_volume_set)",
"supported_color_modes": "A list of color modes supported by the light. Possible color modes are On/Off, Brightness, Color temperature, HS, XY, RGB, RGBW, RGBWW, White. Note that if On/Off or Brightness are used, that must be the only value in the list. [Learn more.]({url}#supported_color_modes)",
"url_template": "[Template](https://www.home-assistant.io/docs/configuration/templating/#using-value-templates-with-mqtt) to extract an URL from the received URL topic payload value. [Learn more.]({url}#url_template)",
"url_topic": "The MQTT topic subscribed to receive messages containing the image URL. [Learn more.]({url}#url_topic)",
Expand Down
1 change: 1 addition & 0 deletions homeassistant/components/onewire/const.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
DEVICE_KEYS_A_D = ("A", "B", "C", "D")

DEVICE_SUPPORT = {
"01": (),
"05": (),
"10": (),
"12": (),
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/onewire/onewirehub.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ async def _discover_devices(
device_info = DeviceInfo(
identifiers={(DOMAIN, device_id)},
manufacturer=DEVICE_MANUFACTURER.get(device_family, MANUFACTURER_MAXIM),
model=device_type,
model=None, # cleanup from #135279
model_id=device_type,
name=device_id,
serial_number=device_id[3:],
Expand Down
1 change: 1 addition & 0 deletions homeassistant/components/onewire/select.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ class OneWireSelectEntityDescription(OneWireEntityDescription, SelectEntityDescr
read_mode=READ_MODE_INT,
options=["9", "10", "11", "12"],
translation_key="tempres",
entity_registry_enabled_default=False,
),
),
}
Expand Down
6 changes: 4 additions & 2 deletions homeassistant/components/system_bridge/coordinator.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import ConfigEntryAuthFailed
from homeassistant.helpers.aiohttp_client import async_get_clientsession
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed

from .const import DOMAIN, GET_DATA_WAIT_TIMEOUT, MODULES
from .data import SystemBridgeData
Expand Down Expand Up @@ -198,7 +198,9 @@ async def _async_update_data(self) -> SystemBridgeData:
exception,
)
await self.clean_disconnect()
return self.data
raise UpdateFailed(
f"Connection error occurred for {self.title}: {exception}"
) from exception

self.logger.debug("Registered data listener for %s", self.title)

Expand Down
1 change: 1 addition & 0 deletions homeassistant/components/velux/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
}
],
"documentation": "https://www.home-assistant.io/integrations/velux",
"integration_type": "hub",
"iot_class": "local_polling",
"loggers": ["pyvlx"],
"requirements": ["pyvlx==0.2.26"]
Expand Down
8 changes: 8 additions & 0 deletions homeassistant/components/vera/config_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@ async def async_step_init(
return self.async_show_form(
step_id="init",
data_schema=vol.Schema(options_schema(self.config_entry.options)),
description_placeholders={
"sample_ip": "http://192.168.1.161:3480",
"documentation_url": "https://www.home-assistant.io/integrations/vera/",
},
)


Expand Down Expand Up @@ -121,6 +125,10 @@ async def async_step_user(
data_schema=vol.Schema(
{vol.Required(CONF_CONTROLLER): str, **options_schema()}
),
description_placeholders={
"sample_ip": "http://192.168.1.161:3480",
"documentation_url": "https://www.home-assistant.io/integrations/vera/",
},
)

async def async_step_import(self, import_data: dict[str, Any]) -> ConfigFlowResult:
Expand Down
4 changes: 2 additions & 2 deletions homeassistant/components/vera/strings.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"exclude": "Vera device IDs to exclude from Home Assistant."
},
"data_description": {
"vera_controller_url": "It should look like this: http://192.168.1.161:3480"
"vera_controller_url": "It should look like this: {sample_ip}"
}
}
}
Expand All @@ -21,7 +21,7 @@
"step": {
"init": {
"title": "Vera controller options",
"description": "See the Vera documentation for details on optional parameters: https://www.home-assistant.io/integrations/vera/. Note: Any changes here require a restart of the Home Assistant server. To clear values, provide a space.",
"description": "See the Vera documentation for details on optional parameters: {documentation_url}. Note: Any changes here require a restart of the Home Assistant server. To clear values, provide a space.",
"data": {
"lights": "[%key:component::vera::config::step::user::data::lights%]",
"exclude": "[%key:component::vera::config::step::user::data::exclude%]"
Expand Down
2 changes: 1 addition & 1 deletion requirements_all.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion requirements_test_all.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions tests/components/onewire/const.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
"/type": [b""],
},
},
"01.111111111111": {
ATTR_INJECT_READS: {
"/type": [b"DS2401"],
},
},
"05.111111111111": {
ATTR_INJECT_READS: {
"/type": [b"DS2405"],
Expand Down
2 changes: 1 addition & 1 deletion tests/components/onewire/snapshots/test_diagnostics.ambr
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
]),
]),
'manufacturer': 'Hobby Boards',
'model': 'HB_HUB',
'model': None,
'model_id': 'HB_HUB',
'name': 'EF.111111111113',
'serial_number': '111111111113',
Expand Down
Loading
Loading