Merge pull request #96 from MelbourneHighSchoolRobotics/write_waits

Ensure `wait_for_tick` also waits for writes to occur.
MelbourneHighSchoolRobotics · Sep 11, 2020 · b70f5d0 · b70f5d0
2 parents 5fd6bf5 + ca255df
commit b70f5d0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/ev3sim/attach.py b/ev3sim/attach.py
@@ -235,8 +235,10 @@ def sleep(seconds):
 
                 data['last_checked_tick'] = data['tick']
                 def wait_for_tick():
-                    if data['last_checked_tick'] == data['tick']:
-                        with data['condition_updated']:
+                    with data['condition_updated']:
+                        while data['actions_queue'].qsize():
+                            data['condition_updated'].wait(0.1)
+                        if data['last_checked_tick'] == data['tick']:
                             while True:
                                 if data['last_checked_tick'] != data['tick']:
                                     data['last_checked_tick'] = data['tick']

diff --git a/setup.py b/setup.py
@@ -17,7 +17,7 @@
 
 setup(
     name="ev3sim",
-    version="1.2.2",
+    version="1.2.3",
     description="Simulate ev3dev programs in Python",
     long_description=README,
     long_description_content_type="text/markdown",