Merge pull request #112 from MelbourneHighSchoolRobotics/event_fix

Ensure event queue is instantiated regardless of attached code.
MelbourneHighSchoolRobotics · Sep 16, 2020 · f0d6702 · f0d6702
2 parents 336199e + e95de12
commit f0d6702
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/ev3sim/robot.py b/ev3sim/robot.py
@@ -1,3 +1,4 @@
+from queue import Queue
 from ev3sim.simulation.interactor import IInteractor
 from ev3sim.simulation.loader import ScriptLoader
 from ev3sim.simulation.world import stop_on_pause
@@ -48,6 +49,7 @@ def initialise_bot(topLevelConfig, filename, prefix):
             )
             robot.ID = prefix
             ScriptLoader.instance.robots[prefix] = robot
+            ScriptLoader.instance.data["events"][robot.ID] = Queue()
         except yaml.YAMLError as exc:
             print(f"An error occurred while loading robot preset {filename}. Exited with error: {exc}")
 

diff --git a/ev3sim/simulation/communication.py b/ev3sim/simulation/communication.py
@@ -26,7 +26,6 @@ def start_server_with_shared_data(data, result, bind_addr):
         class SimulationDealer(ev3sim.simulation.comm_schema_pb2_grpc.SimulationDealerServicer):
             def RequestTickUpdates(self, request, context):
                 rob_id = request.robot_id
-                data["events"][rob_id] = Queue()
                 if rob_id not in data["active_count"]:
                     data["active_count"][rob_id] = 0
                 data["active_count"][rob_id] += 1

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