FHWS/Indoor
Archived
4
0
Fork 0
Code Issues 19 Pull Requests Releases 1 Wiki Activity

Added ftm attributes to WiFiMeasurement

Browse Source
This commit is contained in:
Markus Bullmann
2019-06-19 16:05:23 +02:00
parent 09e57292f6
commit 8761dce3ce
5 changed files with 69 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
sensors/offline/FileReader.h
View File

@@ -64,6 +64,7 @@ namespace Offline {
std::vector<TS<GPSData>> gps;
std::vector<TS<CompassData>> compass;
std::vector<TS<MagnetometerData>> magnetometer;
std::vector<TS<WiFiMeasurement>> wifiFtm;
/** all entries in linear order as they appeared while recording */
std::vector<Entry> entries;
@@ -102,6 +103,7 @@ namespace Offline {
lin_acc.clear();
gravity.clear();
magnetometer.clear();
wifiFtm.clear();
}
const std::vector<Entry>& getEntries() const {return entries;}
@@ -130,6 +132,8 @@ namespace Offline {
const std::vector<TS<MagnetometerData>>& getMagnetometer() const {return magnetometer;}
const std::vector<TS<WiFiMeasurement>>& getWifiFtm() const { return wifiFtm; }
/** get an interpolateable ground-truth based on the time-clicks during recording */
GroundTruth getGroundTruth(const Floorplan::IndoorMap* map, const std::vector<int> groundTruthPoints) const {
@@ -199,6 +203,7 @@ namespace Offline {
else if (idx == (int)Sensor::COMPASS) {parseCompass(ts,data);}
else if (idx == (int)Sensor::GPS) {parseGPS(ts,data);}
else if (idx == (int)Sensor::MAGNETOMETER) {parseMagnetometer(ts,data);}
else if (idx == (int)Sensor::WIFI_FTM) {parseWifiFtm(ts, data);}
else if (idx == (int)Sensor::ACTIVITY) {parseActivity(ts, data);}
// TODO: this is a hack...
@@ -313,6 +318,33 @@ namespace Offline {
}
void parseWifiFtm(const uint64_t ts, const std::string& data) {
Splitter s(data, sep);
const int successMeas = s.getInteger(0);
const std::string mac = s.get(1);
const float dist = s.getFloat(2) / 1000; // mm -> m
const float distStdDev = s.getFloat(3) / 1000;
const float rssi = s.getFloat(4);
const int numAttempts = !s.isEmpty(5) ? s.getInteger(5) : 0;
const int numSuccess = !s.isEmpty(6) ? s.getInteger(6) : 0;
// append AP to current scan-entry
if (successMeas)
{
WiFiMeasurement meas(AccessPoint(mac), rssi, Timestamp::fromMS(ts), dist, distStdDev, numAttempts, numSuccess);
wifiFtm.push_back(TS<WiFiMeasurement>(ts, meas));
entries.push_back(Entry(Sensor::WIFI_FTM, ts, this->wifiFtm.size() - 1));
}
// inform listener
//if (listener) {listener->onWiFi(Timestamp::fromMS(ts), wifi);}
}
void parseBeacons(const uint64_t ts, const std::string& data) {
const auto pos1 = data.find(';');