diff --git a/homeassistant/components/roborock/coordinator.py b/homeassistant/components/roborock/coordinator.py index d29d7685f1e..ba9571a95f5 100644 --- a/homeassistant/components/roborock/coordinator.py +++ b/homeassistant/components/roborock/coordinator.py @@ -33,20 +33,20 @@ class RoborockDataUpdateCoordinator(DataUpdateCoordinator[DeviceProp]): ) -> None: """Initialize.""" super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=SCAN_INTERVAL) - self.device_info = RoborockHassDeviceInfo( + self.roborock_device_info = RoborockHassDeviceInfo( device, device_networking, product_info, DeviceProp(), ) - device_info = DeviceData(device, product_info.model, device_networking.ip) - self.api = RoborockLocalClient(device_info) - self.device_specification = DeviceInfo( - name=self.device_info.device.name, - identifiers={(DOMAIN, self.device_info.device.duid)}, + device_data = DeviceData(device, product_info.model, device_networking.ip) + self.api = RoborockLocalClient(device_data) + self.device_info = DeviceInfo( + name=self.roborock_device_info.device.name, + identifiers={(DOMAIN, self.roborock_device_info.device.duid)}, manufacturer="Roborock", - model=self.device_info.product.model, - sw_version=self.device_info.device.fv, + model=self.roborock_device_info.product.model, + sw_version=self.roborock_device_info.device.fv, ) async def release(self) -> None: @@ -57,10 +57,10 @@ class RoborockDataUpdateCoordinator(DataUpdateCoordinator[DeviceProp]): """Update device properties.""" device_prop = await self.api.get_prop() if device_prop: - if self.device_info.props: - self.device_info.props.update(device_prop) + if self.roborock_device_info.props: + self.roborock_device_info.props.update(device_prop) else: - self.device_info.props = device_prop + self.roborock_device_info.props = device_prop async def _async_update_data(self) -> DeviceProp: """Update data via library.""" @@ -68,4 +68,4 @@ class RoborockDataUpdateCoordinator(DataUpdateCoordinator[DeviceProp]): await self._update_device_prop() except RoborockException as ex: raise UpdateFailed(ex) from ex - return self.device_info.props + return self.roborock_device_info.props diff --git a/homeassistant/components/roborock/device.py b/homeassistant/components/roborock/device.py index 7f54a416d4a..41db2cc08ac 100644 --- a/homeassistant/components/roborock/device.py +++ b/homeassistant/components/roborock/device.py @@ -57,7 +57,7 @@ class RoborockCoordinatedEntity( RoborockEntity.__init__( self, unique_id=unique_id, - device_info=coordinator.device_specification, + device_info=coordinator.device_info, api=coordinator.api, ) CoordinatorEntity.__init__(self, coordinator=coordinator) diff --git a/homeassistant/components/roborock/select.py b/homeassistant/components/roborock/select.py index d27888a1779..2d76aac33d3 100644 --- a/homeassistant/components/roborock/select.py +++ b/homeassistant/components/roborock/select.py @@ -77,7 +77,8 @@ async def async_setup_entry( ) for device_id, coordinator in coordinators.items() for description in SELECT_DESCRIPTIONS - if description.options_lambda(coordinator.device_info.props.status) is not None + if description.options_lambda(coordinator.roborock_device_info.props.status) + is not None ) diff --git a/homeassistant/components/roborock/sensor.py b/homeassistant/components/roborock/sensor.py index 5cf2a286213..ec973addae3 100644 --- a/homeassistant/components/roborock/sensor.py +++ b/homeassistant/components/roborock/sensor.py @@ -140,4 +140,6 @@ class RoborockSensorEntity(RoborockCoordinatedEntity, SensorEntity): @property def native_value(self) -> StateType: """Return the value reported by the sensor.""" - return self.entity_description.value_fn(self.coordinator.device_info.props) + return self.entity_description.value_fn( + self.coordinator.roborock_device_info.props + ) diff --git a/homeassistant/components/roborock/switch.py b/homeassistant/components/roborock/switch.py index 2bfddefc100..0af07af4de5 100644 --- a/homeassistant/components/roborock/switch.py +++ b/homeassistant/components/roborock/switch.py @@ -91,7 +91,7 @@ class RoborockSwitchEntity(RoborockEntity, SwitchEntity): ) -> None: """Create a switch entity.""" self.entity_description = entity_description - super().__init__(unique_id, coordinator.device_specification, coordinator.api) + super().__init__(unique_id, coordinator.device_info, coordinator.api) async def async_turn_off(self, **kwargs: Any) -> None: """Turn off the switch."""