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:
k-a-z-u
2017-10-24 16:49:18 +02:00
parent 81b6b2c96c 0151a4f6e4
commit feaa2ea12c
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sensors/pressure/ActivityButterPressure.h → sensors/activity/ActivityButterPressure.h
View File

@@ -6,7 +6,9 @@
#include "../../math/FixedFrequencyInterpolator.h" #include "../../math/FixedFrequencyInterpolator.h"
#include "../../math/MovingAVG.h" #include "../../math/MovingAVG.h"
#include "BarometerData.h" #include "../pressure/BarometerData.h"
#include "Activity.h"
/** /**
* receives pressure measurements, interpolates them to a ficex frequency, lowpass filtering * receives pressure measurements, interpolates them to a ficex frequency, lowpass filtering
@@ -16,8 +18,6 @@ class ActivityButterPressure {
public: public:
enum Activity {DOWN, STAY, UP};
struct History { struct History {
Timestamp ts; Timestamp ts;
BarometerData data; BarometerData data;
@@ -112,13 +112,13 @@ public:
} }
if(actValue > threshold){ if(actValue > threshold){
currentActivity = DOWN; currentActivity = Activity::WALKING_DOWN;
} }
else if (actValue < -threshold){ else if (actValue < -threshold){
currentActivity = UP; currentActivity = Activity::WALKING_UP;
} }
else{ else{
currentActivity = STAY; currentActivity = Activity::WALKING;
} }
} }
} }

3
sensors/pressure/ActivityButterPressurePercent.h → sensors/activity/ActivityButterPressurePercent.h
View File

@@ -8,8 +8,9 @@
#include <KLib/Assertions.h> #include <KLib/Assertions.h>
#include <vector> #include <vector>
#include "../pressure/BarometerData.h"
#include "BarometerData.h" #include "Activity.h"
/** /**
* receives pressure measurements, interpolates them to a ficex frequency, lowpass filtering * receives pressure measurements, interpolates them to a ficex frequency, lowpass filtering