From 54770d767511b0e6e28d1bba721b5aafe43c131c Mon Sep 17 00:00:00 2001
From: Piv <18462828+Piv200@users.noreply.github.com>
Date: Wed, 22 Apr 2020 20:57:41 +0930
Subject: [PATCH 1/6] Add recording functionality, did some other minor tweaks
 as well to protos

---
 .idea/gradle.xml                              |  1 +
 .idea/vcs.xml                                 |  1 -
 .vscode/launch.json                           |  8 +-
 .../vato/carcontroller/LIDAR/LidarView.java   |  5 +-
 .../org/vato/carcontroller/SLAM/SlamView.java |  5 +-
 car/src/car/Messaging/message_factory.py      |  2 +-
 .../gpio/recording_vehicle_decorator.py       | 82 +++++++++++++++++++
 car/src/car/control/motor_servicer.py         | 10 ++-
 car/src/car/slam/slam_streamer.py             |  2 +-
 .../car/tracking/devices/recording_lidar.py   | 52 ++++++++++++
 car/src/car/tracking/lidar_servicer.py        |  8 +-
 .../main/proto/car/control/motorService.proto | 14 +++-
 protobuf/src/main/proto/car/empty.proto       |  9 --
 .../main/proto/car/slam/SlamController.proto  |  6 +-
 .../proto/car/tracking/lidar_tracker.proto    |  8 +-
 15 files changed, 184 insertions(+), 29 deletions(-)
 create mode 100644 car/src/car/control/gpio/recording_vehicle_decorator.py
 create mode 100644 car/src/car/tracking/devices/recording_lidar.py
 delete mode 100644 protobuf/src/main/proto/car/empty.proto

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8276e9a..4834459 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 3e7f7d9..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/car" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
index bc78a2e..8973bfd 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,10 +5,14 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Python: Module",
+            "name": "Car Module",
             "type": "python",
             "request": "launch",
-            "module": "car"
+            "module": "car",
+            "env": {
+                "CAR_LIDAR": "LIDAR_MOCK",
+                "CAR_VEHICLE": "CAR_MOCK"
+            }
         },
         {
             "name": "Python: Current File",
diff --git a/app/src/main/java/org/vato/carcontroller/LIDAR/LidarView.java b/app/src/main/java/org/vato/carcontroller/LIDAR/LidarView.java
index 89f0ac3..c6142b2 100644
--- a/app/src/main/java/org/vato/carcontroller/LIDAR/LidarView.java
+++ b/app/src/main/java/org/vato/carcontroller/LIDAR/LidarView.java
@@ -13,7 +13,8 @@ import android.view.SurfaceView;
 
 import androidx.preference.PreferenceManager;
 
-import org.vato.carcontroller.Empty;
+import com.google.protobuf.Empty;
+
 import org.vato.carcontroller.Int32Value;
 import org.vato.carcontroller.PersonTrackingGrpc;
 import org.vato.carcontroller.PointScan;
@@ -89,7 +90,7 @@ public class LidarView extends SurfaceView implements AbstractUpdater.MapChanged
             }
         };
         // use async grpc method, ZMQ doesn't need to connect straight away.
-        stub.startTracking(Int32Value.newBuilder().setValue(Integer.parseInt(port)).build(), response);
+        stub.startTracking(Empty.newBuilder().build(), response);
     }
 
     @Override
diff --git a/app/src/main/java/org/vato/carcontroller/SLAM/SlamView.java b/app/src/main/java/org/vato/carcontroller/SLAM/SlamView.java
index ddc017c..91a9263 100644
--- a/app/src/main/java/org/vato/carcontroller/SLAM/SlamView.java
+++ b/app/src/main/java/org/vato/carcontroller/SLAM/SlamView.java
@@ -13,8 +13,8 @@ import android.view.SurfaceView;
 import androidx.preference.PreferenceManager;
 
 import com.google.protobuf.ByteString;
+import com.google.protobuf.Empty;
 
-import org.vato.carcontroller.Empty;
 import org.vato.carcontroller.SlamControlGrpc;
 import org.vato.carcontroller.SlamDetails;
 import org.vato.carcontroller.SlamLocation;
@@ -57,7 +57,7 @@ public class SlamView extends SurfaceView implements AbstractUpdater.MapChangedL
     private void init() {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
         String host = prefs.getString("host", "10.0.0.53");
-        port = prefs.getString("zmqPort", "5050");
+        port = prefs.getString("zmqPort", "50052");
         String gRPCPort = prefs.getString("port", "50051");
         mapSizePixels = Integer.parseInt(prefs.getString("MAPSIZEPIXELS", "540"));
         mapSizeMeters = Integer.parseInt(prefs.getString("MAPSIZEMETRES", "10"));
@@ -96,7 +96,6 @@ public class SlamView extends SurfaceView implements AbstractUpdater.MapChangedL
         stub.startMapStreaming(SlamDetails.newBuilder()
                 .setMapSizePixels(mapSizePixels)
                 .setMapSizeMeters(mapSizeMeters)
-                .setPort(Integer.parseInt(port))
                 .build(), response);
     }
 
diff --git a/car/src/car/Messaging/message_factory.py b/car/src/car/Messaging/message_factory.py
index 1888468..0076666 100644
--- a/car/src/car/Messaging/message_factory.py
+++ b/car/src/car/Messaging/message_factory.py
@@ -22,7 +22,7 @@ class ZmqPubSubStreamer:
         self.send_message_topic("", message)
 
     def send_message_topic(self, topic, message):
-        self._socket.send_multipart([bytes(topic), message.serialise()])
+        self._socket.send_multipart([topic, message.serialise()])
 
 
 class BluetoothStreamer:
diff --git a/car/src/car/control/gpio/recording_vehicle_decorator.py b/car/src/car/control/gpio/recording_vehicle_decorator.py
new file mode 100644
index 0000000..1ce0090
--- /dev/null
+++ b/car/src/car/control/gpio/recording_vehicle_decorator.py
@@ -0,0 +1,82 @@
+import datetime
+
+
+class VehicleRecordingDecorator:
+    def __init__(self, vehicle):
+        """
+        A decorator for a vehicle object to record the changes in steering/throttle.
+        This will be recorded to memory, and will save to the given file when save is called.
+
+        Parameters
+        ----------
+
+        vehicle
+            Base vehicle to decorate.
+
+        outfile: str
+            Filename to write to. Will create/overwrite existing file. You must call save to save the 
+            data to the file.
+        """
+        self._vehicle = vehicle
+        self._recording = False
+        self._records = []
+
+    @property
+    def vehicle(self):
+        return self._vehicle
+
+    def save_data(self, outfile):
+        """
+        Flushes all current records to disk.
+        """
+        with open(outfile, 'w') as f:
+            for line in self._records:
+                f.write('%s\n' % line)
+        self._records = []
+
+    @property
+    def record(self):
+        return self._recording
+
+    @record.setter
+    def record(self, value):
+        self._recording = True
+
+    @property
+    def throttle(self):
+        return self._vehicle.throttle
+
+    @throttle.setter
+    def throttle(self, value):
+        if self._recording:
+            self._records.append(('t', value, str(datetime.datetime.now())))
+        self._vehicle.throttle = value
+
+    @property
+    def steering(self):
+        return self._vehicle.steering
+
+    @steering.setter
+    def steering(self, value):
+        if self._recording:
+            self._records.append(('s', value, str(datetime.datetime.now())))
+        self._vehicle.steering = value
+
+    @property
+    def motor_pin(self):
+        return self._vehicle.motor_pin
+
+    @motor_pin.setter
+    def motor_pin(self, value):
+        self._vehicle.motor_pin = value
+
+    @property
+    def steering_pin(self):
+        return self._vehicle.steering_pin
+
+    @steering_pin.setter
+    def steering_pin(self, value):
+        self._vehicle.steering_pin = value
+
+    def stop(self):
+        self.throttle = 0
diff --git a/car/src/car/control/motor_servicer.py b/car/src/car/control/motor_servicer.py
index 2b3052a..3b2218c 100644
--- a/car/src/car/control/motor_servicer.py
+++ b/car/src/car/control/motor_servicer.py
@@ -4,10 +4,12 @@ import time
 
 import car.control.motorService_pb2 as motorService_pb2
 import car.control.motorService_pb2_grpc as motorService_pb2_grpc
