diff --git a/homeassistant/components/husqvarna_automower_ble/coordinator.py b/homeassistant/components/husqvarna_automower_ble/coordinator.py index 4e5131d46a2..c577ccd9196 100644 --- a/homeassistant/components/husqvarna_automower_ble/coordinator.py +++ b/homeassistant/components/husqvarna_automower_ble/coordinator.py @@ -75,19 +75,19 @@ class HusqvarnaCoordinator(DataUpdateCoordinator[dict[str, bytes]]): try: data["battery_level"] = await self.mower.battery_level() - LOGGER.debug(data["battery_level"]) + LOGGER.debug("battery_level" + str(data["battery_level"])) if data["battery_level"] is None: await self._async_find_device() raise UpdateFailed("Error getting data from device") data["activity"] = await self.mower.mower_activity() - LOGGER.debug(data["activity"]) + LOGGER.debug("activity:" + str(data["activity"])) if data["activity"] is None: await self._async_find_device() raise UpdateFailed("Error getting data from device") data["state"] = await self.mower.mower_state() - LOGGER.debug(data["state"]) + LOGGER.debug("state:" + str(data["state"])) if data["state"] is None: await self._async_find_device() raise UpdateFailed("Error getting data from device") diff --git a/homeassistant/components/husqvarna_automower_ble/lawn_mower.py b/homeassistant/components/husqvarna_automower_ble/lawn_mower.py index 5b7b4282378..980efc6f069 100644 --- a/homeassistant/components/husqvarna_automower_ble/lawn_mower.py +++ b/homeassistant/components/husqvarna_automower_ble/lawn_mower.py @@ -2,6 +2,8 @@ from __future__ import annotations +from automower_ble.protocol import MowerActivity, MowerState + from homeassistant.components import bluetooth from homeassistant.components.lawn_mower import ( LawnMowerActivity, @@ -60,29 +62,31 @@ class AutomowerLawnMower(HusqvarnaAutomowerBleEntity, LawnMowerEntity): if self.coordinator.data is None: return None - state = str(self.coordinator.data["state"]) - activity = str(self.coordinator.data["activity"]) + state = self.coordinator.data["state"] + activity = self.coordinator.data["activity"] if state is None or activity is None: return None - if state == "paused": + if state == MowerState.PAUSED: return LawnMowerActivity.PAUSED - if state in ("stopped", "off", "waitForSafetyPin"): + if state in (MowerState.STOPPED, MowerState.OFF, MowerState.WAIT_FOR_SAFETYPIN): # This is actually stopped, but that isn't an option return LawnMowerActivity.ERROR if state in ( - "restricted", - "inOperation", - "unknown", - "checkSafety", - "pendingStart", + MowerState.RESTRICTED, + MowerState.IN_OPERATION, + MowerState.PENDING_START, ): - if activity in ("charging", "parked", "none"): + if activity in ( + MowerActivity.CHARGING, + MowerActivity.PARKED, + MowerActivity.NONE, + ): return LawnMowerActivity.DOCKED - if activity in ("goingOut", "mowing"): + if activity in (MowerActivity.GOING_OUT, MowerActivity.MOWING): return LawnMowerActivity.MOWING - if activity in ("goingHome"): + if activity == MowerActivity.GOING_HOME: return LawnMowerActivity.RETURNING return LawnMowerActivity.ERROR diff --git a/homeassistant/components/husqvarna_automower_ble/manifest.json b/homeassistant/components/husqvarna_automower_ble/manifest.json index 8d9fc46fbd4..3e72d9707c7 100644 --- a/homeassistant/components/husqvarna_automower_ble/manifest.json +++ b/homeassistant/components/husqvarna_automower_ble/manifest.json @@ -12,5 +12,5 @@ "dependencies": ["bluetooth_adapters"], "documentation": "https://www.home-assistant.io/integrations/???", "iot_class": "local_polling", - "requirements": ["automower-ble==0.1.35"] + "requirements": ["automower-ble==0.2.0"] } diff --git a/requirements_all.txt b/requirements_all.txt index 94c68da2f54..4107547c971 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -524,7 +524,7 @@ aurorapy==0.2.7 autarco==3.0.0 # homeassistant.components.husqvarna_automower_ble -automower-ble==0.1.35 +automower-ble==0.2.0 # homeassistant.components.avea # avea==1.5.1 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 32bc381eeb2..4c2fc453cbe 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -479,7 +479,7 @@ aurorapy==0.2.7 autarco==3.0.0 # homeassistant.components.husqvarna_automower_ble -automower-ble==0.1.35 +automower-ble==0.2.0 # homeassistant.components.axis axis==63