Merge pull request #217 from natekspencer/dev

Adjust LR4 status to handle cat detect/sensor timing more appropriately

Author: natekspencer

pylitterbot/robot/litterrobot4.py

@@ -260,11 +260,12 @@ def status(self) -> LitterBoxStatus:
             return LitterBoxStatus.OFFLINE
         if status := CYCLE_STATE_STATUS_MAP.get(self._data["robotCycleState"]):
             return status
-        if status := DISPLAY_CODE_STATUS_MAP.get(self._data["displayCode"]):
-            return status
         status = LR4_STATUS_MAP.get(self._data["robotStatus"], LitterBoxStatus.UNKNOWN)
-        if status == LitterBoxStatus.READY and self.is_waste_drawer_full:
-            return LitterBoxStatus.DRAWER_FULL
+        if status == LitterBoxStatus.READY:
+            if display_code := DISPLAY_CODE_STATUS_MAP.get(self._data["displayCode"]):
+                return display_code
+            if self.is_waste_drawer_full:
+                return LitterBoxStatus.DRAWER_FULL
         return status
 
     @property

tests/test_litterrobot4.py

@@ -405,6 +405,17 @@ async def test_litter_robot_4_cleaning(mock_account: Account) -> None:
         ({"robotStatus": "ROBOT_POWER_OFF"}, LitterBoxStatus.OFF),
         ({"robotStatus": "ROBOT_POWER_UP"}, LitterBoxStatus.POWER_UP),
         ({"displayCode": "DC_CAT_DETECT"}, LitterBoxStatus.CAT_DETECTED),
+        (
+            {"displayCode": "DC_CAT_DETECT", "robotStatus": "ROBOT_CAT_DETECT_DELAY"},
+            LitterBoxStatus.CAT_SENSOR_TIMING,
+        ),
+        (
+            {
+                "displayCode": "DC_CAT_DETECT",
+                "robotCycleState": "CYCLE_STATE_CAT_DETECT",
+            },
+            LitterBoxStatus.CAT_SENSOR_INTERRUPTED,
+        ),
     ],
 )
 async def test_litter_robot_4_status(