From 449f604c2b2f29e5dfbd12dcc36cb066eb7208e4 Mon Sep 17 00:00:00 2001
From: Piv <18462828+Piv200@users.noreply.github.com>
Date: Thu, 6 Feb 2020 21:43:12 +1030
Subject: [PATCH] Add zmq port to settings, slam view to slam controller page.

---
 .../com/example/carcontroller/SLAM/SlamView.java     |  2 +-
 .../res/layout-land/activity_slam_controller.xml     |  9 +++++++++
 app/src/main/res/xml/root_preferences.xml            | 12 ++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/example/carcontroller/SLAM/SlamView.java b/app/src/main/java/com/example/carcontroller/SLAM/SlamView.java
index 15450dd..b9beb89 100644
--- a/app/src/main/java/com/example/carcontroller/SLAM/SlamView.java
+++ b/app/src/main/java/com/example/carcontroller/SLAM/SlamView.java
@@ -40,7 +40,7 @@ public class SlamView extends SurfaceView implements Runnable {
         context = new ZContext();
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
         host = prefs.getString("host", "10.0.0.53");
-        port = prefs.getString("port", "50051");
+        port = prefs.getString("zmqPort", "5050");
     }
 
     @Override
diff --git a/app/src/main/res/layout-land/activity_slam_controller.xml b/app/src/main/res/layout-land/activity_slam_controller.xml
index b84f479..246557e 100644
--- a/app/src/main/res/layout-land/activity_slam_controller.xml
+++ b/app/src/main/res/layout-land/activity_slam_controller.xml
@@ -6,6 +6,15 @@
     android:layout_height="match_parent"
     tools:context=".SLAM.SlamController">
 
+    <com.example.carcontroller.SLAM.SlamView
+        android:id="@+id/slamView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <SeekBar
         android:id="@+id/steeringBar"
         android:layout_width="200dp"
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index 0c2b451..1c49e0c 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -49,4 +49,16 @@
             app:useSimpleSummaryProvider="true" />
     </PreferenceCategory>
 
+    <PreferenceCategory android:title="SLAM Configuration">
+        <EditTextPreference
+            android:key="MAPSIZEPIXELS"
+            android:title="SLAM Map Size Pixels"
+            app:useSimpleSummaryProvider="true" />
+
+        <EditTextPreference
+            android:key="MAPSIZEMETRES"
+            android:title="SLAM Map Size Meters"
+            app:useSimpleSummaryProvider="true" />
+    </PreferenceCategory>
+
 </PreferenceScreen>