+from car.control.gpio.recording_vehicle_decorator import VehicleRecordingDecorator
+
 
 class MotorServicer(motorService_pb2_grpc.CarControlServicer):
     def __init__(self, vehicle):
-        self.vehicle = vehicle
+        self.vehicle = VehicleRecordingDecorator(vehicle)
         self._timer = None
 
     def SetThrottle(self, request, context):
@@ -38,3 +40,9 @@ class MotorServicer(motorService_pb2_grpc.CarControlServicer):
         print("Node timeout elapsed")
         self.vehicle.stop()
 
+    def Record(self, request, context):
+        """Indicate whether the vehicle data should be recorded."""
+        self.vehicle.record = request.record
+
+    def SaveRecordedData(self, request, context):
+        self.vehicle.save_data(request.file)
diff --git a/car/src/car/slam/slam_streamer.py b/car/src/car/slam/slam_streamer.py
index 1602b1f..117a37b 100644
--- a/car/src/car/slam/slam_streamer.py
+++ b/car/src/car/slam/slam_streamer.py
@@ -83,7 +83,7 @@ class SlamStreamer:
                                                            location=SlamLocation(x=location[0], y=location[1], theta=location[2])))
         print('Sending map')
         self._mFactory.send_message_topic(
-            'slam_map', protoScan)
+            b'slam_map', protoScan)
 
     def stop_scanning(self):
         self.can_scan = False
diff --git a/car/src/car/tracking/devices/recording_lidar.py b/car/src/car/tracking/devices/recording_lidar.py
new file mode 100644
index 0000000..8f486a4
--- /dev/null
+++ b/car/src/car/tracking/devices/recording_lidar.py
@@ -0,0 +1,52 @@
+import datetime
+
+
+class RecordingLidarDecorator:
+
+    def __init__(self, lidar):
+        self._lidar = lidar
+        self._scans = []
+        self._record = False
+
+    @property
+    def record(self):
+        return self._record
+
+    @record.setter
+    def record(self, value):
+        self.record = value
+
+    def save_data(self, filename):
+        with open(filename, 'w') as f:
+            for scan in self._scans:
+                f.write("%s\n" % scan)
+
+    def iter_scans(self, min_len=100):
+        # Need to customise the iterable.
+        return RecordingIterator(self._lidar.iter_scans(min_len), self._scans)
+
+    def get_health(self):
+        return self._lidar.get_health()
+
+    def get_info(self):
+        return self._lidar.get_info()
+
+    def stop(self):
+        return self._lidar.stop()
+
+    def disconnect(self):
+        return self._lidar.disconnect()
+
+
+class RecordingIterator:
+    def __init__(self, iterator, scan_list):
+        self._iterator = iterator
+        self._scans = scan_list
+
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        nextIter = next(self._iterator)
+        self._scans.append((nextIter, str(datetime.datetime.now())))
+        return nextIter
diff --git a/car/src/car/tracking/lidar_servicer.py b/car/src/car/tracking/lidar_servicer.py
index c987f8c..391d649 100644
--- a/car/src/car/tracking/lidar_servicer.py
+++ b/car/src/car/tracking/lidar_servicer.py
@@ -4,6 +4,7 @@ from car.tracking.lidar_cache import LidarCache
 from multiprocessing import Process
 import car.messaging.message_factory as mf
 import car.tracking.devices.factory as lidar_factory
+from car.tracking.devices.recording_lidar import RecordingLidarDecorator
 
 from car.messaging import messages
 import car.tracking.algorithms as alg
@@ -15,7 +16,8 @@ class LidarServicer(PersonTrackingServicer):
     def __init__(self, vehicle=None):
         # TODO: Put the rplidar creation in a factory or something, to make it possible to test this servicer.
         # Also, it would allow creating the service without the lidar being connected.
-        self.cache = LidarCache(lidar_factory.get_lidar(), measurements=100)
+        self.cache = LidarCache(RecordingLidarDecorator(
+            lidar_factory.get_lidar()), measurements=100)
         self.cache.add_groups_changed_listener(self)
         self._mFactory = None
         self._port = 50052 if 'CAR_ZMQ_PORT' not in os.environ else os.environ[
@@ -34,6 +36,10 @@ class LidarServicer(PersonTrackingServicer):
         """Starts the lidar cache, streaming on the provided port."""
         self.cache.start_cache()
 
+    def setRecordData(self, request, context):
+        # Set the vehicles to record their changes.
+        pass
+
     def onGroupsChanged(self, message):
         if self._mFactory is None:
             # Create the zmq socket in the thread that it will be used, just to be safe.
diff --git a/protobuf/src/main/proto/car/control/motorService.proto b/protobuf/src/main/proto/car/control/motorService.proto
index 87b2372..65ae5ba 100644
--- a/protobuf/src/main/proto/car/control/motorService.proto
+++ b/protobuf/src/main/proto/car/control/motorService.proto
@@ -7,6 +7,8 @@ option java_multiple_files = true;
 option java_package = "org.vato.carcontroller";
 option java_outer_classname = "MotorServiceProto";
 
+import "google/protobuf/empty.proto";
+
 message ThrottleRequest{
     float throttle = 1;
 }
@@ -23,7 +25,17 @@ message SteeringResponse{
     bool steeringSet = 1;
 }
 
+message RecordingReqeust{
+    bool record = 1;
+}
+
+message SaveRequest{
+    string file = 1;
+}
+
 service CarControl{
     rpc SetThrottle(ThrottleRequest) returns (ThrottleResponse){}
     rpc SetSteering(SteeringRequest) returns (SteeringResponse){}
-}
\ No newline at end of file
+    rpc Record(RecordingReqeust) returns (google.protobuf.Empty) {}
+    rpc SaveRecordedData(SaveRequest) returns (google.protobuf.Empty) {}
+}
diff --git a/protobuf/src/main/proto/car/empty.proto b/protobuf/src/main/proto/car/empty.proto
deleted file mode 100644
index b69a8a3..0000000
--- a/protobuf/src/main/proto/car/empty.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-option java_multiple_files = true;
-option java_package = "org.vato.carcontroller";
-option java_outer_classname = "EmptyProto";
-
-message Empty{
-
-}
\ No newline at end of file
diff --git a/protobuf/src/main/proto/car/slam/SlamController.proto b/protobuf/src/main/proto/car/slam/SlamController.proto
index 95c96cd..d47b7a3 100644
--- a/protobuf/src/main/proto/car/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 "car/empty.proto";
+import "google/protobuf/empty.proto";
 
 message SlamDetails {
     int32 map_size_pixels = 1;
@@ -27,7 +27,7 @@ message SlamScan{
 }
 
 service SlamControl {
-    rpc start_map_streaming(SlamDetails) returns (Empty) {}
+    rpc start_map_streaming(SlamDetails) returns (google.protobuf.Empty) {}
 
-    rpc stop_streaming(Empty) returns (Empty) {}
+    rpc stop_streaming(google.protobuf.Empty) returns (google.protobuf.Empty) {}
 }
\ No newline at end of file
diff --git a/protobuf/src/main/proto/car/tracking/lidar_tracker.proto b/protobuf/src/main/proto/car/tracking/lidar_tracker.proto
index 01ec62b..6b918b5 100644
--- a/protobuf/src/main/proto/car/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 "car/empty.proto";
+import "google/protobuf/empty.proto";
 
 message Int32Value{
     int32 value = 1;
@@ -23,9 +23,9 @@ message PointScan{
 }
 
 service PersonTracking{
-    rpc set_tracking_group(Int32Value) returns (Empty) {}
+    rpc set_tracking_group(Int32Value) returns (google.protobuf.Empty) {}
 
-    rpc stop_tracking(Empty) returns (Empty) {}
+    rpc stop_tracking(google.protobuf.Empty) returns (google.protobuf.Empty) {}
 
-    rpc start_tracking(Empty) returns (Empty) {}
+    rpc start_tracking(google.protobuf.Empty) returns (google.protobuf.Empty) {}
 }
\ No newline at end of file

From 807921b58f83c9fdc20906017e79551f068d01b0 Mon Sep 17 00:00:00 2001
From: Piv <18462828+Piv200@users.noreply.github.com>
Date: Wed, 22 Apr 2020 22:22:08 +0930
Subject: [PATCH 2/6] Add recording capability to simple controller.

---
 .../java/org/vato/carcontroller/PiLoader.java | 13 ++++++++
 .../vato/carcontroller/SimpleController.java  | 18 +++++++++--
 .../activity_simple_controller.xml            | 31 +++++++++++++++++++
 3 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/vato/carcontroller/PiLoader.java b/app/src/main/java/org/vato/carcontroller/PiLoader.java
index 83f440e..484064d 100644
--- a/app/src/main/java/org/vato/carcontroller/PiLoader.java
+++ b/app/src/main/java/org/vato/carcontroller/PiLoader.java
@@ -1,6 +1,8 @@
 package org.vato.carcontroller;
 
 
+import com.google.protobuf.Empty;
+
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -68,4 +70,15 @@ public class PiLoader implements Runnable {
             }
         }
     }
