Merge remote-tracking branch 'upstream/main'

Author: github-actions[bot]

main-ui/controller/controller.py

@@ -178,14 +178,11 @@ def get_input(timeout=-2, called_from_check_for_hotkey=False):
             # Reset hold delay and clear any lingering event
             Controller.hold_delay = PyUiConfig.get_turbo_delay_ms()
 
-            Controller.clear_last_input()
-
             # Blocking wait for event until timeout
+            elapsed = time.time() - start_time
+            remaining_time = timeout - elapsed
+            remaining_time = max(remaining_time, 0.001)
             while True:
-                elapsed = time.time() - start_time
-                remaining_time = timeout - elapsed
-                if remaining_time <= 0:
-                    break
 
                 ms_remaining = int(remaining_time * 1000)
                 input = Controller.controller_interface.get_input(ms_remaining)
@@ -203,6 +200,10 @@ def get_input(timeout=-2, called_from_check_for_hotkey=False):
                                 Controller.check_for_hotkey()
                     else:
                         break  # Valid non-hotkey input
+                elapsed = time.time() - start_time
+                remaining_time = timeout - elapsed
+                if remaining_time <= 0:
+                    break
 
 
         #TODO i think this loop is in the wrong place

main-ui/controller/key_watcher_controller.py

@@ -155,8 +155,8 @@ def key_change(self, controller_input, direction):
     def get_input(self, timeoutInMilliseconds):
         start_time = time.time()
         timeout = timeoutInMilliseconds / 1000.0
-
-        while (time.time() - start_time) < timeout:
+        do_get_input = True
+        while do_get_input:
             with self.lock:
                 # First, check the event queue
                 if self.input_queue:
@@ -171,6 +171,7 @@ def get_input(self, timeoutInMilliseconds):
                     return value
 
             time.sleep(0.005)
+            do_get_input = (time.time() - start_time) < timeout
 
         self.last_held_input = None
         return None

miyoo_mini_flip/keyshm/readme.txt

@@ -0,0 +1,6 @@
+docker build -t pyui_miyoomini .
+
+mkdir output
+docker run --rm -v ${PWD}/output:/output pyui_miyoomini cp set_monitor /output/
+docker run --rm -v ${PWD}/output:/output pyui_miyoomini cp send_event /output/
+docker run --rm -v ${PWD}/output:/output pyui_miyoomini cp getevent /output/