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/LaunchDetector.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/LaunchDetector.cpp')
-rw-r--r-- | src/lib/launchdetection/LaunchDetector.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/lib/launchdetection/LaunchDetector.cpp b/src/lib/launchdetection/LaunchDetector.cpp index 4109a90ba..bf539701b 100644 --- a/src/lib/launchdetection/LaunchDetector.cpp +++ b/src/lib/launchdetection/LaunchDetector.cpp @@ -42,12 +42,16 @@ #include "CatapultLaunchMethod.h" #include <systemlib/err.h> +namespace launchdetection +{ + LaunchDetector::LaunchDetector() : - launchdetection_on(NULL, "LAUN_ALL_ON", false), - throttlePreTakeoff(NULL, "LAUN_THR_PRE", false) + SuperBlock(NULL, "LAUN"), + launchdetection_on(this, "ALL_ON"), + throttlePreTakeoff(this, "THR_PRE") { /* init all detectors */ - launchMethods[0] = new CatapultLaunchMethod(); + launchMethods[0] = new CatapultLaunchMethod(this); /* update all parameters of all detectors */ @@ -87,12 +91,4 @@ bool LaunchDetector::getLaunchDetected() return false; } -void LaunchDetector::updateParams() { - - launchdetection_on.update(); - throttlePreTakeoff.update(); - - for (uint8_t i = 0; i < sizeof(launchMethods)/sizeof(LaunchMethod); i++) { - launchMethods[i]->updateParams(); - } } |