aboutsummaryrefslogtreecommitdiff
path: root/src/lib/launchdetection/CatapultLaunchMethod.h
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2014-03-08 19:00:49 +0100
committerThomas Gubler <thomasgubler@gmail.com>2014-03-08 19:00:49 +0100
commit935362b7a369e75c18a7aed267d7b0b304e4c430 (patch)
tree4061eb253ef7508706ef8e2bb661e277c82bfb9c /src/lib/launchdetection/CatapultLaunchMethod.h
parent501dc0cfa7259a1916522e5b70a5fd31cb7d20e1 (diff)
downloadpx4-firmware-935362b7a369e75c18a7aed267d7b0b304e4c430.tar.gz
px4-firmware-935362b7a369e75c18a7aed267d7b0b304e4c430.tar.bz2
px4-firmware-935362b7a369e75c18a7aed267d7b0b304e4c430.zip
launchdetection: better integration of Blocks class
Diffstat (limited to 'src/lib/launchdetection/CatapultLaunchMethod.h')
-rw-r--r--src/lib/launchdetection/CatapultLaunchMethod.h11
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_ */
+
+}