Running with threads

This commit is contained in:
simondlevy
2016-08-23 14:00:12 -04:00
parent 81dfdadc43
commit 1c6287848b

View File

@@ -43,7 +43,38 @@ from mines import MinesLaser, Rover, load_data
from pltslamshow import SlamShow
from sys import argv, exit
from time import time
from time import time, sleep
from threading import Thread
def threadfunc(robot, slam, lidars, odometries, use_odometry, mapbytes, pose):
# Loop over scans
for scanno in range(len(lidars)):
if use_odometry:
# Convert odometry to velocities
velocities = robot.computeVelocities(odometries[scanno])
# Update SLAM with lidar and velocities
slam.update(lidars[scanno], velocities)
else:
# Update SLAM with lidar alone
slam.update(lidars[scanno])
# Get new position
pose[0],pose[1],pose[2] = slam.getpos()
# Get new map
slam.getmap(mapbytes)
# XXX Add delay for real-time plot
sleep(.1)
print(scanno)
def main():
@@ -80,34 +111,20 @@ def main():
start_time = time()
# Loop over scans
for scanno in range(nscans):
pose = [0,0,0]
if use_odometry:
# Launch the data-collection / update thread
thread = Thread(target=threadfunc, args=(robot, slam, lidars, odometries, use_odometry, mapbytes, pose))
thread.daemon = True
thread.start()
# Convert odometry to velocities
velocities = robot.computeVelocities(odometries[scanno])
# Update SLAM with lidar and velocities
slam.update(lidars[scanno], velocities)
else:
# Update SLAM with lidar alone
slam.update(lidars[scanno])
# Get new position
x_mm, y_mm, theta_degrees = slam.getpos()
# Get new map
slam.getmap(mapbytes)
while True:
# Display map and robot pose
display.displayMap(mapbytes)
display.setPose(*pose)
display.setPose(x_mm, y_mm, theta_degrees)
# Exit gracefully if user closes display
# Refresh the display, exiting gracefully if user closes it
if not display.refresh():
exit(0)
@@ -115,7 +132,7 @@ def main():
print(curr_time - start_time)
start_time = curr_time
# XXX Add delay for real-time plot
sleep(.01)
# Helpers ---------------------------------------------------------