From be29abac6b63b0ed41b5e826ee23390dc4b5e106 Mon Sep 17 00:00:00 2001 From: Markus Bullmann Date: Tue, 12 Nov 2019 16:16:03 +0100 Subject: [PATCH] Added NUC 6-8 --- Manager.cpp | 6 ++++++ _android/src/RTT.java | 3 +++ main.qml | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Manager.cpp b/Manager.cpp index 3d8540e..bcaeaf0 100644 --- a/Manager.cpp +++ b/Manager.cpp @@ -25,6 +25,9 @@ const std::string NUC2 = "38:de:ad:6d:60:ff"; const std::string NUC3 = "1c:1b:b5:ef:a2:9a"; const std::string NUC4 = "1c:1b:b5:ec:d1:82"; const std::string NUC5 = "d0:c6:37:bc:5c:41"; +const std::string NUC6 = "d0:c6:37:bc:77:8a"; +const std::string NUC7 = "d0:c6:37:bc:77:ad"; +const std::string NUC8 = "d0:c6:37:bc:6b:4b"; static long long startTime = 0; @@ -168,6 +171,9 @@ void Manager::onWifiData(WifiRttResult result) { if(NUC3 == result.mac) {nucIdx = 2;} if(NUC4 == result.mac) {nucIdx = 3;} if(NUC5 == result.mac) {nucIdx = 4;} + if(NUC6 == result.mac) {nucIdx = 5;} + if(NUC7 == result.mac) {nucIdx = 6;} + if(NUC8 == result.mac) {nucIdx = 7;} emit newDistMeas(nucIdx, result.distMM); diff --git a/_android/src/RTT.java b/_android/src/RTT.java index 6fccf46..bdb1452 100644 --- a/_android/src/RTT.java +++ b/_android/src/RTT.java @@ -97,6 +97,9 @@ public class RTT { macs.add(MacAddress.fromString("1c:1b:b5:ef:a2:9a")); // NUC 3 macs.add(MacAddress.fromString("1c:1b:b5:ec:d1:82")); // NUC 4 macs.add(MacAddress.fromString("d0:c6:37:bc:5c:41")); // NUC 5 + macs.add(MacAddress.fromString("d0:c6:37:bc:77:8a")); // NUC 6 + macs.add(MacAddress.fromString("d0:c6:37:bc:77:ad")); // NUC 7 + macs.add(MacAddress.fromString("d0:c6:37:bc:6b:4b")); // NUC 8 ftmRunning = true; diff --git a/main.qml b/main.qml index 903e9de..f4b73e1 100644 --- a/main.qml +++ b/main.qml @@ -55,7 +55,7 @@ Window { id: cbNUC; height: 60; width: 85; - model: ["NUC1", "NUC2", "NUC3", "NUC4", "NUC5"]; + model: ["NUC1", "NUC2", "NUC3", "NUC4", "NUC5", "NUC6", "NUC7", "NUC8"]; onCurrentIndexChanged: { chart.reset(); }