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

sensors/activity/ActivityButterPressure.h

@@ -6,7 +6,9 @@
 #include "../../math/FixedFrequencyInterpolator.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
@@ -16,8 +18,6 @@ class ActivityButterPressure {
 
 public:
 
-    enum Activity {DOWN, STAY, UP};
-
     struct History {
         Timestamp ts;
         BarometerData data;
@@ -112,13 +112,13 @@ public:
                 }
 
                 if(actValue > threshold){
-                    currentActivity = DOWN;
+                    currentActivity = Activity::WALKING_DOWN;
                 }
                 else if (actValue < -threshold){
-                    currentActivity = UP;
+                    currentActivity = Activity::WALKING_UP;
                 }
                 else{
-                    currentActivity = STAY;
+                    currentActivity = Activity::WALKING;
                 }
             }
         }

sensors/activity/ActivityButterPressurePercent.h

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