fixed activity enum problems

sensors/activity/ActivityButterPressure.h

@@ -50,13 +50,13 @@ public:
 
 
 	/** ctor */
-    ActivityButterPressure() : currentActivity(STAY){
+    ActivityButterPressure() : currentActivity(Activity::STANDING){
         ;
     }
 
 
 	/** add new sensor readings that were received at the given timestamp */
-    Activity add(const Timestamp& ts, const BarometerData& baro) {
+    void add(const Timestamp& ts, const BarometerData& baro) {
 
         //init
         static bool firstCall = false;
@@ -65,7 +65,7 @@ public:
             firstCall = true;
 
             butter2.stepInitialization(0);
-            return STAY;
+            currentActivity = Activity::STANDING;
         }
 
         bool newInterpolatedValues = false;
@@ -123,14 +123,12 @@ public:
             }
         }
 
-        return currentActivity;
-
 	}
 
     /** get the current Activity */
-    Activity getCurrentActivity() {
+    Activity get() const {
         return currentActivity;
-	}
+    }
 };
 
 #endif // ACTIVITYBUTTERPRESSURE_H

sensors/activity/ActivityDetector.h

@@ -41,8 +41,8 @@ private:
 	MovingStdDevTS<float> stdDev;
 	MovingStdDevTS<float> stdDev2;
 
-	MovingAverageTS<float> baroAvgSlow;
-	MovingAverageTS<float> baroAvgFast;
+    //MovingAverageTS<float> baroAvgSlow;
+    //MovingAverageTS<float> baroAvgFast;
 
 	MovingAverageTS<float> baroAvg;
 	HistoryTS<float> baroHistory;