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

added c++11 fixes

Browse Source 
removed old components
disabled activity (for compiling reasons)
added wifi 2.4ghz hack
This commit is contained in:
k-a-z-u
2018-07-11 13:23:18 +02:00
parent b0712ec005
commit bb974d3871
18 changed files with 107 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sensors/SensorFactory.h
View File

@@ -30,7 +30,7 @@
#include "StepSensor.h"
#include "TurnSensor.h"
#include "ActivitySensor.h"
//#include "ActivitySensor.h"
class SensorFactory {
@@ -90,11 +90,11 @@ public:
return turns;
}
/** get the Activity sensor */
ActivitySensor& getActivity() {
static ActivitySensor activity(getBarometer(), getAccelerometer());
return activity;
}
// /** get the Activity sensor */
// ActivitySensor& getActivity() {
// static ActivitySensor activity(getBarometer(), getAccelerometer());
// return activity;
// }
};

2
sensors/SensorWriter.h
View File

@@ -7,7 +7,7 @@
#include "StepSensor.h"
#include "TurnSensor.h"
#include "WiFiSensor.h"
#include "ActivitySensor.h"
//#include "ActivitySensor.h"
#include "GPSSensor.h"
#include "CompassSensor.h"
#include "SensorFactory.h"

6
sensors/TurnSensor.h
View File

@@ -18,6 +18,7 @@ class TurnSensor :
private:
PoseDetection pose;
TurnDetection turn;
TurnData data;
@@ -27,7 +28,7 @@ private:
public:
/** ctor */
TurnSensor(AccelerometerSensor& acc, GyroscopeSensor& gyro) : acc(acc), gyro(gyro) {
TurnSensor(AccelerometerSensor& acc, GyroscopeSensor& gyro) : acc(acc), gyro(gyro), turn(&pose) {
acc.addListener(this);
gyro.addListener(this);
}
@@ -46,7 +47,8 @@ public:
virtual void onSensorData(Sensor<AccelerometerData>* sensor, const Timestamp ts, const AccelerometerData& data) override {
(void) sensor;
turn.addAccelerometer(ts, data);
//turn.addAccelerometer(ts, data);
pose.addAccelerometer(ts, data);
}
virtual void onSensorData(Sensor<GyroscopeData>* sensor, const Timestamp ts, const GyroscopeData& data) override {

7
sensors/offline/AllInOneSensor.h
View File

@@ -60,7 +60,12 @@ protected:
AccelerometerSensor::informListeners(ts, data);
}
virtual void onGravity(const Timestamp ts, const AccelerometerData data) override {
virtual void onGravity(const Timestamp ts, const GravityData data) override {
(void) ts;
(void) data;
}
virtual void onMagnetometer(const Timestamp ts, const MagnetometerData data) override {
(void) ts;
(void) data;
}