Clean up project directory.
This commit is contained in:
@@ -1,7 +1,8 @@
|
||||
import rplidar
|
||||
from rplidar import RPLidar
|
||||
from threading import Thread
|
||||
import algorithms
|
||||
from persontracking import algorithms
|
||||
import zmq
|
||||
|
||||
class LidarCache():
|
||||
'''
|
||||
@@ -14,7 +15,8 @@ class LidarCache():
|
||||
currentGroups = None
|
||||
groupsChanged = []
|
||||
|
||||
def __init__(self, measurements=100):
|
||||
def __init__(self, port, measurements=100):
|
||||
self.port = port
|
||||
self.lidar = RPLidar('/dev/ttyUSB0')
|
||||
self.measurements = measurements
|
||||
print('Info: ' + self.lidar.get_info())
|
||||
@@ -28,6 +30,11 @@ class LidarCache():
|
||||
'''
|
||||
Performs a scan for the given number of iterations.
|
||||
'''
|
||||
|
||||
# Create the 0MQ socket first. This should not be passed between threads.
|
||||
self._socket = self._create_socket()
|
||||
self._socket.bind("tcp://*:" + str(self.port))
|
||||
|
||||
for i, scan in enumerate(self.lidar.iter_scans(min_len=self.measurements)):
|
||||
print('%d: Got %d measurments' % (i, len(scan)))
|
||||
if(not self.run):
|
||||
@@ -40,7 +47,13 @@ class LidarCache():
|
||||
self.currentGroups = algorithms.calc_groups(scan)
|
||||
|
||||
def fireGroupsChanged(self):
|
||||
# Send the updated groups to 0MQ socket.
|
||||
# self._socket.send_multipart(["lidar_map", ...])
|
||||
pass
|
||||
|
||||
def stop_scanning(self):
|
||||
self.run = False
|
||||
|
||||
def _create_socket(self):
|
||||
return zmq.Context.instance().socket(zmq.PUB)
|
||||
|
||||
Reference in New Issue
Block a user