Refactor Neato botvac components as a vacuum #9946
Conversation
| def turn_on(self, **kwargs): | ||
| """Turn the vacuum on and start cleaning.""" | ||
| self.robot.start_cleaning() | ||
|
|
| def battery_level(self): | ||
| """Return the battery level of the vacuum cleaner.""" | ||
| return self._state['details']['charge'] | ||
|
|
| def supported_features(self): | ||
| """Flag vacuum cleaner robot features that are supported.""" | ||
| return SUPPORT_NEATO | ||
|
|
| def icon(self): | ||
| """Return the icon to use for device.""" | ||
| return ICON | ||
|
|
| if (self.robot.state['action'] == 1 or | ||
| self.robot.state['action'] == 2 or | ||
| self.robot.state['action'] == 3 and | ||
| self.robot.state['state'] == 2): |
There was a problem hiding this comment.
visually indented line with same indent as next logical line
| _LOGGER.debug("Adding vacuums %s", dev) | ||
| add_devices(dev) | ||
|
|
||
| class NeatoConnectedVacuum(VacuumDevice): |
| SUPPORT_MAP, ATTR_STATUS, | ||
| ATTR_BATTERY_LEVEL, | ||
| ATTR_BATTERY_ICON, VacuumDevice) | ||
| from homeassistant.components.neato import ( |
There was a problem hiding this comment.
'homeassistant.components.neato.NEATO_MAP_DATA' imported but unused
| import logging | ||
| import requests | ||
| from homeassistant.const import STATE_OFF, STATE_ON | ||
| from homeassistant.components.vacuum import (SUPPORT_BATTERY, |
There was a problem hiding this comment.
'homeassistant.components.vacuum.SUPPORT_FAN_SPEED' imported but unused
| requests.exceptions.HTTPError) as ex: | ||
| _LOGGER.warning("Neato connection error: %s", ex) | ||
| self._state = None | ||
| self._mapdata = hass.data[NEATO_MAP_DATA] |
| ATTR_CLEAN_SUSP_COUNT = 'clean_suspension_count' | ||
| ATTR_CLEAN_SUSP_TIME = 'clean_suspension_time' | ||
|
|
||
| def setup_platform(hass, config, add_devices, discovery_info=None): |
| @property | ||
| def is_on(self): | ||
| """Return true if switch is on.""" | ||
| if self._clean_state == STATE_ON: |
There was a problem hiding this comment.
return self._clean_state == STATE_ON| if self._state['state'] == 1: | ||
| self.robot.start_cleaning() | ||
| elif self._state['state'] == 2: | ||
| if ALERTS.get(self._state['error']) is None: |
There was a problem hiding this comment.
Connect this statement to the previous line with and.
| self._status_state = None | ||
| self._clean_state = None | ||
| try: | ||
| self._state = self.robot.state |
There was a problem hiding this comment.
Initial this as None and call update instead during entity addition by adding True as second argument to add_devices.
| if self._state['state'] == 1: | ||
| self.robot.start_cleaning() | ||
| elif self._state['state'] == 2 and\ | ||
| ALERTS.get(self._state['error']) is None: |
There was a problem hiding this comment.
continuation line over-indented for visual indent
| if self._state['state'] == 1: | ||
| self.robot.start_cleaning() | ||
| elif self._state['state'] == 2 and\ | ||
| ALERTS.get(self._state['error']) is None: |
There was a problem hiding this comment.
continuation line over-indented for visual indent
| self.clean_battery_end = None | ||
| self.clean_suspension_charge_count = None | ||
| self.clean_suspension_time = None | ||
| self.update() |
There was a problem hiding this comment.
Remove this and instead call add_devices in setup_platform like this:
add_devices(dev, True)update will then be called during adding the devices to home assistant.
A switch is still use to enable/disable the schedule Signed-off-by: Hugo D. (jabesq) <[email protected]>
Signed-off-by: Hugo D. (jabesq) <[email protected]>
Signed-off-by: Hugo D. (jabesq) <[email protected]>
|
As future improvment, you can remove the switch and make platform service calls for that function or maybe it make sense to add it to base |
|
This PR should have included a section for the breaking changes section of the release notes. |
Description:
Refactor Neato botvac components as a vacuum
A switch is still use to enable/disable the schedule
Pull request in home-assistant.github.io with documentation (if applicable): home-assistant/home-assistant.io#3674
Checklist:
If user exposed functionality or configuration variables are added/changed:
If the code does not interact with devices:
toxrun successfully. Your PR cannot be merged unless tests pass