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.h | |
| 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.h')
| -rw-r--r-- | src/lib/launchdetection/LaunchDetector.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/launchdetection/LaunchDetector.h b/src/lib/launchdetection/LaunchDetector.h index 05708c526..8066ebab3 100644 --- a/src/lib/launchdetection/LaunchDetector.h +++ b/src/lib/launchdetection/LaunchDetector.h @@ -45,10 +45,13 @@ #include <stdint.h> #include "LaunchMethod.h" - +#include <controllib/blocks.hpp> #include <controllib/block/BlockParam.hpp> -class __EXPORT LaunchDetector +namespace launchdetection +{ + +class __EXPORT LaunchDetector : public control::SuperBlock { public: LaunchDetector(); @@ -57,7 +60,6 @@ public: void update(float accel_x); bool getLaunchDetected(); - void updateParams(); bool launchDetectionEnabled() { return (bool)launchdetection_on.get(); }; float getThrottlePreTakeoff() {return throttlePreTakeoff.get(); } @@ -72,5 +74,6 @@ private: }; +} #endif // LAUNCHDETECTOR_H |