+
+    public void saveRecording() {
+        // Ideally don't want to use a blocking stub here, android may complain.
+        Empty done = stub.saveRecordedData(SaveRequest.newBuilder().setFile("Test").build());
+    }
+
+
+    public void record(boolean record) {
+        // Ideally don't want to use a blocking stub here, android may complain.
+        Empty done = stub.record(RecordingReqeust.newBuilder().setRecord(record).build());
+    }
 }
diff --git a/app/src/main/java/org/vato/carcontroller/SimpleController.java b/app/src/main/java/org/vato/carcontroller/SimpleController.java
index 0ce0b45..d28b59a 100644
--- a/app/src/main/java/org/vato/carcontroller/SimpleController.java
+++ b/app/src/main/java/org/vato/carcontroller/SimpleController.java
@@ -2,15 +2,19 @@ package org.vato.carcontroller;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.view.View;
 import android.widget.SeekBar;
+import android.widget.Switch;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.preference.PreferenceManager;
 
 public class SimpleController extends AppCompatActivity implements SeekBar.OnSeekBarChangeListener {
 
-    SeekBar steeringSlider;
-    SeekBar throttleSlider;
+    private SeekBar steeringSlider;
+    private SeekBar throttleSlider;
+    private Switch recordSwitch;
+
     private static PiLoader grpcController;
 
     @Override
@@ -26,6 +30,8 @@ public class SimpleController extends AppCompatActivity implements SeekBar.OnSee
         if (throttleSlider != null) {
             throttleSlider.setOnSeekBarChangeListener(this);
         }
+
+        recordSwitch = findViewById(R.id.recordSwitch);
     }
 
     @Override
@@ -83,4 +89,12 @@ public class SimpleController extends AppCompatActivity implements SeekBar.OnSee
         steeringSlider.setProgress(50);
         throttleSlider.setProgress(50);
     }
+
+    public void saveRecording(View view) {
+        grpcController.saveRecording();
+    }
+
+    public void record(View view) {
+        grpcController.record(recordSwitch.isSelected());
+    }
 }
diff --git a/app/src/main/res/layout-land/activity_simple_controller.xml b/app/src/main/res/layout-land/activity_simple_controller.xml
index 7858f7e..7eeadab 100644
--- a/app/src/main/res/layout-land/activity_simple_controller.xml
+++ b/app/src/main/res/layout-land/activity_simple_controller.xml
@@ -28,4 +28,35 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
+    <Switch
+        android:id="@+id/recordSwitch"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="20dp"
+        android:text="Switch"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView3" />
+
+    <TextView
+        android:id="@+id/textView3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="20dp"
+        android:text="TextView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Recording" />
+
+    <Button
+        android:id="@+id/saveButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:layout_marginEnd="16dp"
+        android:text="Save"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 9a16f02d77acaad1d19219f5dae5389f0b7540a3 Mon Sep 17 00:00:00 2001
From: Piv <18462828+Piv200@users.noreply.github.com>
Date: Thu, 23 Apr 2020 21:13:54 +0930
Subject: [PATCH 3/6] Provision lidar servicer to support recording data
 without streaming.

---
 car/src/car/tracking/lidar_servicer.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/car/src/car/tracking/lidar_servicer.py b/car/src/car/tracking/lidar_servicer.py
index 391d649..552da00 100644
--- a/car/src/car/tracking/lidar_servicer.py
+++ b/car/src/car/tracking/lidar_servicer.py
@@ -14,38 +14,38 @@ import os
 class LidarServicer(PersonTrackingServicer):
 
     def __init__(self, vehicle=None):
-        # TODO: Put the rplidar creation in a factory or something, to make it possible to test this servicer.
-        # Also, it would allow creating the service without the lidar being connected.
-        self.cache = LidarCache(RecordingLidarDecorator(
-            lidar_factory.get_lidar()), measurements=100)
+        self._lidar = RecordingLidarDecorator(
+            lidar_factory.get_lidar())
+        self.cache = LidarCache(self._lidar, measurements=100)
         self.cache.add_groups_changed_listener(self)
         self._mFactory = None
         self._port = 50052 if 'CAR_ZMQ_PORT' not in os.environ else os.environ[
             'CAR_ZMQ_PORT']
         self._vehicle = vehicle
         self._tracked_group = None
+        self._should_stream = False
 
     def set_tracking_group(self, request, context):
         # Invalid groups should stop tracking
         self._tracked_group = None if request.value < 0 else request.value
 
     def stop_tracking(self, request, context):
+        self._should_stream = False
         self.cache.stop_scanning()
 
     def start_tracking(self, request, context):
         """Starts the lidar cache, streaming on the provided port."""
+        self._should_stream = True
         self.cache.start_cache()
 
-    def setRecordData(self, request, context):
-        # Set the vehicles to record their changes.
-        pass
-
     def onGroupsChanged(self, message):
         if self._mFactory is None:
             # Create the zmq socket in the thread that it will be used, just to be safe.
             self._mFactory = mf.getZmqPubSubStreamer(self._port)
-        self._mFactory.send_message_topic(
-            "lidar_map", messages.ProtoMessage(message=message.SerializeToString()))
+
+        if self._should_stream:
+            self._mFactory.send_message_topic(
+                "lidar_map", messages.ProtoMessage(message=message.SerializeToString()))
 
         if self._tracked_group is not None and self._vehicle is not None:
             # Update vehicle to correctly follow the tracked group.

From f7bb8cd7747c5d6f22e53c80c10f21f7f7915bbd Mon Sep 17 00:00:00 2001
From: Piv <18462828+Piv200@users.noreply.github.com>
Date: Thu, 23 Apr 2020 22:32:16 +0930
Subject: [PATCH 4/6] Add ios project

