FHWS/Indoor
Archived
4
0
Fork 0
Code Issues 19 Pull Requests Releases 1 Wiki Activity

changed threshold for steps

Browse Source
This commit is contained in:
toni
2016-10-01 13:32:55 +02:00
parent 729340031d
commit 7fcdaa9c86
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
grid/factory/v2/Importance.h
View File

@@ -123,7 +123,7 @@ public:
const bool useNormal = (distToWall_m*3.5 < distToDoor_m && distToWall_m*3.5 < distToStair_m); const bool useNormal = (distToWall_m*3.5 < distToDoor_m && distToWall_m*3.5 < distToStair_m);
// final probability // final probability
n1.walkImportance = 1.0f; n1.walkImportance = 1.0f;
//n1.walkImportance += favorDoors.getProbability(distToDoor_m) * 0.75f; //n1.walkImportance += favorDoors.getProbability(distToDoor_m) * 0.75f;
n1.walkImportance += favorStairs.getProbability(distToStair_m) * 1.0f; n1.walkImportance += favorStairs.getProbability(distToStair_m) * 1.0f;

6
sensors/imu/StepDetection.h
View File

@@ -34,9 +34,9 @@ private:
Timestamp blockUntil; Timestamp blockUntil;
bool waitForUp = false; bool waitForUp = false;
const Timestamp blockTime = Timestamp::fromMS(150); // 150-250 looks good const Timestamp blockTime = Timestamp::fromMS(250); // 150-250 looks good
const float upperThreshold = +0.4*0.6f; // + is usually smaller than down (look at graphs) const float upperThreshold = +0.4*0.6f; // + is usually smaller than down (look at graphs)
const float lowerThreshold = -0.8*0.6f; // the 0.8 is for testing! const float lowerThreshold = -1.5*0.6f; // the 0.8 is for testing!
public: public:

2
sensors/pressure/ActivityButterPressure.h
View File

@@ -52,7 +52,7 @@ public:
/** ctor */ /** ctor */
ActivityButterPressure() : currentActivity(STAY){ ActivityButterPressure() : currentActivity(STAY){
; ;
} }
/** add new sensor readings that were received at the given timestamp */ /** add new sensor readings that were received at the given timestamp */