markusb/RTT
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added NUC 6-8

Browse Source
This commit is contained in:
Markus Bullmann
2019-11-12 16:16:03 +01:00
parent 82a99e562c
commit be29abac6b
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Manager.cpp
View File

@@ -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 NUC3 = "1c:1b:b5:ef:a2:9a";
const std::string NUC4 = "1c:1b:b5:ec:d1:82"; const std::string NUC4 = "1c:1b:b5:ec:d1:82";
const std::string NUC5 = "d0:c6:37:bc:5c:41"; 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; static long long startTime = 0;
@@ -168,6 +171,9 @@ void Manager::onWifiData(WifiRttResult result) {
if(NUC3 == result.mac) {nucIdx = 2;} if(NUC3 == result.mac) {nucIdx = 2;}
if(NUC4 == result.mac) {nucIdx = 3;} if(NUC4 == result.mac) {nucIdx = 3;}
if(NUC5 == result.mac) {nucIdx = 4;} 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); emit newDistMeas(nucIdx, result.distMM);

3
_android/src/RTT.java
View File

@@ -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:ef:a2:9a")); // NUC 3
macs.add(MacAddress.fromString("1c:1b:b5:ec:d1:82")); // NUC 4 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: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; ftmRunning = true;

2
main.qml
View File

@@ -55,7 +55,7 @@ Window {
id: cbNUC; id: cbNUC;
height: 60; height: 60;
width: 85; width: 85;
model: ["NUC1", "NUC2", "NUC3", "NUC4", "NUC5"]; model: ["NUC1", "NUC2", "NUC3", "NUC4", "NUC5", "NUC6", "NUC7", "NUC8"];
onCurrentIndexChanged: { onCurrentIndexChanged: {
chart.reset(); chart.reset();
} }