fix services yaml breaking in newer HAOS versions

Author: mikey0000

custom_components/mammotion/coordinator.py

@@ -270,6 +270,7 @@ async def async_send_cloud_command(
         except (DeviceOfflineException, NoConnectionException) as ex:
             """Device is offline try bluetooth if we have it."""
             LOGGER.error(f"Device offline: {ex.iot_id}")
+        return False
 
     async def check_firmware_version(self) -> None:
         """Check if firmware version is updated."""
@@ -420,7 +421,9 @@ async def async_request_iot_sync(self, stop: bool = False) -> None:
             count=0,
         )
 
-    async def async_plan_route(self, operation_settings: OperationSettings) -> bool:
+    async def async_plan_route(
+        self, operation_settings: OperationSettings
+    ) -> bool | None:
         """Plan mow."""
 
         if self.data.report_data.dev:
@@ -982,10 +985,10 @@ def get_coordinator_data(self, device: MammotionMixedDeviceManager) -> MowingDev
 
     async def _async_update_event_message(self, event: ThingEventMessage) -> None:
         if event.params.identifier == "device_warning_code_event":
-            event: DeviceNotificationEventParams = event.params
+            event_params: DeviceNotificationEventParams = event.params
             # '[{"c":-2801,"ct":1,"ft":1731493734000},{"c":-1008,"ct":1,"ft":1731493734000}]'
             try:
-                warning_event = json.loads(event.value.data)
+                warning_event = json.loads(event_params.value.data)
                 LOGGER.debug("warning event %s", warning_event)
                 await self._async_update_data()
                 if mower := self.manager.mower(self.device_name):

custom_components/mammotion/lawn_mower.py

@@ -34,14 +34,18 @@
     vol.Optional("collect_grass_frequency", default=10): vol.All(
         vol.Coerce(int), vol.Range(min=5, max=100)
     ),
-    vol.Optional("border_mode", default=1): vol.In([0, 1]),
+    vol.Optional("border_mode", default=1): vol.All(vol.Coerce(int), vol.In([0, 1])),
     vol.Optional("job_version", default=0): vol.Coerce(int),
     vol.Optional("job_id", default=0): vol.Coerce(int),
     vol.Optional("speed", default=0.3): vol.All(
         vol.Coerce(float), vol.Range(min=0.2, max=1.2)
     ),
-    vol.Optional("ultra_wave", default=2): vol.In([0, 1, 2, 10, 11]),
-    vol.Optional("channel_mode", default=0): vol.In([0, 1, 2, 3]),
+    vol.Optional("ultra_wave", default=2): vol.All(
+        vol.Coerce(int), vol.In([0, 1, 2, 10, 11])
+    ),
+    vol.Optional("channel_mode", default=0): vol.All(
+        vol.Coerce(int), vol.In([0, 1, 2, 3])
+    ),
     vol.Optional("channel_width", default=25): vol.All(
         vol.Coerce(int), vol.Range(min=5, max=35)
     ),
@@ -55,9 +59,13 @@
     vol.Optional("toward_included_angle", default=0): vol.All(
         vol.Coerce(int), vol.Range(min=-180, max=180)
     ),
-    vol.Optional("toward_mode", default=0): vol.In([0, 1, 2]),
-    vol.Optional("mowing_laps", default=1): vol.In([0, 1, 2, 3, 4]),
-    vol.Optional("obstacle_laps", default=1): vol.In([0, 1, 2, 3, 4]),
+    vol.Optional("toward_mode", default=0): vol.All(vol.Coerce(int), vol.In([0, 1, 2])),
+    vol.Optional("mowing_laps", default=1): vol.All(
+        vol.Coerce(int), vol.In([0, 1, 2, 3, 4])
+    ),
+    vol.Optional("obstacle_laps", default=1): vol.All(
+        vol.Coerce(int), vol.In([0, 1, 2, 3, 4])
+    ),
     vol.Optional("start_progress", default=0): vol.All(
         vol.Coerce(int), vol.Range(min=0, max=100)
     ),

custom_components/mammotion/services.yaml

@@ -37,15 +37,15 @@ start_mow:
           max: 100
           unit_of_measurement: "m²"
     border_mode:
-      example: 0
-      default: 0
+      example: "0"
+      default: "0"
       required: false
       selector:
         select:
           translation_key: "border_mode"
           options:
-            - 0
-            - 1
+            - "0"
+            - "1"
     job_version:
       example: 0
       default: 0
@@ -70,30 +70,30 @@ start_mow:
           mode: box
           unit_of_measurement: "m/s"
     ultra_wave:
-      example: 2
-      default: 2
+      example: "2"
+      default: "2"
       selector:
         select:
           translation_key: "ultra_wave"
           options:
-            - 0
-            - 1
-            - 2
-            - 10
-            - 11
+            - "0"
+            - "1"
+            - "2"
+            - "10"
+            - "11"
       required: false
     channel_mode:
-      example: 0
-      default: 0
+      example: "0"
+      default: "0"
       required: false
       selector:
         select:
           translation_key: "channel_mode"
           options:
-            - 0
-            - 1
-            - 2
-            - 3
+            - "0"
+            - "1"
+            - "2"
+            - "3"
     channel_width:
       example: 25
       default: 25
@@ -103,15 +103,15 @@ start_mow:
           min: 5
           max: 35
     rain_tactics:
-      example: 1
-      default: 1
+      example: "1"
+      default: "1"
       required: false
       selector:
         select:
           translation_key: "rain_tactics"
           options:
-            - 0
-            - 1
+            - "0"
+            - "1"
     blade_height:
       example: 0
       default: 25
@@ -141,41 +141,41 @@ start_mow:
           max: 180
           unit_of_measurement: degrees
     toward_mode:
-      example: 0
-      default: 0
+      example: "0"
+      default: "0"
       selector:
         select:
           translation_key: "toward_mode"
           options:
-            - 0
-            - 1
-            - 2
+            - "0"
+            - "1"
+            - "2"
       required: false
     mowing_laps:
-      example: 1
-      default: 1
+      example: "1"
+      default: "1"
       selector:
         select:
           translation_key: "mowing_laps"
           options:
-            - 0
-            - 1
-            - 2
-            - 3
-            - 4
+            - "0"
+            - "1"
+            - "2"
+            - "3"
+            - "4"
       required: false
     obstacle_laps:
-      example: 1
-      default: 1
+      example: "1"
+      default: "1"
       selector:
         select:
           translation_key: "obstacle_laps"
           options:
-            - 0
-            - 1
-            - 2
-            - 3
-            - 4
+            - "0"
+            - "1"
+            - "2"
+            - "3"
+            - "4"
       required: false
     start_progress:
       example: 0

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "Mammotion-HA"
-version = "0.3.0"
+version = "0.3.1"
 description = "Mammotion lawn mower integration for HACS"
 authors = ["Michael Arthur <michael@jumblesoft.co.nz>", "jLynx <@jlynx>"]
 readme = "README.md"