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.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/CatapultLaunchMethod.h')
-rw-r--r-- | src/lib/launchdetection/CatapultLaunchMethod.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/launchdetection/CatapultLaunchMethod.h b/src/lib/launchdetection/CatapultLaunchMethod.h index b8476b4c8..55c46ff3f 100644 --- a/src/lib/launchdetection/CatapultLaunchMethod.h +++ b/src/lib/launchdetection/CatapultLaunchMethod.h @@ -44,17 +44,20 @@ #include "LaunchMethod.h" #include <drivers/drv_hrt.h> +#include <controllib/blocks.hpp> #include <controllib/block/BlockParam.hpp> -class CatapultLaunchMethod : public LaunchMethod +namespace launchdetection +{ + +class CatapultLaunchMethod : public LaunchMethod, public control::SuperBlock { public: - CatapultLaunchMethod(); + CatapultLaunchMethod(SuperBlock *parent); ~CatapultLaunchMethod(); void update(float accel_x); bool getLaunchDetected(); - void updateParams(); void reset(); private: @@ -68,3 +71,5 @@ private: }; #endif /* CATAPULTLAUNCHMETHOD_H_ */ + +} |