diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-10 19:06:54 +0100 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-10 19:06:54 +0100 |
commit | a6d9b7e864334381a99f4438aeea1173229bc2dd (patch) | |
tree | 0267d758dc50621881f31429653fb93de3776770 /src/lib/launchdetection/CatapultLaunchMethod.cpp | |
parent | 7de6513950e7e66606cc34e92a6e0dfb6fc55c9d (diff) | |
parent | 368c2390cf98980e317171d2a44622f1b6ec9c33 (diff) | |
download | px4-firmware-a6d9b7e864334381a99f4438aeea1173229bc2dd.tar.gz px4-firmware-a6d9b7e864334381a99f4438aeea1173229bc2dd.tar.bz2 px4-firmware-a6d9b7e864334381a99f4438aeea1173229bc2dd.zip |
Merged stack size changes
Diffstat (limited to 'src/lib/launchdetection/CatapultLaunchMethod.cpp')
-rw-r--r-- | src/lib/launchdetection/CatapultLaunchMethod.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/lib/launchdetection/CatapultLaunchMethod.cpp b/src/lib/launchdetection/CatapultLaunchMethod.cpp index 1039b4a09..12f80c4a3 100644 --- a/src/lib/launchdetection/CatapultLaunchMethod.cpp +++ b/src/lib/launchdetection/CatapultLaunchMethod.cpp @@ -41,12 +41,16 @@ #include "CatapultLaunchMethod.h" #include <systemlib/err.h> -CatapultLaunchMethod::CatapultLaunchMethod() : +namespace launchdetection +{ + +CatapultLaunchMethod::CatapultLaunchMethod(SuperBlock *parent) : + SuperBlock(parent, "CAT"), last_timestamp(hrt_absolute_time()), integrator(0.0f), launchDetected(false), - threshold_accel(NULL, "LAUN_CAT_A", false), - threshold_time(NULL, "LAUN_CAT_T", false) + threshold_accel(this, "A"), + threshold_time(this, "T") { } @@ -83,14 +87,11 @@ bool CatapultLaunchMethod::getLaunchDetected() return launchDetected; } -void CatapultLaunchMethod::updateParams() -{ - threshold_accel.update(); - threshold_time.update(); -} void CatapultLaunchMethod::reset() { integrator = 0.0f; launchDetected = false; } + +} |