Update HA, add vacuum, grid cards, fixes
Tá an tiomantas seo le fáil i:
Florian Brinker
@@ -57,11 +57,11 @@ API_WORX_SENSORS = {
|
||||
},
|
||||
"icon": "mdi:battery",
|
||||
"unit": "%",
|
||||
"device_class": None,
|
||||
"device_class": "battery",
|
||||
},
|
||||
"error": {
|
||||
"state": {"error_description": "state", "error": "error_id"},
|
||||
"icon": None,
|
||||
"icon": "mdi:alert",
|
||||
"unit": None,
|
||||
"device_class": None,
|
||||
},
|
||||
@@ -83,6 +83,8 @@ API_WORX_SENSORS = {
|
||||
"rain_delay": "raindelay",
|
||||
"schedule_variation": "timeextension",
|
||||
"firmware": "firmware_version",
|
||||
"serial": "serial",
|
||||
"mac": "mac",
|
||||
},
|
||||
"icon": None,
|
||||
"unit": None,
|
||||
@@ -130,7 +132,7 @@ async def async_setup(hass, config):
|
||||
async def handle_start(call):
|
||||
"""Handle start service call."""
|
||||
if "id" in call.data:
|
||||
ID = call.data["id"]
|
||||
ID = int(call.data["id"])
|
||||
|
||||
for cli in client:
|
||||
attrs = vars(cli)
|
||||
@@ -144,7 +146,7 @@ async def async_setup(hass, config):
|
||||
async def handle_pause(call):
|
||||
"""Handle pause service call."""
|
||||
if "id" in call.data:
|
||||
ID = call.data["id"]
|
||||
ID = int(call.data["id"])
|
||||
|
||||
for cli in client:
|
||||
attrs = vars(cli)
|
||||
@@ -158,7 +160,7 @@ async def async_setup(hass, config):
|
||||
async def handle_home(call):
|
||||
"""Handle pause service call."""
|
||||
if "id" in call.data:
|
||||
ID = call.data["id"]
|
||||
ID = int(call.data["id"])
|
||||
|
||||
for cli in client:
|
||||
attrs = vars(cli)
|
||||
@@ -177,31 +179,46 @@ async def async_setup(hass, config):
|
||||
|
||||
if "id" in call.data:
|
||||
_LOGGER.debug("Data from Home Assistant: %s", call.data["id"])
|
||||
|
||||
|
||||
for cli in client:
|
||||
attrs = vars(cli)
|
||||
if (attrs["id"] == call.data["id"]):
|
||||
if (attrs["id"] == int(call.data["id"])):
|
||||
break
|
||||
else:
|
||||
id += 1
|
||||
|
||||
if "raindelay" in call.data:
|
||||
tmpdata["rd"] = call.data["raindelay"]
|
||||
tmpdata["rd"] = int(call.data["raindelay"])
|
||||
_LOGGER.debug("Setting rain_delay for %s to %s", client[id].name, call.data["raindelay"])
|
||||
sendData = True
|
||||
|
||||
if "timeextension" in call.data:
|
||||
tmpdata["sc"] = {}
|
||||
tmpdata["sc"]["p"] = call.data["timeextension"]
|
||||
tmpdata["sc"] = {}
|
||||
tmpdata["sc"]["p"] = int(call.data["timeextension"])
|
||||
data = json.dumps(tmpdata)
|
||||
_LOGGER.debug("Setting time_extension for %s to %s", client[id].name, call.data["timeextension"])
|
||||
sendData = True
|
||||
|
||||
if "multizone_distances" in call.data:
|
||||
tmpdata["mz"] = [int(x) for x in call.data["multizone_distances"]]
|
||||
data = json.dumps(tmpdata)
|
||||
_LOGGER.debug("Setting multizone distances for %s to %s", client[id].name, call.data["multizone_distances"])
|
||||
sendData = True
|
||||
|
||||
if "multizone_probabilities" in call.data:
|
||||
tmpdata["mzv"] = []
|
||||
for idx, val in enumerate(call.data["multizone_probabilities"]):
|
||||
for _ in range(val):
|
||||
tmpdata["mzv"].append(idx)
|
||||
data = json.dumps(tmpdata)
|
||||
_LOGGER.debug("Setting multizone probabilities for %s to %s", client[id].name, call.data["multizone_probabilities"])
|
||||
sendData = True
|
||||
|
||||
if sendData:
|
||||
data = json.dumps(tmpdata)
|
||||
_LOGGER.debug("Sending: %s", data)
|
||||
client[id].sendData(data)
|
||||
|
||||
|
||||
hass.services.async_register(DOMAIN, SERVICE_CONFIG, handle_config)
|
||||
|
||||
return True
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
{
|
||||
"domain": "landroid_cloud",
|
||||
"name": "Worx Landroid Cloud",
|
||||
"documentation": "https://www.home-assistant.io/integrations/landroid_cloud/",
|
||||
"requirements": ["pyworxcloud==1.2.17"],
|
||||
"documentation": "https://github.com/MTrab/landroid_cloud/blob/master/README.md",
|
||||
"issue_tracker": "https://github.com/MTrab/landroid_cloud/issues",
|
||||
"requirements": ["pyworxcloud==1.2.21"],
|
||||
"version": "1.6.5",
|
||||
"codeowners": ["@MTrab"]
|
||||
}
|
||||
|
||||
@@ -1,127 +1,132 @@
|
||||
"""Support for monitoring Worx Landroid Sensors."""
|
||||
import async_timeout
|
||||
import asyncio
|
||||
import logging
|
||||
|
||||
from homeassistant.components import sensor
|
||||
from homeassistant.const import STATE_UNKNOWN
|
||||
from homeassistant.core import callback
|
||||
from homeassistant.helpers.dispatcher import async_dispatcher_connect
|
||||
from homeassistant.helpers.entity import Entity
|
||||
|
||||
from . import API_WORX_SENSORS, LANDROID_API, UPDATE_SIGNAL
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
STATE_INITIALIZING = "Initializing"
|
||||
STATE_OFFLINE = "Offline"
|
||||
|
||||
|
||||
async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
|
||||
"""Set up the available sensors for Worx Landroid."""
|
||||
if discovery_info is None:
|
||||
return
|
||||
|
||||
entities = []
|
||||
|
||||
info = discovery_info[0]
|
||||
for tSensor in API_WORX_SENSORS:
|
||||
name = "{}_{}".format(info["name"].lower(), tSensor.lower())
|
||||
friendly_name = "{} {}".format(info["friendly"], tSensor)
|
||||
dev_id = info["id"]
|
||||
api = hass.data[LANDROID_API][dev_id]
|
||||
sensor_type = tSensor
|
||||
_LOGGER.debug("Init Landroid %s sensor for %s", sensor_type, info["friendly"])
|
||||
entity = LandroidSensor(api, name, sensor_type, friendly_name, dev_id)
|
||||
entities.append(entity)
|
||||
|
||||
async_add_entities(entities, True)
|
||||
|
||||
|
||||
class LandroidSensor(Entity):
|
||||
"""Class to create and populate a Landroid Sensor."""
|
||||
|
||||
def __init__(self, api, name, sensor_type, friendly_name, dev_id):
|
||||
"""Init new sensor."""
|
||||
|
||||
self._api = api
|
||||
self._attributes = {}
|
||||
self._available = False
|
||||
self._name = friendly_name
|
||||
self._state = STATE_INITIALIZING
|
||||
self._sensor_type = sensor_type
|
||||
self._dev_id = dev_id
|
||||
self.entity_id = sensor.ENTITY_ID_FORMAT.format(name)
|
||||
|
||||
@property
|
||||
def available(self) -> bool:
|
||||
"""Return True if entity is available."""
|
||||
return self._available
|
||||
|
||||
@property
|
||||
def device_state_attributes(self):
|
||||
"""Return sensor attributes."""
|
||||
return self._attributes
|
||||
|
||||
@property
|
||||
def name(self):
|
||||
"""Return the name of the sensor."""
|
||||
return self._name
|
||||
|
||||
@property
|
||||
def unit_of_measurement(self):
|
||||
"""Return the unit of measurement of this entity, if any."""
|
||||
return API_WORX_SENSORS[self._sensor_type]["unit"]
|
||||
|
||||
@property
|
||||
def icon(self):
|
||||
"""Icon to use in the frontend."""
|
||||
return API_WORX_SENSORS[self._sensor_type]["icon"]
|
||||
|
||||
@property
|
||||
def should_poll(self):
|
||||
"""Return False as entity is updated from the component."""
|
||||
return False
|
||||
|
||||
@property
|
||||
def state(self):
|
||||
"""Return sensor state."""
|
||||
return self._state
|
||||
|
||||
@callback
|
||||
def update_callback(self):
|
||||
"""Get new data and update state."""
|
||||
self.async_schedule_update_ha_state(True)
|
||||
|
||||
async def async_added_to_hass(self):
|
||||
"""Connect update callbacks."""
|
||||
async_dispatcher_connect(self.hass, UPDATE_SIGNAL, self.update_callback)
|
||||
|
||||
def _get_data(self):
|
||||
"""Return new data from the api cache."""
|
||||
data = self._api.get_data(self._sensor_type)
|
||||
self._available = True
|
||||
return data
|
||||
|
||||
async def async_update(self):
|
||||
"""Update the sensor."""
|
||||
_LOGGER.debug("Updating %s", self.entity_id)
|
||||
data = self._get_data()
|
||||
if "state" in data:
|
||||
_LOGGER.debug(data)
|
||||
state = data.pop("state")
|
||||
_LOGGER.debug("Mower %s State %s", self._name, state)
|
||||
self._attributes.update(data)
|
||||
self._state = state
|
||||
else:
|
||||
_LOGGER.debug("No data received for %s", self.entity_id)
|
||||
reachable = self._api._client.online
|
||||
if not reachable:
|
||||
if "_battery" in self.entity_id:
|
||||
self._state = "Unknown"
|
||||
else:
|
||||
self._state = STATE_OFFLINE
|
||||
#else:
|
||||
# attrs = vars(self._api._client)
|
||||
# for item in attrs:
|
||||
# _LOGGER.debug("%s : %s", item, attrs[item])
|
||||
"""Support for monitoring Worx Landroid Sensors."""
|
||||
import async_timeout
|
||||
import asyncio
|
||||
import logging
|
||||
|
||||
from homeassistant.components import sensor
|
||||
from homeassistant.const import STATE_UNKNOWN
|
||||
from homeassistant.core import callback
|
||||
from homeassistant.helpers.dispatcher import async_dispatcher_connect
|
||||
from homeassistant.helpers.entity import Entity
|
||||
from homeassistant.helpers.icon import icon_for_battery_level
|
||||
|
||||
from . import API_WORX_SENSORS, LANDROID_API, UPDATE_SIGNAL
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
STATE_INITIALIZING = "Initializing"
|
||||
STATE_OFFLINE = "Offline"
|
||||
|
||||
|
||||
async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
|
||||
"""Set up the available sensors for Worx Landroid."""
|
||||
if discovery_info is None:
|
||||
return
|
||||
|
||||
entities = []
|
||||
|
||||
info = discovery_info[0]
|
||||
for tSensor in API_WORX_SENSORS:
|
||||
name = "{}_{}".format(info["name"].lower(), tSensor.lower())
|
||||
friendly_name = "{} {}".format(info["friendly"], tSensor)
|
||||
dev_id = info["id"]
|
||||
api = hass.data[LANDROID_API][dev_id]
|
||||
sensor_type = tSensor
|
||||
_LOGGER.debug("Init Landroid %s sensor for %s", sensor_type, info["friendly"])
|
||||
entity = LandroidSensor(api, name, sensor_type, friendly_name, dev_id)
|
||||
entities.append(entity)
|
||||
|
||||
async_add_entities(entities, True)
|
||||
|
||||
|
||||
class LandroidSensor(Entity):
|
||||
"""Class to create and populate a Landroid Sensor."""
|
||||
|
||||
def __init__(self, api, name, sensor_type, friendly_name, dev_id):
|
||||
"""Init new sensor."""
|
||||
|
||||
self._api = api
|
||||
self._attributes = {}
|
||||
self._available = False
|
||||
self._name = friendly_name
|
||||
self._state = STATE_INITIALIZING
|
||||
self._sensor_type = sensor_type
|
||||
self._dev_id = dev_id
|
||||
self.entity_id = sensor.ENTITY_ID_FORMAT.format(name)
|
||||
|
||||
@property
|
||||
def available(self) -> bool:
|
||||
"""Return True if entity is available."""
|
||||
return self._available
|
||||
|
||||
@property
|
||||
def device_state_attributes(self):
|
||||
"""Return sensor attributes."""
|
||||
return self._attributes
|
||||
|
||||
@property
|
||||
def name(self):
|
||||
"""Return the name of the sensor."""
|
||||
return self._name
|
||||
|
||||
@property
|
||||
def unit_of_measurement(self):
|
||||
"""Return the unit of measurement of this entity, if any."""
|
||||
return API_WORX_SENSORS[self._sensor_type]["unit"]
|
||||
|
||||
@property
|
||||
def icon(self):
|
||||
"""Icon to use in the frontend."""
|
||||
if self._sensor_type == "battery" and isinstance(self.state, int):
|
||||
charging = self._attributes["charging"]
|
||||
return icon_for_battery_level(battery_level=self.state, charging=charging)
|
||||
|
||||
return API_WORX_SENSORS[self._sensor_type]["icon"]
|
||||
|
||||
@property
|
||||
def should_poll(self):
|
||||
"""Return False as entity is updated from the component."""
|
||||
return False
|
||||
|
||||
@property
|
||||
def state(self):
|
||||
"""Return sensor state."""
|
||||
return self._state
|
||||
|
||||
@callback
|
||||
def update_callback(self):
|
||||
"""Get new data and update state."""
|
||||
self.async_schedule_update_ha_state(True)
|
||||
|
||||
async def async_added_to_hass(self):
|
||||
"""Connect update callbacks."""
|
||||
async_dispatcher_connect(self.hass, UPDATE_SIGNAL, self.update_callback)
|
||||
|
||||
def _get_data(self):
|
||||
"""Return new data from the api cache."""
|
||||
data = self._api.get_data(self._sensor_type)
|
||||
self._available = True
|
||||
return data
|
||||
|
||||
async def async_update(self):
|
||||
"""Update the sensor."""
|
||||
_LOGGER.debug("Updating %s", self.entity_id)
|
||||
data = self._get_data()
|
||||
if "state" in data:
|
||||
_LOGGER.debug(data)
|
||||
state = data.pop("state")
|
||||
_LOGGER.debug("Mower %s State %s", self._name, state)
|
||||
self._attributes.update(data)
|
||||
self._state = state
|
||||
if "latitude" in self._attributes:
|
||||
if self._attributes["latitude"] == None:
|
||||
del self._attributes["latitude"]
|
||||
del self._attributes["longitude"]
|
||||
else:
|
||||
_LOGGER.debug("No data received for %s", self.entity_id)
|
||||
reachable = self._api._client.online
|
||||
if not reachable:
|
||||
if "_battery" in self.entity_id:
|
||||
self._state = STATE_UNKNOWN
|
||||
else:
|
||||
self._state = STATE_OFFLINE
|
||||
|
||||
@@ -28,3 +28,9 @@ config:
|
||||
timeextension:
|
||||
description: Set time extension. Extension in % ranging from -100 to 100
|
||||
example: -23
|
||||
multizone_distances:
|
||||
description: Set multizone distances. Distances in meter. 0 = Disabled
|
||||
example: '[15, 80, 120, 155]'
|
||||
multizone_probabilities:
|
||||
description: Set multizone probabilities. Probabilities in parts-of-ten. 1 = 10%, 2 = 20%, ...
|
||||
example: '[5, 1, 2, 2]'
|
||||
|
||||
Tagairt in Eagrán Nua
Cuir bac ar úsáideoir