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

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

Browse Source
This commit is contained in:
toni
2016-10-01 13:33:04 +02:00
parent 7fcdaa9c86 51c0945e12
commit 87d5e2ab4c
15 changed files with 343 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sensors/pressure/PressureTendence.h
View File

@@ -4,7 +4,7 @@
#include "../../data/Timestamp.h"
#include "../../math/MovingAVG.h"
#include "../../math/MovingMedian.h"
#include "../../math/Median.h"
#include "../../math/Stats.h"
#include "BarometerData.h"

15
sensors/radio/VAPGrouper.h
View File

@@ -5,7 +5,7 @@
#include <unordered_map>
#include <cmath>
#include "../../math/Median.h"
#include "../../math/Stats.h"
#include "WiFiMeasurements.h"
@@ -142,7 +142,7 @@ private:
/** get the median signal strength */
inline float getMedian(const std::vector<WiFiMeasurement>& vaps) const {
Median<float> median;
Stats::Median<float> median;
for (const WiFiMeasurement& vap : vaps) {
median.add(vap.getRSSI());
}
@@ -153,11 +153,16 @@ private:
/** get the maximum signal strength */
inline float getMax(const std::vector<WiFiMeasurement>& vaps) const {
float max = -9999999;
Stats::Maximum<float> max;
for (const WiFiMeasurement& vap : vaps) {
if (vap.getRSSI() > max) {max = vap.getRSSI();}
max.add(vap.getRSSI());
}
return max;
return max.get();
// float max = -9999999;
// for (const WiFiMeasurement& vap : vaps) {
// if (vap.getRSSI() > max) {max = vap.getRSSI();}
// }
// return max;
}