Try 2

Author: bouwew

plugwise_usb/nodes/scan.py

@@ -155,7 +155,8 @@ async def _load_defaults(self) -> None:
         self._new_reset_timer = SCAN_DEFAULT_MOTION_RESET_TIMER
         self._new_daylight_mode = SCAN_DEFAULT_DAYLIGHT_MODE
         self._new_sensitivity_level = SCAN_DEFAULT_SENSITIVITY
-        await self.schedule_task_when_awake(await self._configure_scan_task())
+        task = await self._configure_scan_task()
+        await self.schedule_task_when_awake(task)
         self._scan_config_task_scheduled = True
 
     async def _load_from_cache(self) -> bool:
@@ -304,7 +305,8 @@ async def set_motion_daylight_mode(self, state: bool) -> bool:
         if self._motion_config.daylight_mode == state:
             return False
         if not self._scan_config_task_scheduled:
-            await self.schedule_task_when_awake(await self._configure_scan_task())
+            task = await self._configure_scan_task()
+            await self.schedule_task_when_awake(task)
             self._scan_config_task_scheduled = True
             _LOGGER.debug(
                 "set_motion_daylight_mode | Device %s | config scheduled",
@@ -329,7 +331,8 @@ async def set_motion_reset_timer(self, minutes: int) -> bool:
         if self._motion_config.reset_timer == minutes:
             return False
         if not self._scan_config_task_scheduled:
-            await self.schedule_task_when_awake(await self._configure_scan_task())
+            task = await self._configure_scan_task()
+            await self.schedule_task_when_awake(task)
             self._scan_config_task_scheduled = True
             _LOGGER.debug(
                 "set_motion_reset_timer | Device %s | config scheduled",
@@ -350,7 +353,8 @@ async def set_motion_sensitivity_level(self, level: MotionSensitivity) -> bool:
         if self._motion_config.sensitivity_level == level:
             return False
         if not self._scan_config_task_scheduled:
-            await self.schedule_task_when_awake(await self._configure_scan_task())
+            task = await self._configure_scan_task()
+            await self.schedule_task_when_awake(task)
             self._scan_config_task_scheduled = True
             _LOGGER.debug(
                 "set_motion_sensitivity_level | Device %s | config scheduled",

plugwise_usb/nodes/sed.py

@@ -169,10 +169,12 @@ async def _load_defaults(self) -> None:
             maintenance_interval=SED_DEFAULT_MAINTENANCE_INTERVAL,
             sleep_duration=SED_DEFAULT_SLEEP_DURATION,
         )
-        await self.schedule_task_when_awake(await self.node_info_update(None))
+        task = await self.node_info_update(None)
+        await self.schedule_task_when_awake(task)
         self._sed_config_task_scheduled = True
         self._new_battery_config = self._battery_config
-        await self.schedule_task_when_awake(await self._configure_sed_task())
+        task = await await self._configure_sed_task()
+        await self.schedule_task_when_awake(task)
 
     async def _load_from_cache(self) -> bool:
         """Load states from previous cached information. Returns True if successful."""
@@ -251,7 +253,8 @@ async def set_awake_duration(self, seconds: int) -> bool:
             self._new_battery_config, awake_duration=seconds
         )
         if not self._sed_config_task_scheduled:
-            await self.schedule_task_when_awake(await self._configure_sed_task())
+            task = await self._configure_sed_task()
+            await self.schedule_task_when_awake(task)
             self._sed_config_task_scheduled = True
             _LOGGER.debug(
                 "set_awake_duration | Device %s | config scheduled",
@@ -281,7 +284,8 @@ async def set_clock_interval(self, minutes: int) -> bool:
             self._new_battery_config, clock_interval=minutes
         )
         if not self._sed_config_task_scheduled:
-            await self.schedule_task_when_awake(await self._configure_sed_task())
+            task = await self._configure_sed_task()
+            await self.schedule_task_when_awake(task)
             self._sed_config_task_scheduled = True
             _LOGGER.debug(
                 "set_clock_interval | Device %s | config scheduled",
@@ -304,7 +308,8 @@ async def set_clock_sync(self, sync: bool) -> bool:
 
         self._new_battery_config = replace(self._new_battery_config, clock_sync=sync)
         if not self._sed_config_task_scheduled:
-            await self.schedule_task_when_awake(await self._configure_sed_task())
+            task = await self._configure_sed_task()
+            await self.schedule_task_when_awake(task)
             self._sed_config_task_scheduled = True
             _LOGGER.debug(
                 "set_clock_sync | Device %s | config scheduled",
@@ -334,7 +339,8 @@ async def set_maintenance_interval(self, minutes: int) -> bool:
             self._new_battery_config, maintenance_interval=minutes
         )
         if not self._sed_config_task_scheduled:
-            await self.schedule_task_when_awake(await self._configure_sed_task())
+            task = await self._configure_sed_task()
+            await self.schedule_task_when_awake(task)
             self._sed_config_task_scheduled = True
             _LOGGER.debug(
                 "set_maintenance_interval | Device %s | config scheduled",
@@ -367,7 +373,8 @@ async def set_sleep_duration(self, minutes: int) -> bool:
             self._new_battery_config, sleep_duration=minutes
         )
         if not self._sed_config_task_scheduled:
-            await self.schedule_task_when_awake(await self._configure_sed_task())
+            task = await self._configure_sed_task()
+            await self.schedule_task_when_awake(task)
             self._sed_config_task_scheduled = True
             _LOGGER.debug(
                 "set_sleep_duration | Device %s | config scheduled",