disable movement commands if no ble

Author: mikey0000

custom_components/mammotion/__init__.py

@@ -30,7 +30,7 @@
 from pymammotion.client import MammotionClient
 from pymammotion.data.model.account import Credentials
 from pymammotion.data.model.device import MowingDevice
-from pymammotion.transport.base import LoginFailedError, TransportType
+from pymammotion.transport.base import LoginFailedError, ReLoginRequiredError, TransportType
 from Tea.exceptions import UnretryableException
 
 from .const import (
@@ -149,7 +149,7 @@ async def _async_attempt_login(
                 account, password, aiohttp_client.async_get_clientsession(hass)
             )
             return True
-        except LoginFailedError as retry_err:
+        except (LoginFailedError, ReLoginRequiredError) as retry_err:
             if ble_fallback:
                 LOGGER.warning(
                     "Login failed after cache clear; continuing in BLE-only mode: %s",

custom_components/mammotion/button.py

@@ -12,6 +12,7 @@
 from homeassistant.helpers.entity import EntityCategory
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from pymammotion.data.model.hash_list import Plan
+from pymammotion.transport.base import TransportType
 from pymammotion.utility.device_type import DeviceType
 
 from . import MammotionConfigEntry
@@ -28,6 +29,7 @@ class MammotionButtonSensorEntityDescription(ButtonEntityDescription):
     """Describes Mammotion button sensor entity."""
 
     press_fn: Callable[[MammotionBaseUpdateCoordinator], Awaitable[None]]
+    available_fn: Callable[[MammotionBaseUpdateCoordinator], bool] | None = None
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -38,6 +40,17 @@ class MammotionTaskButtonSensorEntityDescription(ButtonEntityDescription):
     press_fn: Callable[[MammotionBaseUpdateCoordinator, str], Awaitable[None]]
 
 
+def _nudge_available(coordinator: MammotionBaseUpdateCoordinator) -> bool:
+    """Return True when movement via BLE or Wi-Fi is possible."""
+    if coordinator.config_entry.options.get(CONF_MOVEMENT_USE_WIFI, False):
+        return True
+    handle = coordinator.manager.mower(coordinator.device_name)
+    if handle is None:
+        return False
+    ble = handle.get_transport(TransportType.BLE)
+    return ble is not None and ble.is_usable
+
+
 BUTTON_SENSORS: tuple[MammotionButtonSensorEntityDescription, ...] = (
     MammotionButtonSensorEntityDescription(
         key="start_map_sync",
@@ -64,27 +77,31 @@ class MammotionTaskButtonSensorEntityDescription(ButtonEntityDescription):
             0.4,
             coordinator.config_entry.options.get(CONF_MOVEMENT_USE_WIFI, False),
         ),
+        available_fn=_nudge_available,
     ),
     MammotionButtonSensorEntityDescription(
         key="emergency_nudge_left",
         press_fn=lambda coordinator: coordinator.async_move_left(
             0.4,
             coordinator.config_entry.options.get(CONF_MOVEMENT_USE_WIFI, False),
         ),
+        available_fn=_nudge_available,
     ),
     MammotionButtonSensorEntityDescription(
         key="emergency_nudge_right",
         press_fn=lambda coordinator: coordinator.async_move_right(
             0.4,
             coordinator.config_entry.options.get(CONF_MOVEMENT_USE_WIFI, False),
         ),
+        available_fn=_nudge_available,
     ),
     MammotionButtonSensorEntityDescription(
         key="emergency_nudge_back",
         press_fn=lambda coordinator: coordinator.async_move_back(
             0.4,
             coordinator.config_entry.options.get(CONF_MOVEMENT_USE_WIFI, False),
         ),
+        available_fn=_nudge_available,
     ),
     MammotionButtonSensorEntityDescription(
         key="cancel_task",
@@ -161,6 +178,15 @@ def __init__(
         self.entity_description = entity_description
         self._attr_translation_key = entity_description.key
 
+    @property
+    def available(self) -> bool:
+        """Return True if entity is available."""
+        if self.entity_description.available_fn is not None:
+            return super().available and self.entity_description.available_fn(
+                self.coordinator
+            )
+        return super().available
+
     async def async_press(self) -> None:
         """Handle the button press."""
         await self.entity_description.press_fn(self.coordinator)

custom_components/mammotion/coordinator.py

@@ -59,6 +59,7 @@
 from pymammotion.state.device_state import DeviceSnapshot
 from pymammotion.transport.base import (
     AuthError,
+    BLEUnavailableError,
     CommandTimeoutError,
     ConcurrentRequestError,
     LoginFailedError,
@@ -290,7 +291,7 @@ async def async_refresh_login(self, exc: Exception | None = None) -> None:
         if not self.has_cloud_account:
             return
 
-        if isinstance(exc, (LoginFailedError, ReLoginRequiredError)):
+        if isinstance(exc, LoginFailedError):
             raise ConfigEntryAuthFailed(
                 f"Login failed for Mammotion account: {exc}"
             ) from exc
@@ -1226,7 +1227,14 @@ async def _async_update_data(self) -> MowingDevice:
         if handle := self.manager.mower(self.device_name):
             if ble := handle.get_transport(TransportType.BLE):
                 if ble.is_usable and not ble.is_connected:
-                    await ble.connect()
+                    try:
+                        await ble.connect()
+                    except BLEUnavailableError as exc:
+                        LOGGER.debug(
+                            "BLE unavailable for %s during update — continuing via cloud: %s",
+                            self.device_name,
+                            exc,
+                        )
 
         return device