fix publishing of NodeFeature.MOTION_CONFIG and revert change on NodeFeature.BATTERY

Author: dirixmjm

plugwise_usb/nodes/scan.py

@@ -102,8 +102,8 @@ async def load(self) -> None:
         await super().load()
 
         self._setup_protocol(SCAN_FIRMWARE_SUPPORT, SCAN_FEATURES)
-        await self.initialize()
         await self._loaded_callback(NodeEvent.LOADED, self.mac)
+        await self.initialize()
 
     async def initialize(self) -> None:
         """Initialize Scan node."""
@@ -170,11 +170,6 @@ async def _load_from_cache(self) -> bool:
         )
         if dirty:
             await self._scan_configure_update()
-        else:
-            await self.publish_feature_update_to_subscribers(
-                NodeFeature.MOTION_CONFIG,
-                self._motion_config,
-            )
         return super_load_success
 
     def _daylight_mode_from_cache(self) -> bool | None:
@@ -431,6 +426,10 @@ async def _run_awake_tasks(self) -> None:
         await super()._run_awake_tasks()
         if self._motion_config.dirty:
             await self._configure_scan_task()
+        await self.publish_feature_update_to_subscribers(
+                NodeFeature.MOTION_CONFIG,
+                self._motion_config,
+            )
 
     async def _configure_scan_task(self) -> bool:
         """Configure Scan device settings. Returns True if successful."""

plugwise_usb/nodes/sed.py

@@ -175,11 +175,6 @@ async def _load_from_cache(self) -> bool:
         )
         if dirty:
             await self._sed_configure_update()
-        else:
-            await self.publish_feature_update_to_subscribers(
-                NodeFeature.BATTERY,
-                self._battery_config,
-            )
         self._awake_timestamp_from_cache()
         self._awake_reason_from_cache()
         return super_load_success