20ae2f5c2a
added ble as sensor to java and c++ added sensorlistener for ble added ble to observation and onDataSensor in filter started to work on ble fingerprints for optimization
52 lines
1.3 KiB
C
52 lines
1.3 KiB
C
#ifndef STATE_H
|
|
#define STATE_H
|
|
|
|
#include <Indoor/sensors/radio/WiFiMeasurements.h>
|
|
#include <Indoor/sensors/beacon/BeaconMeasurements.h>
|
|
#include <Indoor/sensors/gps/GPSData.h>
|
|
#include <Indoor/sensors/activity/Activity.h>
|
|
|
|
/** observed sensor data */
|
|
struct MyObservation {
|
|
|
|
/** wifi measurements */
|
|
WiFiMeasurements wifi;
|
|
|
|
/** ble measurements */
|
|
BeaconMeasurements ble;
|
|
|
|
/** gps measurements */
|
|
GPSData gps;
|
|
|
|
// TODO: switch to a general activity enum/detector for barometer + accelerometer + ...?
|
|
/** detected activity */
|
|
Activity activity;
|
|
|
|
/** time of evaluation */
|
|
Timestamp currentTime;
|
|
|
|
};
|
|
|
|
/** (observed) control data */
|
|
struct MyControl {
|
|
|
|
/** turn angle (in radians) since the last transition */
|
|
float turnSinceLastTransition_rad = 0;
|
|
|
|
/** number of steps since the last transition */
|
|
int numStepsSinceLastTransition = 0;
|
|
|
|
// TODO: switch to a general activity enum/detector using barometer + accelerometer?
|
|
/** currently detected activity */
|
|
Activity activity;
|
|
|
|
/** reset the control-data after each transition */
|
|
void resetAfterTransition() {
|
|
turnSinceLastTransition_rad = 0;
|
|
numStepsSinceLastTransition = 0;
|
|
}
|
|
|
|
};
|
|
|
|
#endif // STATE_H
|