Move await to schedule_task_when_awake()

Author: bouwew

plugwise_usb/nodes/scan.py

@@ -156,7 +156,7 @@ 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())
+        # await self.schedule_task_when_awake(self._configure_scan_task())
         # self._scan_config_task_scheduled = True
 
     async def _load_from_cache(self) -> bool:
@@ -308,7 +308,7 @@ async def set_motion_daylight_mode(self, state: bool) -> bool:
         self._new_motion_config = replace(self._new_motion_config, daylight_mode=state)
         if not self._scan_config_task_scheduled:
             self._scan_config_task_scheduled = True
-            await self.schedule_task_when_awake(await self._configure_scan_task())
+            await self.schedule_task_when_awake(self._configure_scan_task())
             _LOGGER.debug(
                 "set_motion_daylight_mode | Device %s | config scheduled",
                 self.name,
@@ -338,7 +338,7 @@ async def set_motion_reset_timer(self, minutes: int) -> bool:
                 self.name,
             )
             self._scan_config_task_scheduled = True
-            await self.schedule_task_when_awake(await self._configure_scan_task())
+            await self.schedule_task_when_awake(self._configure_scan_task())
         return True
 
     @raise_not_loaded
@@ -358,7 +358,7 @@ async def set_motion_sensitivity_level(self, level: MotionSensitivity) -> bool:
         )
         if not self._scan_config_task_scheduled:
             self._scan_config_task_scheduled = True
-            await self.schedule_task_when_awake(await self._configure_scan_task())
+            await self.schedule_task_when_awake(self._configure_scan_task())
             _LOGGER.debug(
                 "set_motion_sensitivity_level | Device %s | config scheduled",
                 self.name,

plugwise_usb/nodes/sed.py

@@ -170,10 +170,10 @@ 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))
+        await self.schedule_task_when_awake(self.node_info_update(None))
         # self._sed_config_task_scheduled = True
         # self._new_battery_config = self._battery_config
-        # await self.schedule_task_when_awake(await self._configure_sed_task())
+        # await self.schedule_task_when_awake(self._configure_sed_task())
 
     async def _load_from_cache(self) -> bool:
         """Load states from previous cached information. Returns True if successful."""
@@ -665,7 +665,7 @@ async def schedule_task_when_awake(
         _LOGGER.debug("Add task %s to queue waiting for awake", task_fn)
         if iscoroutine(task_fn):
             async with self._send_task_lock:
-                self._send_task_queue.append(task_fn)
+                self._send_task_queue.append(await task_fn)
 
     async def sed_configure(  # pylint: disable=too-many-arguments
         self,