---
 .gitignore                                    |   4 +-
 .../CarController.xcodeproj/project.pbxproj   | 425 ++++++++++++++++++
 .../contents.xcworkspacedata                  |   7 +
 .../xcshareddata/IDEWorkspaceChecks.plist     |   8 +
 .../UserInterfaceState.xcuserstate            | Bin 0 -> 24570 bytes
 .../contents.xcworkspacedata                  |  10 +
 .../xcshareddata/IDEWorkspaceChecks.plist     |   8 +
 .../CarController/AppDelegate.swift           |  37 ++
 .../AppIcon.appiconset/Contents.json          |  98 ++++
 .../Assets.xcassets/Contents.json             |   6 +
 .../Base.lproj/LaunchScreen.storyboard        |  25 ++
 .../CarController/ContentView.swift           |  35 ++
 .../CarController/CarController/Info.plist    |  60 +++
 .../Preview Assets.xcassets/Contents.json     |   6 +
 .../CarController/SceneDelegate.swift         |  64 +++
 .../CarController/ServerData.swift            |  29 ++
 .../CarController/SimpleControllerView.swift  |  28 ++
 CarControlleriOS/CarController/Podfile        |  12 +
 18 files changed, 861 insertions(+), 1 deletion(-)
 create mode 100644 CarControlleriOS/CarController/CarController.xcodeproj/project.pbxproj
 create mode 100644 CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 create mode 100644 CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 create mode 100644 CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/xcuserdata/piv.xcuserdatad/UserInterfaceState.xcuserstate
 create mode 100644 CarControlleriOS/CarController/CarController.xcworkspace/contents.xcworkspacedata
 create mode 100644 CarControlleriOS/CarController/CarController.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 create mode 100644 CarControlleriOS/CarController/CarController/AppDelegate.swift
 create mode 100644 CarControlleriOS/CarController/CarController/Assets.xcassets/AppIcon.appiconset/Contents.json
 create mode 100644 CarControlleriOS/CarController/CarController/Assets.xcassets/Contents.json
 create mode 100644 CarControlleriOS/CarController/CarController/Base.lproj/LaunchScreen.storyboard
 create mode 100644 CarControlleriOS/CarController/CarController/ContentView.swift
 create mode 100644 CarControlleriOS/CarController/CarController/Info.plist
 create mode 100644 CarControlleriOS/CarController/CarController/Preview Content/Preview Assets.xcassets/Contents.json
 create mode 100644 CarControlleriOS/CarController/CarController/SceneDelegate.swift
 create mode 100644 CarControlleriOS/CarController/CarController/ServerData.swift
 create mode 100644 CarControlleriOS/CarController/CarController/SimpleControllerView.swift
 create mode 100644 CarControlleriOS/CarController/Podfile

diff --git a/.gitignore b/.gitignore
index 1599b8d..bb68930 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,6 @@
 **.egg-info*
 **/dist/*
 build
-__pycache__
\ No newline at end of file
+__pycache__
+
+Pods
\ No newline at end of file
diff --git a/CarControlleriOS/CarController/CarController.xcodeproj/project.pbxproj b/CarControlleriOS/CarController/CarController.xcodeproj/project.pbxproj
new file mode 100644
index 0000000..412dde7
--- /dev/null
+++ b/CarControlleriOS/CarController/CarController.xcodeproj/project.pbxproj
@@ -0,0 +1,425 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 51;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		5A9C27132443F52500DBDF12 /* SimpleControllerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A9C27122443F52500DBDF12 /* SimpleControllerView.swift */; };
+		5A9C27152443F5B500DBDF12 /* ServerData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A9C27142443F5B500DBDF12 /* ServerData.swift */; };
+		5A9EB27A240100960053D3CF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A9EB279240100960053D3CF /* AppDelegate.swift */; };
+		5A9EB27C240100960053D3CF /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A9EB27B240100960053D3CF /* SceneDelegate.swift */; };
+		5A9EB27E240100960053D3CF /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A9EB27D240100960053D3CF /* ContentView.swift */; };
+		5A9EB280240100970053D3CF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5A9EB27F240100970053D3CF /* Assets.xcassets */; };
+		5A9EB283240100970053D3CF /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5A9EB282240100970053D3CF /* Preview Assets.xcassets */; };
+		5A9EB286240100970053D3CF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5A9EB284240100970053D3CF /* LaunchScreen.storyboard */; };
+		5BEA7A8C24AF155FC02A6C58 /* Pods_CarController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03FB25F696A1B33332234B4F /* Pods_CarController.framework */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		03FB25F696A1B33332234B4F /* Pods_CarController.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_CarController.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		460C6595E5C32777EF7F2A4E /* Pods-CarController.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CarController.release.xcconfig"; path = "Target Support Files/Pods-CarController/Pods-CarController.release.xcconfig"; sourceTree = "<group>"; };
+		4C5C85A33DD98E3CA9FCEF6B /* Pods-CarController.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CarController.debug.xcconfig"; path = "Target Support Files/Pods-CarController/Pods-CarController.debug.xcconfig"; sourceTree = "<group>"; };
+		5A9C27122443F52500DBDF12 /* SimpleControllerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SimpleControllerView.swift; sourceTree = "<group>"; };
+		5A9C27142443F5B500DBDF12 /* ServerData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerData.swift; sourceTree = "<group>"; };
+		5A9EB276240100960053D3CF /* CarController.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CarController.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		5A9EB279240100960053D3CF /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		5A9EB27B240100960053D3CF /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
+		5A9EB27D240100960053D3CF /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
+		5A9EB27F240100970053D3CF /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		5A9EB282240100970053D3CF /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
+		5A9EB285240100970053D3CF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
+		5A9EB287240100970053D3CF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		5A9EB273240100960053D3CF /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				5BEA7A8C24AF155FC02A6C58 /* Pods_CarController.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		49C2CFB75CF1768D7363A9DB /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				03FB25F696A1B33332234B4F /* Pods_CarController.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		5A9EB26D240100950053D3CF = {
+			isa = PBXGroup;
+			children = (
+				5A9EB278240100960053D3CF /* CarController */,
+				5A9EB277240100960053D3CF /* Products */,
+				A595BD070E838AFD9A774908 /* Pods */,
+				49C2CFB75CF1768D7363A9DB /* Frameworks */,
+			);
+			sourceTree = "<group>";
+		};
+		5A9EB277240100960053D3CF /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				5A9EB276240100960053D3CF /* CarController.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		5A9EB278240100960053D3CF /* CarController */ = {
+			isa = PBXGroup;
+			children = (
+				5A9EB279240100960053D3CF /* AppDelegate.swift */,
+				5A9EB27B240100960053D3CF /* SceneDelegate.swift */,
+				5A9EB27D240100960053D3CF /* ContentView.swift */,
+				5A9EB27F240100970053D3CF /* Assets.xcassets */,
+				5A9EB284240100970053D3CF /* LaunchScreen.storyboard */,
+				5A9EB287240100970053D3CF /* Info.plist */,
+				5A9EB281240100970053D3CF /* Preview Content */,
+				5A9C27122443F52500DBDF12 /* SimpleControllerView.swift */,
+				5A9C27142443F5B500DBDF12 /* ServerData.swift */,
+			);
+			path = CarController;
+			sourceTree = "<group>";
+		};
+		5A9EB281240100970053D3CF /* Preview Content */ = {
+			isa = PBXGroup;
+			children = (
+				5A9EB282240100970053D3CF /* Preview Assets.xcassets */,
+			);
+			path = "Preview Content";
+			sourceTree = "<group>";
+		};
+		A595BD070E838AFD9A774908 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				4C5C85A33DD98E3CA9FCEF6B /* Pods-CarController.debug.xcconfig */,
+				460C6595E5C32777EF7F2A4E /* Pods-CarController.release.xcconfig */,
+			);
+			path = Pods;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		5A9EB275240100960053D3CF /* CarController */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 5A9EB28A240100970053D3CF /* Build configuration list for PBXNativeTarget "CarController" */;
+			buildPhases = (
+				DF3C92ECA29980008D9A0ED0 /* [CP] Check Pods Manifest.lock */,
+				5A9EB272240100960053D3CF /* Sources */,
+				5A9EB273240100960053D3CF /* Frameworks */,
+				5A9EB274240100960053D3CF /* Resources */,
+				E0B3D65287999242E7AD3ABB /* [CP] Embed Pods Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = CarController;
+			productName = CarController;
+			productReference = 5A9EB276240100960053D3CF /* CarController.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		5A9EB26E240100950053D3CF /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastSwiftUpdateCheck = 1130;
+				LastUpgradeCheck = 1130;
+				ORGANIZATIONNAME = "Michael Pivato";
+				TargetAttributes = {
+					5A9EB275240100960053D3CF = {
+						CreatedOnToolsVersion = 11.3.1;
+					};
+				};
+			};
+			buildConfigurationList = 5A9EB271240100950053D3CF /* Build configuration list for PBXProject "CarController" */;
+			compatibilityVersion = "Xcode 9.3";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 5A9EB26D240100950053D3CF;
+			productRefGroup = 5A9EB277240100960053D3CF /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				5A9EB275240100960053D3CF /* CarController */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		5A9EB274240100960053D3CF /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				5A9EB286240100970053D3CF /* LaunchScreen.storyboard in Resources */,
+				5A9EB283240100970053D3CF /* Preview Assets.xcassets in Resources */,
+				5A9EB280240100970053D3CF /* Assets.xcassets in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		DF3C92ECA29980008D9A0ED0 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-CarController-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		E0B3D65287999242E7AD3ABB /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-CarController/Pods-CarController-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-CarController/Pods-CarController-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CarController/Pods-CarController-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		5A9EB272240100960053D3CF /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				5A9C27152443F5B500DBDF12 /* ServerData.swift in Sources */,
+				5A9EB27A240100960053D3CF /* AppDelegate.swift in Sources */,
+				5A9EB27C240100960053D3CF /* SceneDelegate.swift in Sources */,
+				5A9C27132443F52500DBDF12 /* SimpleControllerView.swift in Sources */,
+				5A9EB27E240100960053D3CF /* ContentView.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+		5A9EB284240100970053D3CF /* LaunchScreen.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				5A9EB285240100970053D3CF /* Base */,
+			);
+			name = LaunchScreen.storyboard;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		5A9EB288240100970053D3CF /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.2;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+			};
+			name = Debug;
+		};
+		5A9EB289240100970053D3CF /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.2;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		5A9EB28B240100970053D3CF /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 4C5C85A33DD98E3CA9FCEF6B /* Pods-CarController.debug.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_ASSET_PATHS = "\"CarController/Preview Content\"";
+				DEVELOPMENT_TEAM = KZ66DBVG63;
+				ENABLE_PREVIEWS = YES;
+				INFOPLIST_FILE = CarController/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = com.Vato.CarController;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		5A9EB28C240100970053D3CF /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 460C6595E5C32777EF7F2A4E /* Pods-CarController.release.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_ASSET_PATHS = "\"CarController/Preview Content\"";
+				DEVELOPMENT_TEAM = KZ66DBVG63;
+				ENABLE_PREVIEWS = YES;
+				INFOPLIST_FILE = CarController/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = com.Vato.CarController;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		5A9EB271240100950053D3CF /* Build configuration list for PBXProject "CarController" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				5A9EB288240100970053D3CF /* Debug */,
+				5A9EB289240100970053D3CF /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		5A9EB28A240100970053D3CF /* Build configuration list for PBXNativeTarget "CarController" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				5A9EB28B240100970053D3CF /* Debug */,
+				5A9EB28C240100970053D3CF /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 5A9EB26E240100950053D3CF /* Project object */;
+}
diff --git a/CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..4a8720b
--- /dev/null
+++ b/CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:CarController.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/xcuserdata/piv.xcuserdatad/UserInterfaceState.xcuserstate b/CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/xcuserdata/piv.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 0000000000000000000000000000000000000000..48d4abe71ca08d9479a846a728bcdeba92958b0e
GIT binary patch
literal 24570
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

