tweak wakeup behavior

Author: antheas

src/hhd/device/claw/__init__.py

@@ -29,7 +29,6 @@ def __init__(self, dmi: str, dconf: dict) -> None:
         self.t = None
         self.should_exit = None
         self.updated = Event()
-        self.woke_up = Event()
         self.started = False
         self.t = None
 
@@ -45,7 +44,6 @@ def open(
         self.emit = emit
         self.context = context
         self.prev = None
-        self.woke_up.set()
 
     def settings(self) -> HHDSettings:
         base = {"controllers": {"claw": load_relative_yaml("controllers.yml")}}
@@ -90,7 +88,6 @@ def start(self, conf):
                 self.should_exit,
                 self.updated,
                 self.dconf,
-                self.woke_up,
             ),
         )
         self.t.start()
@@ -103,14 +100,6 @@ def close(self):
         self.should_exit = None
         self.t = None
 
-    def notify(self, events):
-        for ev in events:
-            if ev["type"] == "special" and ev.get("event", None) == "wakeup":
-                logger.info(
-                    f"Woke up from sleep, setting controller to Dinput mode."
-                )
-                self.woke_up.set()
-
 
 def autodetect(existing: Sequence[HHDPlugin]) -> Sequence[HHDPlugin]:
     if len(existing):

src/hhd/device/claw/base.py

@@ -167,7 +167,6 @@ def plugin_run(
     should_exit: TEvent,
     updated: TEvent,
     dconf: dict,
-    woke_up: TEvent,
 ):
     first = True
     first_disabled = True
@@ -223,7 +222,7 @@ def plugin_run(
             logger.info("Launching emulated controller.")
             updated.clear()
             init = time.perf_counter()
-            controller_loop(conf.copy(), should_exit, updated, dconf, emit, woke_up)
+            controller_loop(conf.copy(), should_exit, updated, dconf, emit)
             repeated_fail = False
         except Exception as e:
             failed_fast = init + LONGER_ERROR_MARGIN > time.perf_counter()
@@ -252,7 +251,6 @@ def controller_loop(
     updated: TEvent,
     dconf: dict,
     emit: Emitter,
-    woke_up: TEvent,
 ):
     debug = DEBUG_MODE
 
@@ -366,6 +364,7 @@ def prepare(m):
         prepare(d_vend)
 
         logger.info("Emulated controller launched, have fun!")
+        prev = 0
         while not should_exit.is_set() and not updated.is_set():
             start = time.perf_counter()
             # Add timeout to call consumers a minimum amount of times per second
@@ -379,9 +378,17 @@ def prepare(m):
                 if id(d) in to_run:
                     evs.extend(d.produce(r))
 
-            if woke_up.is_set():
-                woke_up.clear()
+            if start - prev > 1:
+                # After wakeup, the controller waits a bit until it
+                # realizes it woke up and switches to desktop mode.
+                # Therefore we need to wait otherwise we race it and
+                # end up stuck in desktop mode.
+                time.sleep(2)
+                logger.info("Setting controller to dinput mode.")
                 d_vend.set_dinput_mode()
+                prev = time.perf_counter()
+            else:
+                prev = start
 
             evs = multiplexer.process(evs)
             if evs: