diff --git a/sensors/pressure/ActivityButterPressure.h b/sensors/activity/ActivityButterPressure.h similarity index 94% rename from sensors/pressure/ActivityButterPressure.h rename to sensors/activity/ActivityButterPressure.h index be53031..5c9adbf 100644 --- a/sensors/pressure/ActivityButterPressure.h +++ b/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; } } } diff --git a/sensors/pressure/ActivityButterPressurePercent.h b/sensors/activity/ActivityButterPressurePercent.h similarity index 99% rename from sensors/pressure/ActivityButterPressurePercent.h rename to sensors/activity/ActivityButterPressurePercent.h index c20583e..80541fc 100644 --- a/sensors/pressure/ActivityButterPressurePercent.h +++ b/sensors/activity/ActivityButterPressurePercent.h @@ -8,8 +8,9 @@ #include #include +#include "../pressure/BarometerData.h" -#include "BarometerData.h" +#include "Activity.h" /** * receives pressure measurements, interpolates them to a ficex frequency, lowpass filtering