literal 0
HcmV?d00001

diff --git a/CarControlleriOS/CarController/CarController.xcworkspace/contents.xcworkspacedata b/CarControlleriOS/CarController/CarController.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..4ffc8d6
--- /dev/null
+++ b/CarControlleriOS/CarController/CarController.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:CarController.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/CarControlleriOS/CarController/CarController.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/CarControlleriOS/CarController/CarController.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/CarControlleriOS/CarController/CarController.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/CarControlleriOS/CarController/CarController/AppDelegate.swift b/CarControlleriOS/CarController/CarController/AppDelegate.swift
new file mode 100644
index 0000000..fd47dc0
--- /dev/null
+++ b/CarControlleriOS/CarController/CarController/AppDelegate.swift
@@ -0,0 +1,37 @@
+//
+//  AppDelegate.swift
+//  CarController
+//
+//  Created by Michael Pivato on 22/2/20.
+//  Copyright © 2020 Michael Pivato. All rights reserved.
+//
+
+import UIKit
+
+@UIApplicationMain
+class AppDelegate: UIResponder, UIApplicationDelegate {
+
+
+
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        // Override point for customization after application launch.
+        return true
+    }
+
+    // MARK: UISceneSession Lifecycle
+
+    func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
+        // Called when a new scene session is being created.
+        // Use this method to select a configuration to create the new scene with.
+        return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
+    }
+
+    func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) {
+        // Called when the user discards a scene session.
+        // If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions.
+        // Use this method to release any resources that were specific to the discarded scenes, as they will not return.
+    }
+
+
+}
+
diff --git a/CarControlleriOS/CarController/CarController/Assets.xcassets/AppIcon.appiconset/Contents.json b/CarControlleriOS/CarController/CarController/Assets.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 0000000..d8db8d6
--- /dev/null
+++ b/CarControlleriOS/CarController/CarController/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,98 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "83.5x83.5",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/CarControlleriOS/CarController/CarController/Assets.xcassets/Contents.json b/CarControlleriOS/CarController/CarController/Assets.xcassets/Contents.json
new file mode 100644
index 0000000..da4a164
--- /dev/null
+++ b/CarControlleriOS/CarController/CarController/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/CarControlleriOS/CarController/CarController/Base.lproj/LaunchScreen.storyboard b/CarControlleriOS/CarController/CarController/Base.lproj/LaunchScreen.storyboard
new file mode 100644
index 0000000..865e932
--- /dev/null
+++ b/CarControlleriOS/CarController/CarController/Base.lproj/LaunchScreen.storyboard
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="53" y="375"/>
+        </scene>
+    </scenes>
+</document>
diff --git a/CarControlleriOS/CarController/CarController/ContentView.swift b/CarControlleriOS/CarController/CarController/ContentView.swift
new file mode 100644
index 0000000..5f8de90
--- /dev/null
+++ b/CarControlleriOS/CarController/CarController/ContentView.swift
@@ -0,0 +1,35 @@
+//
+//  ContentView.swift
+//  CarController
+//
+//  Created by Michael Pivato on 22/2/20.
+//  Copyright © 2020 Michael Pivato. All rights reserved.
+//
+
+import SwiftUI
+
+struct ContentView: View {
+    var body: some View {
+        NavigationView{
+            List{
+                NavigationLink(destination: SimpleControllerView()){
+                    Text("Simple Controller")
+                }
+                
+                // TODO: Change these when other functionality is implemented
+                NavigationLink(destination: SimpleControllerView()){
+                    Text("SLAM Controller")
+                }
+                NavigationLink(destination: SimpleControllerView()){
+                    Text("Tracking Controller")
+                }
+            }
+        }
+    }
+}
+
+struct ContentView_Previews: PreviewProvider {
+    static var previews: some View {
+        ContentView()
+    }
+}
diff --git a/CarControlleriOS/CarController/CarController/Info.plist b/CarControlleriOS/CarController/CarController/Info.plist
new file mode 100644
index 0000000..9742bf0
--- /dev/null
+++ b/CarControlleriOS/CarController/CarController/Info.plist
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+		<key>UISceneConfigurations</key>
+		<dict>
+			<key>UIWindowSceneSessionRoleApplication</key>
+			<array>
+				<dict>
+					<key>UISceneConfigurationName</key>
+					<string>Default Configuration</string>
+					<key>UISceneDelegateClassName</key>
+					<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
+				</dict>
+			</array>
+		</dict>
+	</dict>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>
diff --git a/CarControlleriOS/CarController/CarController/Preview Content/Preview Assets.xcassets/Contents.json b/CarControlleriOS/CarController/CarController/Preview Content/Preview Assets.xcassets/Contents.json
new file mode 100644
index 0000000..da4a164
--- /dev/null
+++ b/CarControlleriOS/CarController/CarController/Preview Content/Preview Assets.xcassets/Contents.json	
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/CarControlleriOS/CarController/CarController/SceneDelegate.swift b/CarControlleriOS/CarController/CarController/SceneDelegate.swift
new file mode 100644
index 0000000..33efa61
--- /dev/null
+++ b/CarControlleriOS/CarController/CarController/SceneDelegate.swift
@@ -0,0 +1,64 @@
+//
+//  SceneDelegate.swift
+//  CarController
+//
+//  Created by Michael Pivato on 22/2/20.
+//  Copyright © 2020 Michael Pivato. All rights reserved.
+//
+
+import UIKit
+import SwiftUI
+
+class SceneDelegate: UIResponder, UIWindowSceneDelegate {
+
+    var window: UIWindow?
+
+
+    func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
+        // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`.
+        // If using a storyboard, the `window` property will automatically be initialized and attached to the scene.
+        // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).
+
+        // Create the SwiftUI view that provides the window contents.
+        let contentView = ContentView()
+
+        // Use a UIHostingController as window root view controller.
+        if let windowScene = scene as? UIWindowScene {
+            let window = UIWindow(windowScene: windowScene)
+            window.rootViewController = UIHostingController(rootView: contentView.environmentObject(ServerData()))
+            self.window = window
+            window.makeKeyAndVisible()
+        }
+    }
+
+    func sceneDidDisconnect(_ scene: UIScene) {
+        // Called as the scene is being released by the system.
+        // This occurs shortly after the scene enters the background, or when its session is discarded.
+        // Release any resources associated with this scene that can be re-created the next time the scene connects.
+        // The scene may re-connect later, as its session was not neccessarily discarded (see `application:didDiscardSceneSessions` instead).
+    }
+
+    func sceneDidBecomeActive(_ scene: UIScene) {
+        // Called when the scene has moved from an inactive state to an active state.
+        // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive.
+    }
+
+    func sceneWillResignActive(_ scene: UIScene) {
+        // Called when the scene will move from an active state to an inactive state.
+        // This may occur due to temporary interruptions (ex. an incoming phone call).
+    }
+
+    func sceneWillEnterForeground(_ scene: UIScene) {
+        // Called as the scene transitions from the background to the foreground.
+        // Use this method to undo the changes made on entering the background.
+    }
+
+    func sceneDidEnterBackground(_ scene: UIScene) {
+        // Called as the scene transitions from the foreground to the background.
+        // Use this method to save data, release shared resources, and store enough scene-specific state information
+        // to restore the scene back to its current state.
+    }
+
+
+}
+
diff --git a/CarControlleriOS/CarController/CarController/ServerData.swift b/CarControlleriOS/CarController/CarController/ServerData.swift
new file mode 100644
index 0000000..816144a
--- /dev/null
+++ b/CarControlleriOS/CarController/CarController/ServerData.swift
@@ -0,0 +1,29 @@
+//
+//  ServerData.swift
+//  CarController
+//
+//  Created by Michael Pivato on 13/4/20.
+//  Copyright © 2020 Michael Pivato. All rights reserved.
+//
+
+import Foundation
+
+final class ServerData: ObservableObject{
+    
+    // TODO: Find a way to save/represent this stuff in iOS settings (user can access via settings app).
+    // Then load the below values ar runtime, from settings.
+    
+    
+    @Published var port: Int = 50051
+    @Published var grpcPort: Int = 50050
+    @Published var host: String = "10.0.0.53"
+    
+    func load(){
+        // Load the server values from settings, if they had been
+        // previously saved.
+    }
+    
+    func save(){
+        // Save the current state to be remembered for next time.
+    }
+}
diff --git a/CarControlleriOS/CarController/CarController/SimpleControllerView.swift b/CarControlleriOS/CarController/CarController/SimpleControllerView.swift
new file mode 100644
index 0000000..ddddf3c
--- /dev/null
+++ b/CarControlleriOS/CarController/CarController/SimpleControllerView.swift
@@ -0,0 +1,28 @@
+//
+//  SimpleControllerView.swift
+//  CarController
+//
+//  Created by Michael Pivato on 13/4/20.
+//  Copyright © 2020 Michael Pivato. All rights reserved.
+//
+
+import SwiftUI
+
+struct SimpleControllerView: View {
+    @EnvironmentObject var server: ServerData
+    @State var throttle: Float = 0
+    
+    var body: some View {
+        HStack{
+            Text("Opened Simple Controller!")
+            Slider(value: $throttle)
+        }
+    }
+}
+
+struct SimpleControllerView_Previews: PreviewProvider {
+    static var previews: some View {
+        SimpleControllerView()
+            .environmentObject(ServerData())
+    }
+}
diff --git a/CarControlleriOS/CarController/Podfile b/CarControlleriOS/CarController/Podfile
new file mode 100644
index 0000000..a14c476
--- /dev/null
+++ b/CarControlleriOS/CarController/Podfile
@@ -0,0 +1,12 @@
+# Uncomment the next line to define a global platform for your project
+# platform :ios, '9.0'
+
+target 'CarController' do
+  # Comment the next line if you don't want to use dynamic frameworks
+  use_frameworks!
+
+  # Pods for CarController
+  pod 'SwiftGRPC'
+  pod 'SwiftyZeroMQ5'
+  pod 'SwiftProtobuf', '~> 1.0'
+end

