FHWS/FtmPrologic
Archived
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.frank-ebner.de/FHWS/FtmPrologic

Browse Source
This commit is contained in:
Markus Bullmann
2020-01-28 17:52:11 +01:00
parent 6e169a7e71 18ea0a529d
commit b64b640db7
8 changed files with 78 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/mainTrilat.cpp
View File

@@ -111,15 +111,18 @@ static CombinedStats<float> run(Settings::DataSetup setup, int walkIdx, std::str
for (const Offline::Entry& e : fr.getEntries())
{
if (e.type != Offline::Sensor::WIFI_FTM) {
if (e.type != Offline::Sensor::WIFI_FTM && e.type != Offline::Sensor::GROUND_TRUTH) {
continue;
}
// TIME
const Timestamp ts = Timestamp::fromMS(e.ts);
if (e.type == Offline::Sensor::WIFI_FTM)
{
auto wifiFtm = fr.getWifiFtm()[e.idx].data;
obs.push_back(wifiFtm);
}
if (ts - lastTimestamp >= Timestamp::fromMS(500))
{
@@ -212,8 +215,7 @@ static CombinedStats<float> run(Settings::DataSetup setup, int walkIdx, std::str
plot.addLabel(ss.str(), Point3(70, i*5, 0), i);
}
}
}
// Png Output
//if (Settings::PlotToPng)
@@ -231,7 +233,6 @@ static CombinedStats<float> run(Settings::DataSetup setup, int walkIdx, std::str
plot.plot();
std::this_thread::sleep_for(std::chrono::milliseconds(100));
}
obs.clear();
lastTimestamp = ts;