Make robust
This commit is contained in:
@@ -14,7 +14,8 @@ class Simulation:
|
|||||||
self.poses[n] = random.uniform(0, arena.width), random.uniform(0, arena.height), random.uniform(0, 360)
|
self.poses[n] = random.uniform(0, arena.width), random.uniform(0, arena.height), random.uniform(0, 360)
|
||||||
|
|
||||||
async def run(self):
|
async def run(self):
|
||||||
for n in range(3):
|
try:
|
||||||
|
for _ in range(3):
|
||||||
encoder_left = robot.left_encoder.read()
|
encoder_left = robot.left_encoder.read()
|
||||||
encoder_right = robot.right_encoder.read()
|
encoder_right = robot.right_encoder.read()
|
||||||
robot.set_left(0.5)
|
robot.set_left(0.5)
|
||||||
@@ -26,8 +27,7 @@ class Simulation:
|
|||||||
for pose in self.poses:
|
for pose in self.poses:
|
||||||
pose[0] += speed_in_mm * np.cos(np.radians(pose[2]))
|
pose[0] += speed_in_mm * np.cos(np.radians(pose[2]))
|
||||||
pose[1] += speed_in_mm * np.sin(np.radians(pose[2]))
|
pose[1] += speed_in_mm * np.sin(np.radians(pose[2]))
|
||||||
# pose[2] += robot.ticks_to_degrees(left_movement - right_movement) / robot.wheel_separation_mm
|
finally:
|
||||||
# pose[2] = pose[2] % 360
|
|
||||||
robot.stop()
|
robot.stop()
|
||||||
|
|
||||||
async def command_handler(simulation):
|
async def command_handler(simulation):
|
||||||
@@ -55,11 +55,11 @@ async def command_handler(simulation):
|
|||||||
robot.uart.write((json.dumps(response)+"\n").encode())
|
robot.uart.write((json.dumps(response)+"\n").encode())
|
||||||
elif request["command"] == "start":
|
elif request["command"] == "start":
|
||||||
print("Starting simulation")
|
print("Starting simulation")
|
||||||
if simulation_task is None:
|
if simulation_task is None or simulation_task.done():
|
||||||
simulation_task = asyncio.create_task(simulation.run())
|
simulation_task = asyncio.create_task(simulation.run())
|
||||||
elif request["command"] == "stop":
|
elif request["command"] == "stop":
|
||||||
robot.stop()
|
robot.stop()
|
||||||
if simulation_task:
|
if simulation_task and not simulation_task.done():
|
||||||
simulation_task.cancel()
|
simulation_task.cancel()
|
||||||
simulation_task = None
|
simulation_task = None
|
||||||
else:
|
else:
|
||||||
|
|||||||
Reference in New Issue
Block a user