Move car into another sub-directory

car/src/car/tracking/devices/factory.py

@@ -1,5 +1,4 @@
 from tracking.devices.mock_lidar import MockLidar
-from rplidar import RPLidar
 import tracking.lidar_loader as loader
 
 # connection = "TEST"
@@ -10,4 +9,10 @@ def get_lidar():
     if connection == 'TEST':
         return MockLidar(loader.load_scans_bytes_file("tracking/out.pickle"))
     else:
-        return RPLidar(connection)
+        try:
+            from rplidar import RPLidar
+            return RPLidar(connection)
+        except ImportError:
+            print('Could not import RPLidar, using mock with testing data.')
+            return MockLidar(loader.load_scans_bytes_file("tracking/out.pickle"))
+

protobuf/src/main/proto/car/slam/SlamController.proto

@@ -4,7 +4,7 @@ option java_multiple_files = true;
 option java_package = "org.vato.carcontroller";
 option java_outer_classname = "SlamControllerProto";
 
-import "empty.proto";
+import "car/empty.proto";
 
 message SlamDetails {
     int32 map_size_pixels = 1;

protobuf/src/main/proto/car/tracking/lidar_tracker.proto

@@ -6,7 +6,7 @@ option java_multiple_files = true;
 option java_package = "org.vato.carcontroller";
 option java_outer_classname = "PersonTrackingProto";
 
-import "empty.proto";
+import "car/empty.proto";
 
 message Int32Value{
     int32 value = 1;