mirror of
https://github.com/home-assistant/core.git
synced 2025-04-25 17:57:55 +00:00
Use shorthand attributes in neato vacuum (#70843)
This commit is contained in:
parent
c8ea264db8
commit
e3f224e115
@ -94,6 +94,7 @@ async def async_setup_entry(
|
||||
class NeatoConnectedVacuum(StateVacuumEntity):
|
||||
"""Representation of a Neato Connected Vacuum."""
|
||||
|
||||
_attr_icon = "mdi:robot-vacuum-variant"
|
||||
_attr_supported_features = (
|
||||
VacuumEntityFeature.BATTERY
|
||||
| VacuumEntityFeature.PAUSE
|
||||
@ -115,12 +116,13 @@ class NeatoConnectedVacuum(StateVacuumEntity):
|
||||
) -> None:
|
||||
"""Initialize the Neato Connected Vacuum."""
|
||||
self.robot = robot
|
||||
self._available: bool = neato is not None
|
||||
self._attr_available: bool = neato is not None
|
||||
self._mapdata = mapdata
|
||||
self._name: str = f"{self.robot.name}"
|
||||
self._attr_name: str = self.robot.name
|
||||
self._robot_has_map: bool = self.robot.has_persistent_maps
|
||||
self._robot_maps = persistent_maps
|
||||
self._robot_serial: str = self.robot.serial
|
||||
self._attr_unique_id: str = self.robot.serial
|
||||
self._status_state: str | None = None
|
||||
self._clean_state: str | None = None
|
||||
self._state: dict[str, Any] | None = None
|
||||
@ -134,7 +136,6 @@ class NeatoConnectedVacuum(StateVacuumEntity):
|
||||
self._clean_pause_time: int | None = None
|
||||
self._clean_error_time: int | None = None
|
||||
self._launched_from: str | None = None
|
||||
self._battery_level: int | None = None
|
||||
self._robot_boundaries: list = []
|
||||
self._robot_stats: dict[str, Any] | None = None
|
||||
|
||||
@ -150,17 +151,17 @@ class NeatoConnectedVacuum(StateVacuumEntity):
|
||||
try:
|
||||
self._state = self.robot.state
|
||||
except NeatoRobotException as ex:
|
||||
if self._available: # print only once when available
|
||||
if self._attr_available: # print only once when available
|
||||
_LOGGER.error(
|
||||
"Neato vacuum connection error for '%s': %s", self.entity_id, ex
|
||||
)
|
||||
self._state = None
|
||||
self._available = False
|
||||
self._attr_available = False
|
||||
return
|
||||
|
||||
if self._state is None:
|
||||
return
|
||||
self._available = True
|
||||
self._attr_available = True
|
||||
_LOGGER.debug("self._state=%s", self._state)
|
||||
if "alert" in self._state:
|
||||
robot_alert = ALERTS.get(self._state["alert"])
|
||||
@ -205,7 +206,7 @@ class NeatoConnectedVacuum(StateVacuumEntity):
|
||||
self._clean_state = STATE_ERROR
|
||||
self._status_state = ERRORS.get(self._state["error"])
|
||||
|
||||
self._battery_level = self._state["details"]["charge"]
|
||||
self._attr_battery_level = self._state["details"]["charge"]
|
||||
|
||||
if self._mapdata is None or not self._mapdata.get(self._robot_serial, {}).get(
|
||||
"maps", []
|
||||
@ -260,41 +261,11 @@ class NeatoConnectedVacuum(StateVacuumEntity):
|
||||
self._robot_boundaries,
|
||||
)
|
||||
|
||||
@property
|
||||
def name(self) -> str:
|
||||
"""Return the name of the device."""
|
||||
return self._name
|
||||
|
||||
@property
|
||||
def supported_features(self) -> int:
|
||||
"""Flag vacuum cleaner robot features that are supported."""
|
||||
return self._attr_supported_features
|
||||
|
||||
@property
|
||||
def battery_level(self) -> int | None:
|
||||
"""Return the battery level of the vacuum cleaner."""
|
||||
return self._battery_level
|
||||
|
||||
@property
|
||||
def available(self) -> bool:
|
||||
"""Return if the robot is available."""
|
||||
return self._available
|
||||
|
||||
@property
|
||||
def icon(self) -> str:
|
||||
"""Return neato specific icon."""
|
||||
return "mdi:robot-vacuum-variant"
|
||||
|
||||
@property
|
||||
def state(self) -> str | None:
|
||||
"""Return the status of the vacuum cleaner."""
|
||||
return self._clean_state
|
||||
|
||||
@property
|
||||
def unique_id(self) -> str:
|
||||
"""Return a unique ID."""
|
||||
return self._robot_serial
|
||||
|
||||
@property
|
||||
def extra_state_attributes(self) -> dict[str, Any]:
|
||||
"""Return the state attributes of the vacuum cleaner."""
|
||||
@ -333,7 +304,7 @@ class NeatoConnectedVacuum(StateVacuumEntity):
|
||||
identifiers={(NEATO_DOMAIN, self._robot_serial)},
|
||||
manufacturer=stats["battery"]["vendor"] if stats else None,
|
||||
model=stats["model"] if stats else None,
|
||||
name=self._name,
|
||||
name=self._attr_name,
|
||||
sw_version=stats["firmware"] if stats else None,
|
||||
)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user