Use new ServiceInfo location in rainforest_raven (#135697)

This commit is contained in:
epenet 2025-01-15 16:15:51 +01:00 committed by GitHub
parent 5e648ebb5c
commit 082ef3f85f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -20,6 +20,7 @@ from homeassistant.helpers.selector import (
SelectSelectorConfig, SelectSelectorConfig,
SelectSelectorMode, SelectSelectorMode,
) )
from homeassistant.helpers.service_info.usb import UsbServiceInfo
from .const import DEFAULT_NAME, DOMAIN from .const import DEFAULT_NAME, DOMAIN
@ -30,7 +31,7 @@ def _format_id(value: str | int) -> str:
return f"{value or 0:04X}" return f"{value or 0:04X}"
def _generate_unique_id(info: ListPortInfo | usb.UsbServiceInfo) -> str: def _generate_unique_id(info: ListPortInfo | UsbServiceInfo) -> str:
"""Generate unique id from usb attributes.""" """Generate unique id from usb attributes."""
return ( return (
f"{_format_id(info.vid)}:{_format_id(info.pid)}_{info.serial_number}" f"{_format_id(info.vid)}:{_format_id(info.pid)}_{info.serial_number}"
@ -98,9 +99,7 @@ class RainforestRavenConfigFlow(ConfigFlow, domain=DOMAIN):
) )
return self.async_show_form(step_id="meters", data_schema=schema, errors=errors) return self.async_show_form(step_id="meters", data_schema=schema, errors=errors)
async def async_step_usb( async def async_step_usb(self, discovery_info: UsbServiceInfo) -> ConfigFlowResult:
self, discovery_info: usb.UsbServiceInfo
) -> ConfigFlowResult:
"""Handle USB Discovery.""" """Handle USB Discovery."""
device = discovery_info.device device = discovery_info.device
dev_path = await self.hass.async_add_executor_job(usb.get_serial_by_id, device) dev_path = await self.hass.async_add_executor_job(usb.get_serial_by_id, device)