From 7fcdaa9c8690ce6437ac70aa158c3c91870386b8 Mon Sep 17 00:00:00 2001 From: toni Date: Sat, 1 Oct 2016 13:32:55 +0200 Subject: [PATCH] changed threshold for steps --- grid/factory/v2/Importance.h | 2 +- sensors/imu/StepDetection.h | 6 +++--- sensors/pressure/ActivityButterPressure.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/grid/factory/v2/Importance.h b/grid/factory/v2/Importance.h index 6ee6f4c..d1c4458 100644 --- a/grid/factory/v2/Importance.h +++ b/grid/factory/v2/Importance.h @@ -123,7 +123,7 @@ public: const bool useNormal = (distToWall_m*3.5 < distToDoor_m && distToWall_m*3.5 < distToStair_m); // final probability - n1.walkImportance = 1.0f; + n1.walkImportance = 1.0f; //n1.walkImportance += favorDoors.getProbability(distToDoor_m) * 0.75f; n1.walkImportance += favorStairs.getProbability(distToStair_m) * 1.0f; diff --git a/sensors/imu/StepDetection.h b/sensors/imu/StepDetection.h index e33ce27..53fe215 100644 --- a/sensors/imu/StepDetection.h +++ b/sensors/imu/StepDetection.h @@ -34,9 +34,9 @@ private: Timestamp blockUntil; bool waitForUp = false; - const Timestamp blockTime = Timestamp::fromMS(150); // 150-250 looks good - 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 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 lowerThreshold = -1.5*0.6f; // the 0.8 is for testing! public: diff --git a/sensors/pressure/ActivityButterPressure.h b/sensors/pressure/ActivityButterPressure.h index 46a5323..5940ae6 100644 --- a/sensors/pressure/ActivityButterPressure.h +++ b/sensors/pressure/ActivityButterPressure.h @@ -52,7 +52,7 @@ public: /** ctor */ ActivityButterPressure() : currentActivity(STAY){ ; - } + } /** add new sensor readings that were received at the given timestamp */