diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-03-30 00:25:26 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-03-30 00:25:26 +0400 |
| commit | d2553bfd2930eb02664d564559fa361b80c63f61 (patch) | |
| tree | 21cda568519c33a261edaaa9c370cc9ba9c7f466 /src/lib/launchdetection/LaunchDetector.h | |
| parent | 0789189c0588ebebd24a523f9639411be89c6a9b (diff) | |
| parent | 9b1de5004c673ebe8bdf68f1b518565cccd6b05b (diff) | |
| download | px4-firmware-d2553bfd2930eb02664d564559fa361b80c63f61.tar.gz px4-firmware-d2553bfd2930eb02664d564559fa361b80c63f61.tar.bz2 px4-firmware-d2553bfd2930eb02664d564559fa361b80c63f61.zip | |
Merge branch 'master' into offboard2
Diffstat (limited to 'src/lib/launchdetection/LaunchDetector.h')
| -rw-r--r-- | src/lib/launchdetection/LaunchDetector.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/lib/launchdetection/LaunchDetector.h b/src/lib/launchdetection/LaunchDetector.h index 7c2ff826c..8066ebab3 100644 --- a/src/lib/launchdetection/LaunchDetector.h +++ b/src/lib/launchdetection/LaunchDetector.h @@ -45,18 +45,21 @@ #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(); ~LaunchDetector(); + void reset(); void update(float accel_x); bool getLaunchDetected(); - void updateParams(); bool launchDetectionEnabled() { return (bool)launchdetection_on.get(); }; float getThrottlePreTakeoff() {return throttlePreTakeoff.get(); } @@ -71,5 +74,6 @@ private: }; +} #endif // LAUNCHDETECTOR_H |