current revision

nav/State.h

@@ -2,7 +2,7 @@
 #define STATE_H
 
 #include <Indoor/grid/walk/v2/GridWalker.h>
-#include <Indoor/grid/walk/v2/modules/WalkModuleButterActivity.h>
+#include <Indoor/grid/walk/v2/modules/WalkModuleActivityControl.h>
 #include <Indoor/grid/walk/v2/modules/WalkModuleHeadingControl.h>
 #include <Indoor/grid/walk/v2/modules/WalkModuleNodeImportance.h>
 #include <Indoor/grid/walk/v2/modules/WalkModuleFavorZ.h>
@@ -10,7 +10,7 @@
 #include <Indoor/sensors/radio/WiFiMeasurements.h>
 #include <Indoor/sensors/gps/GPSData.h>
 
-struct MyState : public WalkState, public WalkStateFavorZ, public WalkStateHeading, public WalkStateBarometerActivity {
+struct MyState : public WalkState, public WalkStateFavorZ, public WalkStateHeading {
 
 
 	/** ctor */
@@ -52,6 +52,10 @@ struct MyObservation {
 	/** gps measurements */
 	GPSData gps;
 
+	// TODO: switch to a general activity enum/detector for barometer + accelerometer + ...?
+	/** detected activity */
+	ActivityButterPressure::Activity activity;
+
 	/** time of evaluation */
 	Timestamp currentTime;
 
@@ -66,6 +70,10 @@ struct MyControl {
 	/** number of steps since the last transition */
 	int numStepsSinceLastTransition = 0;
 
+	// TODO: switch to a general activity enum/detector using barometer + accelerometer?
+	/** currently detected activity */
+	ActivityButterPressure::Activity activity;
+
 	/** reset the control-data after each transition */
 	void resetAfterTransition() {
 		turnSinceLastTransition_rad = 0;