Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -10,7 +10,7 @@ import grpc
|
||||
import MotorControl.motorService_pb2 as motorService_pb2
|
||||
import MotorControl.motorService_pb2_grpc as motorService_pb2_grpc
|
||||
from MotorControl.gpiozero.motor_session import Motor
|
||||
from SlamController.slam_streamer import SlamStreamer
|
||||
from SlamController.slam_servicer import SlamServicer
|
||||
import SlamController.SlamController_pb2_grpc as SlamController_pb2_grpc
|
||||
|
||||
|
||||
@@ -63,7 +63,7 @@ class MotorServicer(motorService_pb2_grpc.CarControlServicer):
|
||||
time.sleep(60*60)
|
||||
|
||||
def create_slam_servicer(self):
|
||||
return SlamStreamer()
|
||||
return SlamServicer('/dev/ttyUSB0')
|
||||
|
||||
def create_credentials(self):
|
||||
pvtKeyPath = '/home/pi/tls/device.key'
|
||||
|
||||
Reference in New Issue
Block a user