From 1d2253dd1850e22cea316a336125511f129494dc Mon Sep 17 00:00:00 2001
From: Piv <18462828+Piv200@users.noreply.github.com>
Date: Sat, 25 Apr 2020 15:06:40 +0930
Subject: [PATCH 5/6] Minor refactoring and more support for recording data.

---
 .../vato/carcontroller/SimpleController.java  | 32 +++++++++++++++++++
 .../activity_simple_controller.xml            | 28 ++++++++--------
 car/src/car/control/motor_servicer.py         | 11 ++++---
 car/src/car/tracking/lidar_servicer.py        |  8 +++++
 .../main/proto/car/control/motorService.proto |  8 ++---
 .../proto/car/tracking/lidar_tracker.proto    |  6 ++++
 6 files changed, 72 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/org/vato/carcontroller/SimpleController.java b/app/src/main/java/org/vato/carcontroller/SimpleController.java
index d28b59a..835dcbc 100644
--- a/app/src/main/java/org/vato/carcontroller/SimpleController.java
+++ b/app/src/main/java/org/vato/carcontroller/SimpleController.java
@@ -5,17 +5,28 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.SeekBar;
 import android.widget.Switch;
+import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.preference.PreferenceManager;
 
+import com.google.protobuf.Empty;
+
+import org.vato.carcontroller.LIDAR.LidarTrackingController;
+
+import java.util.stream.Stream;
+
+import io.grpc.stub.StreamObserver;
+
 public class SimpleController extends AppCompatActivity implements SeekBar.OnSeekBarChangeListener {
 
     private SeekBar steeringSlider;
     private SeekBar throttleSlider;
     private Switch recordSwitch;
+    private Switch recordLidarSwitch;
 
     private static PiLoader grpcController;
+    private PersonTrackingGrpc.PersonTrackingStub trackingStub;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -32,6 +43,7 @@ public class SimpleController extends AppCompatActivity implements SeekBar.OnSee
         }
 
         recordSwitch = findViewById(R.id.recordSwitch);
