From 86ac59aadaf4bb9dc5f12f12011e1ab6770e926d Mon Sep 17 00:00:00 2001 From: Piv <18462828+Piv200@users.noreply.github.com> Date: Sun, 19 Apr 2020 13:53:31 +0930 Subject: [PATCH] Move car into another sub-directory --- .../DecisionSystem/CentralisedDecision/__init__.py | 0 .../CentralisedDecision/ballotvoter.py | 0 .../CentralisedDecision/cameraserver.py | 0 .../CentralisedDecision/central_server.py | 0 .../CentralisedDecision/centralisedinstance.py | 0 .../DecisionSystem/CentralisedDecision/commander.py | 0 .../DecisionSystem/CentralisedDecision/messenger.py | 0 .../DecisionSystem/CentralisedDecision/videoget.py | 0 .../DecentralisedActivityFusion/voter.py | 0 car/src/{ => car}/DecisionSystem/__init__.py | 0 car/src/{ => car}/DecisionSystem/messages.py | 0 car/src/{ => car}/GestureRecognition/HandRecHSV.py | 0 car/src/{ => car}/GestureRecognition/HandRecV2.py | 0 car/src/{ => car}/GestureRecognition/IMG_0818.png | Bin car/src/{ => car}/GestureRecognition/IMG_0825.jpg | Bin .../Neural Network hand Tracking.pdf | Bin .../GestureRecognition/SimpleHandRecogniser.py | 0 car/src/{ => car}/GestureRecognition/__init__.py | 0 .../GestureRecognition/frozen_inference_graph.pb | Bin car/src/{ => car}/GestureRecognition/graph.pbtxt | 0 .../{ => car}/GestureRecognition/handrecogniser.py | 0 .../{ => car}/GestureRecognition/kaleidoscope.py | 0 car/src/{ => car}/GestureRecognition/keras_ex.py | 0 .../GestureRecognition/opencvtensorflowex.py | 0 car/src/{ => car}/GestureRecognition/starkaleid.py | 0 car/src/{ => car}/Messaging/__init__.py | 0 car/src/{ => car}/Messaging/message_factory.py | 0 car/src/{ => car}/Messaging/messages.py | 0 car/src/{ => car}/Messaging/mqttsession.py | 0 car/src/{ => car}/__init__.py | 0 car/src/{ => car}/control/PythonRemoteController.py | 0 car/src/{ => car}/control/__init__.py | 0 car/src/{ => car}/control/gpio/__init__.py | 0 car/src/{ => car}/control/gpio/mockvehicle.py | 0 car/src/{ => car}/control/gpio/vehicle.py | 0 car/src/{ => car}/control/motor_servicer.py | 0 car/src/{ => car}/controller.py | 0 car/src/{ => car}/slam/__init__.py | 0 car/src/{ => car}/slam/slam_servicer.py | 0 car/src/{ => car}/slam/slam_streamer.py | 0 car/src/{ => car}/slam/zmq_pair_testing/pair.py | 0 car/src/{ => car}/tracking/__init__.py | 0 car/src/{ => car}/tracking/algorithms.py | 0 car/src/{ => car}/tracking/all_scans.txt | Bin car/src/{ => car}/tracking/animate.py | 0 car/src/{ => car}/tracking/animate_alg.py | 0 car/src/{ => car}/tracking/devices/__init__.py | 0 car/src/{ => car}/tracking/devices/factory.py | 9 +++++++-- car/src/{ => car}/tracking/devices/mock_lidar.py | 0 car/src/{ => car}/tracking/lidar_cache.py | 0 car/src/{ => car}/tracking/lidar_loader.py | 0 car/src/{ => car}/tracking/lidar_servicer.py | 0 car/src/{ => car}/tracking/lidar_tester.py | 0 car/src/{ => car}/tracking/out.pickle | Bin car/src/{ => car}/tracking/readme.txt | 0 .../main/proto/{ => car}/control/motorService.proto | 0 protobuf/src/main/proto/{ => car}/empty.proto | 0 .../main/proto/{ => car}/slam/SlamController.proto | 2 +- .../proto/{ => car}/tracking/lidar_tracker.proto | 2 +- 59 files changed, 9 insertions(+), 4 deletions(-) rename car/src/{ => car}/DecisionSystem/CentralisedDecision/__init__.py (100%) rename car/src/{ => car}/DecisionSystem/CentralisedDecision/ballotvoter.py (100%) rename car/src/{ => car}/DecisionSystem/CentralisedDecision/cameraserver.py (100%) rename car/src/{ => car}/DecisionSystem/CentralisedDecision/central_server.py (100%) rename car/src/{ => car}/DecisionSystem/CentralisedDecision/centralisedinstance.py (100%) rename car/src/{ => car}/DecisionSystem/CentralisedDecision/commander.py (100%) rename car/src/{ => car}/DecisionSystem/CentralisedDecision/messenger.py (100%) rename car/src/{ => car}/DecisionSystem/CentralisedDecision/videoget.py (100%) rename car/src/{ => car}/DecisionSystem/DecentralisedActivityFusion/voter.py (100%) rename car/src/{ => car}/DecisionSystem/__init__.py (100%) rename car/src/{ => car}/DecisionSystem/messages.py (100%) rename car/src/{ => car}/GestureRecognition/HandRecHSV.py (100%) rename car/src/{ => car}/GestureRecognition/HandRecV2.py (100%) rename car/src/{ => car}/GestureRecognition/IMG_0818.png (100%) rename car/src/{ => car}/GestureRecognition/IMG_0825.jpg (100%) rename car/src/{ => car}/GestureRecognition/Neural Network hand Tracking.pdf (100%) rename car/src/{ => car}/GestureRecognition/SimpleHandRecogniser.py (100%) rename car/src/{ => car}/GestureRecognition/__init__.py (100%) rename car/src/{ => car}/GestureRecognition/frozen_inference_graph.pb (100%) rename car/src/{ => car}/GestureRecognition/graph.pbtxt (100%) rename car/src/{ => car}/GestureRecognition/handrecogniser.py (100%) rename car/src/{ => car}/GestureRecognition/kaleidoscope.py (100%) rename car/src/{ => car}/GestureRecognition/keras_ex.py (100%) rename car/src/{ => car}/GestureRecognition/opencvtensorflowex.py (100%) rename car/src/{ => car}/GestureRecognition/starkaleid.py (100%) rename car/src/{ => car}/Messaging/__init__.py (100%) rename car/src/{ => car}/Messaging/message_factory.py (100%) rename car/src/{ => car}/Messaging/messages.py (100%) rename car/src/{ => car}/Messaging/mqttsession.py (100%) rename car/src/{ => car}/__init__.py (100%) rename car/src/{ => car}/control/PythonRemoteController.py (100%) rename car/src/{ => car}/control/__init__.py (100%) rename car/src/{ => car}/control/gpio/__init__.py (100%) rename car/src/{ => car}/control/gpio/mockvehicle.py (100%) rename car/src/{ => car}/control/gpio/vehicle.py (100%) rename car/src/{ => car}/control/motor_servicer.py (100%) rename car/src/{ => car}/controller.py (100%) rename car/src/{ => car}/slam/__init__.py (100%) rename car/src/{ => car}/slam/slam_servicer.py (100%) rename car/src/{ => car}/slam/slam_streamer.py (100%) rename car/src/{ => car}/slam/zmq_pair_testing/pair.py (100%) rename car/src/{ => car}/tracking/__init__.py (100%) rename car/src/{ => car}/tracking/algorithms.py (100%) rename car/src/{ => car}/tracking/all_scans.txt (100%) rename car/src/{ => car}/tracking/animate.py (100%) rename car/src/{ => car}/tracking/animate_alg.py (100%) rename car/src/{ => car}/tracking/devices/__init__.py (100%) rename car/src/{ => car}/tracking/devices/factory.py (55%) rename car/src/{ => car}/tracking/devices/mock_lidar.py (100%) rename car/src/{ => car}/tracking/lidar_cache.py (100%) rename car/src/{ => car}/tracking/lidar_loader.py (100%) rename car/src/{ => car}/tracking/lidar_servicer.py (100%) rename car/src/{ => car}/tracking/lidar_tester.py (100%) rename car/src/{ => car}/tracking/out.pickle (100%) rename car/src/{ => car}/tracking/readme.txt (100%) rename protobuf/src/main/proto/{ => car}/control/motorService.proto (100%) rename protobuf/src/main/proto/{ => car}/empty.proto (100%) rename protobuf/src/main/proto/{ => car}/slam/SlamController.proto (95%) rename protobuf/src/main/proto/{ => car}/tracking/lidar_tracker.proto (95%) diff --git a/car/src/DecisionSystem/CentralisedDecision/__init__.py b/car/src/car/DecisionSystem/CentralisedDecision/__init__.py similarity index 100% rename from car/src/DecisionSystem/CentralisedDecision/__init__.py rename to car/src/car/DecisionSystem/CentralisedDecision/__init__.py diff --git a/car/src/DecisionSystem/CentralisedDecision/ballotvoter.py b/car/src/car/DecisionSystem/CentralisedDecision/ballotvoter.py similarity index 100% rename from car/src/DecisionSystem/CentralisedDecision/ballotvoter.py rename to car/src/car/DecisionSystem/CentralisedDecision/ballotvoter.py diff --git a/car/src/DecisionSystem/CentralisedDecision/cameraserver.py b/car/src/car/DecisionSystem/CentralisedDecision/cameraserver.py similarity index 100% rename from car/src/DecisionSystem/CentralisedDecision/cameraserver.py rename to car/src/car/DecisionSystem/CentralisedDecision/cameraserver.py diff --git a/car/src/DecisionSystem/CentralisedDecision/central_server.py b/car/src/car/DecisionSystem/CentralisedDecision/central_server.py similarity index 100% rename from car/src/DecisionSystem/CentralisedDecision/central_server.py rename to car/src/car/DecisionSystem/CentralisedDecision/central_server.py diff --git a/car/src/DecisionSystem/CentralisedDecision/centralisedinstance.py b/car/src/car/DecisionSystem/CentralisedDecision/centralisedinstance.py similarity index 100% rename from car/src/DecisionSystem/CentralisedDecision/centralisedinstance.py rename to car/src/car/DecisionSystem/CentralisedDecision/centralisedinstance.py diff --git a/car/src/DecisionSystem/CentralisedDecision/commander.py b/car/src/car/DecisionSystem/CentralisedDecision/commander.py similarity index 100% rename from car/src/DecisionSystem/CentralisedDecision/commander.py rename to car/src/car/DecisionSystem/CentralisedDecision/commander.py diff --git a/car/src/DecisionSystem/CentralisedDecision/messenger.py b/car/src/car/DecisionSystem/CentralisedDecision/messenger.py similarity index 100% rename from car/src/DecisionSystem/CentralisedDecision/messenger.py rename to car/src/car/DecisionSystem/CentralisedDecision/messenger.py diff --git a/car/src/DecisionSystem/CentralisedDecision/videoget.py b/car/src/car/DecisionSystem/CentralisedDecision/videoget.py similarity index 100% rename from car/src/DecisionSystem/CentralisedDecision/videoget.py rename to car/src/car/DecisionSystem/CentralisedDecision/videoget.py diff --git a/car/src/DecisionSystem/DecentralisedActivityFusion/voter.py b/car/src/car/DecisionSystem/DecentralisedActivityFusion/voter.py similarity index 100% rename from car/src/DecisionSystem/DecentralisedActivityFusion/voter.py rename to car/src/car/DecisionSystem/DecentralisedActivityFusion/voter.py diff --git a/car/src/DecisionSystem/__init__.py b/car/src/car/DecisionSystem/__init__.py similarity index 100% rename from car/src/DecisionSystem/__init__.py rename to car/src/car/DecisionSystem/__init__.py diff --git a/car/src/DecisionSystem/messages.py b/car/src/car/DecisionSystem/messages.py similarity index 100% rename from car/src/DecisionSystem/messages.py rename to car/src/car/DecisionSystem/messages.py diff --git a/car/src/GestureRecognition/HandRecHSV.py b/car/src/car/GestureRecognition/HandRecHSV.py similarity index 100% rename from car/src/GestureRecognition/HandRecHSV.py rename to car/src/car/GestureRecognition/HandRecHSV.py diff --git a/car/src/GestureRecognition/HandRecV2.py b/car/src/car/GestureRecognition/HandRecV2.py similarity index 100% rename from car/src/GestureRecognition/HandRecV2.py rename to car/src/car/GestureRecognition/HandRecV2.py diff --git a/car/src/GestureRecognition/IMG_0818.png b/car/src/car/GestureRecognition/IMG_0818.png similarity index 100% rename from car/src/GestureRecognition/IMG_0818.png rename to car/src/car/GestureRecognition/IMG_0818.png diff --git a/car/src/GestureRecognition/IMG_0825.jpg b/car/src/car/GestureRecognition/IMG_0825.jpg similarity index 100% rename from car/src/GestureRecognition/IMG_0825.jpg rename to car/src/car/GestureRecognition/IMG_0825.jpg diff --git a/car/src/GestureRecognition/Neural Network hand Tracking.pdf b/car/src/car/GestureRecognition/Neural Network hand Tracking.pdf similarity index 100% rename from car/src/GestureRecognition/Neural Network hand Tracking.pdf rename to car/src/car/GestureRecognition/Neural Network hand Tracking.pdf diff --git a/car/src/GestureRecognition/SimpleHandRecogniser.py b/car/src/car/GestureRecognition/SimpleHandRecogniser.py similarity index 100% rename from car/src/GestureRecognition/SimpleHandRecogniser.py rename to car/src/car/GestureRecognition/SimpleHandRecogniser.py diff --git a/car/src/GestureRecognition/__init__.py b/car/src/car/GestureRecognition/__init__.py similarity index 100% rename from car/src/GestureRecognition/__init__.py rename to car/src/car/GestureRecognition/__init__.py diff --git a/car/src/GestureRecognition/frozen_inference_graph.pb b/car/src/car/GestureRecognition/frozen_inference_graph.pb similarity index 100% rename from car/src/GestureRecognition/frozen_inference_graph.pb rename to car/src/car/GestureRecognition/frozen_inference_graph.pb diff --git a/car/src/GestureRecognition/graph.pbtxt b/car/src/car/GestureRecognition/graph.pbtxt similarity index 100% rename from car/src/GestureRecognition/graph.pbtxt rename to car/src/car/GestureRecognition/graph.pbtxt diff --git a/car/src/GestureRecognition/handrecogniser.py b/car/src/car/GestureRecognition/handrecogniser.py similarity index 100% rename from car/src/GestureRecognition/handrecogniser.py rename to car/src/car/GestureRecognition/handrecogniser.py diff --git a/car/src/GestureRecognition/kaleidoscope.py b/car/src/car/GestureRecognition/kaleidoscope.py similarity index 100% rename from car/src/GestureRecognition/kaleidoscope.py rename to car/src/car/GestureRecognition/kaleidoscope.py diff --git a/car/src/GestureRecognition/keras_ex.py b/car/src/car/GestureRecognition/keras_ex.py similarity index 100% rename from car/src/GestureRecognition/keras_ex.py rename to car/src/car/GestureRecognition/keras_ex.py diff --git a/car/src/GestureRecognition/opencvtensorflowex.py b/car/src/car/GestureRecognition/opencvtensorflowex.py similarity index 100% rename from car/src/GestureRecognition/opencvtensorflowex.py rename to car/src/car/GestureRecognition/opencvtensorflowex.py diff --git a/car/src/GestureRecognition/starkaleid.py b/car/src/car/GestureRecognition/starkaleid.py similarity index 100% rename from car/src/GestureRecognition/starkaleid.py rename to car/src/car/GestureRecognition/starkaleid.py diff --git a/car/src/Messaging/__init__.py b/car/src/car/Messaging/__init__.py similarity index 100% rename from car/src/Messaging/__init__.py rename to car/src/car/Messaging/__init__.py diff --git a/car/src/Messaging/message_factory.py b/car/src/car/Messaging/message_factory.py similarity index 100% rename from car/src/Messaging/message_factory.py rename to car/src/car/Messaging/message_factory.py diff --git a/car/src/Messaging/messages.py b/car/src/car/Messaging/messages.py similarity index 100% rename from car/src/Messaging/messages.py rename to car/src/car/Messaging/messages.py diff --git a/car/src/Messaging/mqttsession.py b/car/src/car/Messaging/mqttsession.py similarity index 100% rename from car/src/Messaging/mqttsession.py rename to car/src/car/Messaging/mqttsession.py diff --git a/car/src/__init__.py b/car/src/car/__init__.py similarity index 100% rename from car/src/__init__.py rename to car/src/car/__init__.py diff --git a/car/src/control/PythonRemoteController.py b/car/src/car/control/PythonRemoteController.py similarity index 100% rename from car/src/control/PythonRemoteController.py rename to car/src/car/control/PythonRemoteController.py diff --git a/car/src/control/__init__.py b/car/src/car/control/__init__.py similarity index 100% rename from car/src/control/__init__.py rename to car/src/car/control/__init__.py diff --git a/car/src/control/gpio/__init__.py b/car/src/car/control/gpio/__init__.py similarity index 100% rename from car/src/control/gpio/__init__.py rename to car/src/car/control/gpio/__init__.py diff --git a/car/src/control/gpio/mockvehicle.py b/car/src/car/control/gpio/mockvehicle.py similarity index 100% rename from car/src/control/gpio/mockvehicle.py rename to car/src/car/control/gpio/mockvehicle.py diff --git a/car/src/control/gpio/vehicle.py b/car/src/car/control/gpio/vehicle.py similarity index 100% rename from car/src/control/gpio/vehicle.py rename to car/src/car/control/gpio/vehicle.py diff --git a/car/src/control/motor_servicer.py b/car/src/car/control/motor_servicer.py similarity index 100% rename from car/src/control/motor_servicer.py rename to car/src/car/control/motor_servicer.py diff --git a/car/src/controller.py b/car/src/car/controller.py similarity index 100% rename from car/src/controller.py rename to car/src/car/controller.py diff --git a/car/src/slam/__init__.py b/car/src/car/slam/__init__.py similarity index 100% rename from car/src/slam/__init__.py rename to car/src/car/slam/__init__.py diff --git a/car/src/slam/slam_servicer.py b/car/src/car/slam/slam_servicer.py similarity index 100% rename from car/src/slam/slam_servicer.py rename to car/src/car/slam/slam_servicer.py diff --git a/car/src/slam/slam_streamer.py b/car/src/car/slam/slam_streamer.py similarity index 100% rename from car/src/slam/slam_streamer.py rename to car/src/car/slam/slam_streamer.py diff --git a/car/src/slam/zmq_pair_testing/pair.py b/car/src/car/slam/zmq_pair_testing/pair.py similarity index 100% rename from car/src/slam/zmq_pair_testing/pair.py rename to car/src/car/slam/zmq_pair_testing/pair.py diff --git a/car/src/tracking/__init__.py b/car/src/car/tracking/__init__.py similarity index 100% rename from car/src/tracking/__init__.py rename to car/src/car/tracking/__init__.py diff --git a/car/src/tracking/algorithms.py b/car/src/car/tracking/algorithms.py similarity index 100% rename from car/src/tracking/algorithms.py rename to car/src/car/tracking/algorithms.py diff --git a/car/src/tracking/all_scans.txt b/car/src/car/tracking/all_scans.txt similarity index 100% rename from car/src/tracking/all_scans.txt rename to car/src/car/tracking/all_scans.txt diff --git a/car/src/tracking/animate.py b/car/src/car/tracking/animate.py similarity index 100% rename from car/src/tracking/animate.py rename to car/src/car/tracking/animate.py diff --git a/car/src/tracking/animate_alg.py b/car/src/car/tracking/animate_alg.py similarity index 100% rename from car/src/tracking/animate_alg.py rename to car/src/car/tracking/animate_alg.py diff --git a/car/src/tracking/devices/__init__.py b/car/src/car/tracking/devices/__init__.py similarity index 100% rename from car/src/tracking/devices/__init__.py rename to car/src/car/tracking/devices/__init__.py diff --git a/car/src/tracking/devices/factory.py b/car/src/car/tracking/devices/factory.py similarity index 55% rename from car/src/tracking/devices/factory.py rename to car/src/car/tracking/devices/factory.py index f624460..3ac3bea 100644 --- a/car/src/tracking/devices/factory.py +++ b/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")) + diff --git a/car/src/tracking/devices/mock_lidar.py b/car/src/car/tracking/devices/mock_lidar.py similarity index 100% rename from car/src/tracking/devices/mock_lidar.py rename to car/src/car/tracking/devices/mock_lidar.py diff --git a/car/src/tracking/lidar_cache.py b/car/src/car/tracking/lidar_cache.py similarity index 100% rename from car/src/tracking/lidar_cache.py rename to car/src/car/tracking/lidar_cache.py diff --git a/car/src/tracking/lidar_loader.py b/car/src/car/tracking/lidar_loader.py similarity index 100% rename from car/src/tracking/lidar_loader.py rename to car/src/car/tracking/lidar_loader.py diff --git a/car/src/tracking/lidar_servicer.py b/car/src/car/tracking/lidar_servicer.py similarity index 100% rename from car/src/tracking/lidar_servicer.py rename to car/src/car/tracking/lidar_servicer.py diff --git a/car/src/tracking/lidar_tester.py b/car/src/car/tracking/lidar_tester.py similarity index 100% rename from car/src/tracking/lidar_tester.py rename to car/src/car/tracking/lidar_tester.py diff --git a/car/src/tracking/out.pickle b/car/src/car/tracking/out.pickle similarity index 100% rename from car/src/tracking/out.pickle rename to car/src/car/tracking/out.pickle diff --git a/car/src/tracking/readme.txt b/car/src/car/tracking/readme.txt similarity index 100% rename from car/src/tracking/readme.txt rename to car/src/car/tracking/readme.txt diff --git a/protobuf/src/main/proto/control/motorService.proto b/protobuf/src/main/proto/car/control/motorService.proto similarity index 100% rename from protobuf/src/main/proto/control/motorService.proto rename to protobuf/src/main/proto/car/control/motorService.proto diff --git a/protobuf/src/main/proto/empty.proto b/protobuf/src/main/proto/car/empty.proto similarity index 100% rename from protobuf/src/main/proto/empty.proto rename to protobuf/src/main/proto/car/empty.proto diff --git a/protobuf/src/main/proto/slam/SlamController.proto b/protobuf/src/main/proto/car/slam/SlamController.proto similarity index 95% rename from protobuf/src/main/proto/slam/SlamController.proto rename to protobuf/src/main/proto/car/slam/SlamController.proto index 7f7eb4d..b4e91c8 100644 --- a/protobuf/src/main/proto/slam/SlamController.proto +++ b/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; diff --git a/protobuf/src/main/proto/tracking/lidar_tracker.proto b/protobuf/src/main/proto/car/tracking/lidar_tracker.proto similarity index 95% rename from protobuf/src/main/proto/tracking/lidar_tracker.proto rename to protobuf/src/main/proto/car/tracking/lidar_tracker.proto index e39c16d..3f8d2f4 100644 --- a/protobuf/src/main/proto/tracking/lidar_tracker.proto +++ b/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;