From 00af23e6fc20407efa9d6df457a9b70ac5320ff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Jald=C3=A9n?= <jalden@kth.se>
Date: Sat, 4 Jan 2025 14:03:38 +0100
Subject: [PATCH] Changed from deprecated constants to VacuumActivity enum and
 to activity property from setting the state property directly

---
 custom_components/wellbeing/vacuum.py | 56 ++++++++++++---------------
 1 file changed, 24 insertions(+), 32 deletions(-)

diff --git a/custom_components/wellbeing/vacuum.py b/custom_components/wellbeing/vacuum.py
index 8b3d428..8f46fc0 100644
--- a/custom_components/wellbeing/vacuum.py
+++ b/custom_components/wellbeing/vacuum.py
@@ -4,15 +4,7 @@
 import logging
 import math
 
-from homeassistant.components.vacuum import StateVacuumEntity, VacuumEntityFeature
-from homeassistant.components.vacuum import (
-    STATE_CLEANING,
-    STATE_PAUSED,
-    STATE_RETURNING,
-    STATE_IDLE,
-    STATE_DOCKED,
-    STATE_ERROR,
-)
+from homeassistant.components.vacuum import StateVacuumEntity, VacuumActivity, VacuumEntityFeature
 from homeassistant.const import Platform
 from homeassistant.util.percentage import ranged_value_to_percentage
 
@@ -31,26 +23,26 @@
     | VacuumEntityFeature.BATTERY
 )
 
-VACUUM_STATES = {
-    1: STATE_CLEANING,  # Regular Cleaning
-    2: STATE_PAUSED,
-    3: STATE_CLEANING,  # Stop cleaning
-    4: STATE_PAUSED,  # Pause Spot cleaning
-    5: STATE_RETURNING,
-    6: STATE_PAUSED,  # Paused returning
-    7: STATE_RETURNING,  # Returning for pitstop
-    8: STATE_PAUSED,  # Paused returning for pitstop
-    9: STATE_DOCKED,  # Charging
-    10: STATE_IDLE,
-    11: STATE_ERROR,
-    12: STATE_DOCKED,  # Pitstop
-    13: STATE_IDLE,  # Manual stearing
-    14: STATE_IDLE,  # Firmware upgrading
-    "idle": STATE_IDLE,            # robot700series idle
-    "inProgress": STATE_CLEANING,  # robot700series cleaning
-    "goingHome": STATE_RETURNING,  # robot700series returning
-    "paused": STATE_PAUSED,        # robot700series paused
-    "sleeping": STATE_DOCKED,      # robot700series sleeping
+VACUUM_ACTIVITIES = {
+    1: VacuumActivity.CLEANING,  # Regular Cleaning
+    2: VacuumActivity.PAUSED,
+    3: VacuumActivity.CLEANING,  # Stop cleaning
+    4: VacuumActivity.PAUSED,  # Pause Spot cleaning
+    5: VacuumActivity.RETURNING,
+    6: VacuumActivity.PAUSED,  # Paused returning
+    7: VacuumActivity.RETURNING,  # Returning for pitstop
+    8: VacuumActivity.PAUSED,  # Paused returning for pitstop
+    9: VacuumActivity.DOCKED,  # Charging
+    10: VacuumActivity.IDLE,
+    11: VacuumActivity.ERROR,
+    12: VacuumActivity.DOCKED,  # Pitstop
+    13: VacuumActivity.IDLE,  # Manual stearing
+    14: VacuumActivity.IDLE,  # Firmware upgrading
+    "idle": VacuumActivity.IDLE,            # robot700series idle
+    "inProgress": VacuumActivity.CLEANING,  # robot700series cleaning
+    "goingHome": VacuumActivity.RETURNING,  # robot700series returning
+    "paused": VacuumActivity.PAUSED,        # robot700series paused
+    "sleeping": VacuumActivity.DOCKED,      # robot700series sleeping
 }
 
 VACUUM_CHARGING_STATES = [9, 'idle']
@@ -98,9 +90,9 @@ def supported_features(self) -> int:
         return SUPPORTED_FEATURES
 
     @property
-    def state(self):
-        """Return the state of the vacuum."""
-        return VACUUM_STATES.get(self.get_entity.state, STATE_ERROR)
+    def activity(self):
+        """Return the current vacuum activity."""
+        return VACUUM_ACTIVITIES.get(self.get_entity.state, VacuumActivity.ERROR)
 
     @property
     def battery_level(self):