+        recordLidarSwitch = findViewById(R.id.lidarSwitch);
     }
 
     @Override
@@ -97,4 +109,24 @@ public class SimpleController extends AppCompatActivity implements SeekBar.OnSee
     public void record(View view) {
         grpcController.record(recordSwitch.isSelected());
     }
+
+    public void recordLidar(View view) {
+        StreamObserver<Empty> response = new StreamObserver<Empty>() {
+            @Override
+            public void onNext(Empty value) {
+                Toast.makeText(getApplicationContext(), "Started Recording Lidar", Toast.LENGTH_SHORT);
+            }
+
+            @Override
+            public void onError(Throwable t) {
+                Toast.makeText(getApplicationContext(), "Failed to set lidar recording", Toast.LENGTH_SHORT);
+            }
+
+            @Override
+            public void onCompleted() {
+
+            }
+        };
+
+    }
 }
diff --git a/app/src/main/res/layout-land/activity_simple_controller.xml b/app/src/main/res/layout-land/activity_simple_controller.xml
index 7eeadab..92185d2 100644
--- a/app/src/main/res/layout-land/activity_simple_controller.xml
+++ b/app/src/main/res/layout-land/activity_simple_controller.xml
@@ -34,20 +34,10 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
         android:layout_marginTop="20dp"
-        android:text="Switch"
+        android:onClick="record"
+        android:text="Record Vehicle"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView3" />
-
-    <TextView
-        android:id="@+id/textView3"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
-        android:layout_marginTop="20dp"
-        android:text="TextView"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="Recording" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <Button
         android:id="@+id/saveButton"
@@ -55,8 +45,20 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
         android:layout_marginEnd="16dp"
+        android:onClick="saveRecording"
         android:text="Save"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <Switch
+        android:id="@+id/lidarSwitch"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="20dp"
+        android:onClick="recordLidar"
+        android:text="Record LiDAR"
+        app:layout_constraintStart_toEndOf="@+id/recordSwitch"
+        app:layout_constraintTop_toTopOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/car/src/car/control/motor_servicer.py b/car/src/car/control/motor_servicer.py
index 3b2218c..673681e 100644
--- a/car/src/car/control/motor_servicer.py
+++ b/car/src/car/control/motor_servicer.py
@@ -5,6 +5,7 @@ import time
 import car.control.motorService_pb2 as motorService_pb2
 import car.control.motorService_pb2_grpc as motorService_pb2_grpc
 from car.control.gpio.recording_vehicle_decorator import VehicleRecordingDecorator
+import google.protobuf.empty_pb2 as empty
 
 
 class MotorServicer(motorService_pb2_grpc.CarControlServicer):
@@ -12,7 +13,7 @@ class MotorServicer(motorService_pb2_grpc.CarControlServicer):
         self.vehicle = VehicleRecordingDecorator(vehicle)
         self._timer = None
 
-    def SetThrottle(self, request, context):
+    def set_throttle(self, request, context):
         # gRPC streams currently don't work between python and android.
         # If we don't get a response every 3 seconds, stop the car.
         print('Setting throttle to: ' + str(request.throttle))
@@ -20,7 +21,7 @@ class MotorServicer(motorService_pb2_grpc.CarControlServicer):
         self.vehicle.throttle = request.throttle
         return motorService_pb2.ThrottleResponse(throttleSet=True)
 
-    def SetSteering(self, request, context):
+    def set_steering(self, request, context):
         print('Setting steering to: ' + str(request.steering))
         self.vehicle.steering = request.steering
         return motorService_pb2.SteeringResponse(steeringSet=True)
@@ -40,9 +41,11 @@ class MotorServicer(motorService_pb2_grpc.CarControlServicer):
         print("Node timeout elapsed")
         self.vehicle.stop()
 
-    def Record(self, request, context):
+    def record(self, request, context):
         """Indicate whether the vehicle data should be recorded."""
         self.vehicle.record = request.record
+        return empty.Empty()        
 
-    def SaveRecordedData(self, request, context):
+    def save_recorded_data(self, request, context):
         self.vehicle.save_data(request.file)
+        return empty.Empty()
diff --git a/car/src/car/tracking/lidar_servicer.py b/car/src/car/tracking/lidar_servicer.py
index 552da00..ae6c2f0 100644
--- a/car/src/car/tracking/lidar_servicer.py
+++ b/car/src/car/tracking/lidar_servicer.py
@@ -9,6 +9,7 @@ from car.tracking.devices.recording_lidar import RecordingLidarDecorator
 from car.messaging import messages
 import car.tracking.algorithms as alg
 import os
+import google.protobuf.empty_pb2 as empty
 
 
 class LidarServicer(PersonTrackingServicer):
@@ -28,15 +29,22 @@ class LidarServicer(PersonTrackingServicer):
     def set_tracking_group(self, request, context):
         # Invalid groups should stop tracking
         self._tracked_group = None if request.value < 0 else request.value
+        return empty.Empty()
 
     def stop_tracking(self, request, context):
         self._should_stream = False
         self.cache.stop_scanning()
+        return empty.Empty()
 
     def start_tracking(self, request, context):
         """Starts the lidar cache, streaming on the provided port."""
         self._should_stream = True
         self.cache.start_cache()
+        return empty.Empty()
+
+    def record(self, request, context):
+        self._lidar.record = True
+        return empty.Empty()
 
     def onGroupsChanged(self, message):
         if self._mFactory is None:
diff --git a/protobuf/src/main/proto/car/control/motorService.proto b/protobuf/src/main/proto/car/control/motorService.proto
index 65ae5ba..dd15142 100644
--- a/protobuf/src/main/proto/car/control/motorService.proto
+++ b/protobuf/src/main/proto/car/control/motorService.proto
@@ -34,8 +34,8 @@ message SaveRequest{
 }
 
 service CarControl{
-    rpc SetThrottle(ThrottleRequest) returns (ThrottleResponse){}
-    rpc SetSteering(SteeringRequest) returns (SteeringResponse){}
-    rpc Record(RecordingReqeust) returns (google.protobuf.Empty) {}
-    rpc SaveRecordedData(SaveRequest) returns (google.protobuf.Empty) {}
+    rpc set_throttle(ThrottleRequest) returns (ThrottleResponse){}
+    rpc set_steering(SteeringRequest) returns (SteeringResponse){}
+    rpc record(RecordingReqeust) returns (google.protobuf.Empty) {}
+    rpc save_recorded_data(SaveRequest) returns (google.protobuf.Empty) {}
 }
