FHWS/YASMIN
Archived
3
0
Fork 0
Code Issues 12 Pull Requests Releases Wiki Activity

started to add ble functions

Browse Source 
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
This commit is contained in:
mail@toni-fetzer.de
2019-06-05 18:04:31 +02:00
parent b9b9d8f9ac
commit 20ae2f5c2a
23 changed files with 1341 additions and 1152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
nav/Observation.h
View File

@@ -2,45 +2,49 @@
#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;
/** wifi measurements */
WiFiMeasurements wifi;
/** gps measurements */
GPSData gps;
/** ble measurements */
BeaconMeasurements ble;
// TODO: switch to a general activity enum/detector for barometer + accelerometer + ...?
/** detected activity */
Activity activity;
/** gps measurements */
GPSData gps;
/** time of evaluation */
Timestamp currentTime;
// 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;
/** turn angle (in radians) since the last transition */
float turnSinceLastTransition_rad = 0;
/** number of steps since the last transition */
int numStepsSinceLastTransition = 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;
// 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;
}
/** reset the control-data after each transition */
void resetAfterTransition() {
turnSinceLastTransition_rad = 0;
numStepsSinceLastTransition = 0;
}
};