Scan: MotionSensitivity all the way

Author: bouwew

plugwise_usb/messages/requests.py

@@ -9,6 +9,7 @@
 import logging
 from typing import Any
 
+from ..api import MotionSensitivity
 from ..constants import (
     DAY_IN_MINUTES,
     HOUR_IN_MINUTES,
@@ -1376,14 +1377,14 @@ def __init__(
         send_fn: Callable[[PlugwiseRequest, bool], Awaitable[PlugwiseResponse | None]],
         mac: bytes,
         reset_timer: int,
-        sensitivity: int,
+        sensitivity: MotionSensitivity,
         light: bool,
     ):
         """Initialize ScanConfigureRequest message object."""
         super().__init__(send_fn, mac)
         reset_timer_value = Int(reset_timer, length=2)
         # Sensitivity: HIGH(0x14),  MEDIUM(0x1E),  OFF(0xFF)
-        sensitivity_value = Int(sensitivity, length=2)
+        sensitivity_value = Int(sensitivity.value, length=2)
         light_temp = 1 if light else 0
         light_value = Int(light_temp, length=2)
         self._args += [

plugwise_usb/nodes/scan.py

@@ -165,7 +165,7 @@ async def _load_from_cache(self) -> bool:
         self._motion_config = MotionConfig(
             daylight_mode=daylight_mode,
             reset_timer=reset_timer,
-            sensitivity_level=sensitivity_level.value,
+            sensitivity_level=sensitivity_level,
             dirty=dirty,
         )
         if dirty:
@@ -274,11 +274,11 @@ def reset_timer(self) -> int:
         return DEFAULT_RESET_TIMER
 
     @property
-    def sensitivity_level(self) -> int:
+    def sensitivity_level(self) -> MotionSensitivity:
         """Sensitivity level of motion sensor."""
         if self._motion_config.sensitivity_level is not None:
             return self._motion_config.sensitivity_level
-        return DEFAULT_SENSITIVITY.value
+        return DEFAULT_SENSITIVITY
 
     # endregion
     # region Configuration actions
@@ -331,14 +331,14 @@ async def set_motion_sensitivity_level(self, level: MotionSensitivity) -> bool:
         _LOGGER.debug(
             "set_motion_sensitivity_level | Device %s | %s -> %s",
             self.name,
-            self._motion_config.sensitivity_level,
-            level.value,
+            self._motion_config.sensitivity_level.name,
+            level.name,
         )
-        if self._motion_config.sensitivity_level == level.value:
+        if self._motion_config.sensitivity_level == level:
             return False
         self._motion_config = replace(
             self._motion_config,
-            sensitivity_level=level.value,
+            sensitivity_level=level,
             dirty=True,
         )
         await self._scan_configure_update()
@@ -478,7 +478,7 @@ async def _scan_configure_update(self) -> None:
         self._set_cache(CACHE_SCAN_CONFIG_RESET_TIMER, str(self.reset_timer))
         self._set_cache(
             CACHE_SCAN_CONFIG_SENSITIVITY,
-            self._motion_config.sensitivity_level,
+            self._motion_config.sensitivity_level.name,
         )
         self._set_cache(CACHE_SCAN_CONFIG_DAYLIGHT_MODE, str(self.daylight_mode))
         self._set_cache(CACHE_SCAN_CONFIG_DIRTY, str(self.dirty))

tests/test_usb.py

@@ -1494,7 +1494,7 @@ async def test_creating_request_messages(self) -> None:
             self.dummy_fn,
             b"1111222233334444",
             5,  # Delay in minutes when signal is send when no motion is detected
-            30,  # Sensitivity of Motion sensor (High, Medium, Off)
+            pw_api.MotionSensitivity.MEDIUM,  # Sensitivity of Motion sensor (High, Medium, Off)
             False,  # Daylight override to only report motion when lightlevel is below calibrated level
         )
         assert (
@@ -2240,8 +2240,10 @@ async def load_callback(event: pw_api.NodeEvent, mac: str) -> None:  # type: ign
         assert test_scan.motion_config.daylight_mode
 
         # test motion sensitivity level
-        assert test_scan.sensitivity_level == 30
-        assert test_scan.motion_config.sensitivity_level == 30
+        assert test_scan.sensitivity_level == pw_api.MotionSensitivity.MEDIUM
+        assert (
+            test_scan.motion_config.sensitivity_level == pw_api.MotionSensitivity.MEDIUM
+        )
         assert not await test_scan.set_motion_sensitivity_level(
             pw_api.MotionSensitivity.MEDIUM
         )
@@ -2261,8 +2263,10 @@ async def load_callback(event: pw_api.NodeEvent, mac: str) -> None:  # type: ign
         await test_scan._awake_response(awake_response4)  # pylint: disable=protected-access
         await asyncio.sleep(0.001)  # Ensure time for task to be executed
         assert not test_scan.motion_config.dirty
-        assert test_scan.sensitivity_level == 20
-        assert test_scan.motion_config.sensitivity_level == 20
+        assert test_scan.sensitivity_level == pw_api.MotionSensitivity.HIGH
+        assert (
+            test_scan.motion_config.sensitivity_level == pw_api.MotionSensitivity.HIGH
+        )
 
         # scan with cache enabled
         mock_stick_controller.send_response = None