From 94d509db41dedf7058db0add525efd34361879c3 Mon Sep 17 00:00:00 2001
From: Markus Bullmann <markus.bullmann@fhws.de>
Date: Tue, 24 Sep 2019 11:36:33 +0200
Subject: [PATCH] Readded Wifi RTT Sensor

---
 .../indoor/sensorreadout/MainActivity.java    | 21 ++++++++++++++-----
 .../indoor/sensorreadout/sensors/WiFiRTT.java |  4 +++-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/de/fhws/indoor/sensorreadout/MainActivity.java b/app/src/main/java/de/fhws/indoor/sensorreadout/MainActivity.java
index e8e6cb5..2bba547 100644
--- a/app/src/main/java/de/fhws/indoor/sensorreadout/MainActivity.java
+++ b/app/src/main/java/de/fhws/indoor/sensorreadout/MainActivity.java
@@ -40,6 +40,7 @@ import de.fhws.indoor.sensorreadout.sensors.PedestrianActivity;
 import de.fhws.indoor.sensorreadout.sensors.PedestrianActivityButton;
 import de.fhws.indoor.sensorreadout.sensors.PhoneSensors;
 import de.fhws.indoor.sensorreadout.sensors.WiFi;
+import de.fhws.indoor.sensorreadout.sensors.WiFiRTT;
 import de.fhws.indoor.sensorreadout.sensors.iBeacon;
 import de.fhws.indoor.sensorreadout.sensors.mySensor;
 import de.fhws.indoor.sensorreadout.sensors.SensorType;
@@ -449,14 +450,24 @@ public class MainActivity extends Activity {
                 @Override public void onData(final SensorType id, final long timestamp, final String csv) {return; }
             });
         }
+//        if(activeSensors.contains("WIFI")) {
+//            // log wifi using sensor number 8
+//            final WiFi wifi = new WiFi(this);
+//            sensors.add(wifi);
+//            wifi.setListener(new mySensor.SensorListener() {
+//                @Override public void onData(final long timestamp, final String csv) { add(SensorType.WIFI, csv, timestamp); }
+//                @Override public void onData(final SensorType id, final long timestamp, final String csv) {return; }
+//            });
+//        }
         if(activeSensors.contains("WIFI")) {
-            // log wifi using sensor number 8
-            final WiFi wifi = new WiFi(this);
-            sensors.add(wifi);
-            wifi.setListener(new mySensor.SensorListener() {
-                @Override public void onData(final long timestamp, final String csv) { add(SensorType.WIFI, csv, timestamp); }
+            // log wifi RTT using sensor number 17
+            final WiFiRTT wifirtt = new WiFiRTT(this);
+            sensors.add(wifirtt);
+            wifirtt.setListener(new mySensor.SensorListener() {
+                @Override public void onData(final long timestamp, final String csv) { add(SensorType.WIFIRTT, csv, timestamp); }
                 @Override public void onData(final SensorType id, final long timestamp, final String csv) {return; }
             });
+
         }
         if(activeSensors.contains("BLUETOOTH")) {
             // bluetooth permission
diff --git a/app/src/main/java/de/fhws/indoor/sensorreadout/sensors/WiFiRTT.java b/app/src/main/java/de/fhws/indoor/sensorreadout/sensors/WiFiRTT.java
index c6b2a1c..61a9420 100644
--- a/app/src/main/java/de/fhws/indoor/sensorreadout/sensors/WiFiRTT.java
+++ b/app/src/main/java/de/fhws/indoor/sensorreadout/sensors/WiFiRTT.java
@@ -119,6 +119,7 @@ public class WiFiRTT extends mySensor {
             for (final RangingResult res : list) {
 
                 int success = 0;
+                long timeStampInNS = 0;
                 MacAddress mac = res.getMacAddress();
                 int dist = 0;
                 int stdDevDist = 0;
@@ -128,6 +129,7 @@ public class WiFiRTT extends mySensor {
 
                 if (res.getStatus() == RangingResult.STATUS_SUCCESS) {
                     success = 1;
+                    timeStampInNS = res.getRangingTimestampMillis() * 1000;
                     dist = res.getDistanceMm();
                     stdDevDist = res.getDistanceStdDevMm();
                     rssi = res.getRssi();
@@ -152,7 +154,7 @@ public class WiFiRTT extends mySensor {
                     sb.append(numSuccessfulMeas);
 
 
-                    listener.onData(SensorType.WIFIRTT,res.getRangingTimestampMillis()*1000, sb.toString());
+                    listener.onData(SensorType.WIFIRTT,timeStampInNS, sb.toString());
                 }
             }
         }