diff --git a/protobuf/src/main/proto/car/tracking/lidar_tracker.proto b/protobuf/src/main/proto/car/tracking/lidar_tracker.proto
index 6b918b5..3b0d5cb 100644
--- a/protobuf/src/main/proto/car/tracking/lidar_tracker.proto
+++ b/protobuf/src/main/proto/car/tracking/lidar_tracker.proto
@@ -7,6 +7,7 @@ option java_package = "org.vato.carcontroller";
 option java_outer_classname = "PersonTrackingProto";
 
 import "google/protobuf/empty.proto";
+import "google/protobuf/wrappers.proto";
 
 message Int32Value{
     int32 value = 1;
@@ -22,10 +23,15 @@ message PointScan{
     repeated Point points = 1;
 }
 
+
+
 service PersonTracking{
     rpc set_tracking_group(Int32Value) returns (google.protobuf.Empty) {}
 
     rpc stop_tracking(google.protobuf.Empty) returns (google.protobuf.Empty) {}
 
     rpc start_tracking(google.protobuf.Empty) returns (google.protobuf.Empty) {}
+
+    rpc record(google.protobuf.BoolValue) returns (google.protobuf.Empty) {}
+
 }
\ No newline at end of file

From b633fdea955a5b54fdde02da044b3f06db1422d8 Mon Sep 17 00:00:00 2001
From: Piv <18462828+Piv200@users.noreply.github.com>
Date: Sat, 25 Apr 2020 16:29:12 +0930
Subject: [PATCH 6/6] Recording vehicle change is working

---
 .../vato/carcontroller/SimpleController.java    |  7 ++++---
 .../activity_lidar_tracking_controller.xml      | 17 ++++++++++++++---
 .../control/gpio/recording_vehicle_decorator.py | 12 ++++++++----
 car/src/car/tracking/lidar_servicer.py          | 11 ++++++++++-
 .../main/proto/car/tracking/lidar_tracker.proto |  4 +++-
 5 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/org/vato/carcontroller/SimpleController.java b/app/src/main/java/org/vato/carcontroller/SimpleController.java
index 835dcbc..8c6f814 100644
--- a/app/src/main/java/org/vato/carcontroller/SimpleController.java
+++ b/app/src/main/java/org/vato/carcontroller/SimpleController.java
@@ -104,22 +104,23 @@ public class SimpleController extends AppCompatActivity implements SeekBar.OnSee
 
     public void saveRecording(View view) {
         grpcController.saveRecording();
+
     }
 
     public void record(View view) {
-        grpcController.record(recordSwitch.isSelected());
+        grpcController.record(recordSwitch.isChecked());
     }
 
     public void recordLidar(View view) {
         StreamObserver<Empty> response = new StreamObserver<Empty>() {
             @Override
             public void onNext(Empty value) {
-                Toast.makeText(getApplicationContext(), "Started Recording Lidar", Toast.LENGTH_SHORT);
+                Toast.makeText(getApplicationContext(), "Started Recording Lidar", Toast.LENGTH_SHORT).show();
             }
 
             @Override
             public void onError(Throwable t) {
-                Toast.makeText(getApplicationContext(), "Failed to set lidar recording", Toast.LENGTH_SHORT);
+                Toast.makeText(getApplicationContext(), "Failed to set lidar recording", Toast.LENGTH_SHORT).show();
             }
 
             @Override
diff --git a/app/src/main/res/layout-land/activity_lidar_tracking_controller.xml b/app/src/main/res/layout-land/activity_lidar_tracking_controller.xml
index 7b8dff5..93940a3 100644
--- a/app/src/main/res/layout-land/activity_lidar_tracking_controller.xml
+++ b/app/src/main/res/layout-land/activity_lidar_tracking_controller.xml
@@ -7,14 +7,17 @@
     tools:context=".LIDAR.LidarTrackingController">
 
     <org.vato.carcontroller.LIDAR.LidarView
+        android:id="@+id/lidarMap"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:id="@+id/lidarMap"/>
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:layout_editor_absoluteX="-45dp" />
 
     <ImageView
         android:id="@+id/imageView"
-        android:layout_width="37dp"
-        android:layout_height="21dp"
+        android:layout_width="96dp"
+        android:layout_height="89dp"
         android:rotation="270"
         android:scaleType="fitCenter"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -23,5 +26,13 @@
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_car" />
 
+    <Switch
+        android:id="@+id/switch1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Switch"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/car/src/car/control/gpio/recording_vehicle_decorator.py b/car/src/car/control/gpio/recording_vehicle_decorator.py
index 1ce0090..1b839f6 100644
--- a/car/src/car/control/gpio/recording_vehicle_decorator.py
+++ b/car/src/car/control/gpio/recording_vehicle_decorator.py
@@ -39,8 +39,10 @@ class VehicleRecordingDecorator:
         return self._recording
 
     @record.setter
-    def record(self, value):
-        self._recording = True
+    def record(self, value: bool):
+        if not value:
+            self._records = []
+        self._recording = value
 
     @property
     def throttle(self):
@@ -49,7 +51,8 @@ class VehicleRecordingDecorator:
     @throttle.setter
     def throttle(self, value):
         if self._recording:
-            self._records.append(('t', value, str(datetime.datetime.now())))
+            self._records.append(
+                't,' + str(value) + ',' + datetime.datetime.now().isoformat(sep=' ', timespec='seconds'))
         self._vehicle.throttle = value
 
     @property
@@ -59,7 +62,8 @@ class VehicleRecordingDecorator:
     @steering.setter
     def steering(self, value):
         if self._recording:
-            self._records.append(('s', value, str(datetime.datetime.now())))
+            self._records.append(
+                's,' + str(value) + ',' + datetime.datetime.now().isoformat(sep=' ', timespec='seconds'))
         self._vehicle.steering = value
 
     @property
diff --git a/car/src/car/tracking/lidar_servicer.py b/car/src/car/tracking/lidar_servicer.py
index ae6c2f0..9038428 100644
--- a/car/src/car/tracking/lidar_servicer.py
+++ b/car/src/car/tracking/lidar_servicer.py
@@ -43,7 +43,16 @@ class LidarServicer(PersonTrackingServicer):
         return empty.Empty()
 
     def record(self, request, context):
-        self._lidar.record = True
+        # TODO: Fix this to not require 
+        if request.value:
+            self.cache.start_cache()
+        else:
+            self.cache.stop_scanning()
+        self._lidar.record = request.value
+        return empty.Empty()
+
+    def save_lidar(self, request, context):
+        self._lidar.save_data(request.file)
         return empty.Empty()
 
     def onGroupsChanged(self, message):
diff --git a/protobuf/src/main/proto/car/tracking/lidar_tracker.proto b/protobuf/src/main/proto/car/tracking/lidar_tracker.proto
index 3b0d5cb..b988413 100644
--- a/protobuf/src/main/proto/car/tracking/lidar_tracker.proto
+++ b/protobuf/src/main/proto/car/tracking/lidar_tracker.proto
@@ -8,6 +8,7 @@ option java_outer_classname = "PersonTrackingProto";
 
 import "google/protobuf/empty.proto";
 import "google/protobuf/wrappers.proto";
+import "car/control/motorService.proto";
 
 message Int32Value{
     int32 value = 1;
@@ -24,7 +25,6 @@ message PointScan{
 }
 
 
-
 service PersonTracking{
     rpc set_tracking_group(Int32Value) returns (google.protobuf.Empty) {}
 
@@ -34,4 +34,6 @@ service PersonTracking{
 
     rpc record(google.protobuf.BoolValue) returns (google.protobuf.Empty) {}
 
+    rpc save_lidar(MotorControl.SaveRequest) returns (google.protobuf.Empty) {}
+
 }
\ No newline at end of file