aboutsummaryrefslogtreecommitdiff
path: root/src/lib/launchdetection/CatapultLaunchMethod.h
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-11-26 07:56:54 +0100
committerLorenz Meier <lm@inf.ethz.ch>2014-11-26 07:56:54 +0100
commit6200a3e3a5f24f40ff9da8b3fb366b7014656941 (patch)
tree5fc03991b903894d869125af757954de92331279 /src/lib/launchdetection/CatapultLaunchMethod.h
parent034d0a6a610c8838d6c43b51a4401ce818b77624 (diff)
parentcbcd1ea1d143dfddd2331fb14d17d7be48fa8b6f (diff)
downloadpx4-firmware-6200a3e3a5f24f40ff9da8b3fb366b7014656941.tar.gz
px4-firmware-6200a3e3a5f24f40ff9da8b3fb366b7014656941.tar.bz2
px4-firmware-6200a3e3a5f24f40ff9da8b3fb366b7014656941.zip
Added TeraRanger one sensor
Diffstat (limited to 'src/lib/launchdetection/CatapultLaunchMethod.h')
-rw-r--r--src/lib/launchdetection/CatapultLaunchMethod.h15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/lib/launchdetection/CatapultLaunchMethod.h b/src/lib/launchdetection/CatapultLaunchMethod.h
index 23757f6f3..321dfb1de 100644
--- a/src/lib/launchdetection/CatapultLaunchMethod.h
+++ b/src/lib/launchdetection/CatapultLaunchMethod.h
@@ -57,16 +57,23 @@ public:
~CatapultLaunchMethod();
void update(float accel_x);
- bool getLaunchDetected();
+ LaunchDetectionResult getLaunchDetected() const;
void reset();
+ float getPitchMax(float pitchMaxDefault);
private:
hrt_abstime last_timestamp;
float integrator;
- bool launchDetected;
+ float motorDelayCounter;
- control::BlockParamFloat threshold_accel;
- control::BlockParamFloat threshold_time;
+ LaunchDetectionResult state;
+
+ control::BlockParamFloat thresholdAccel;
+ control::BlockParamFloat thresholdTime;
+ control::BlockParamFloat motorDelay;
+ control::BlockParamFloat pitchMaxPreThrottle; /**< Upper pitch limit before throttle is turned on.
+ Can be used to make sure that the AC does not climb
+ too much while attached to a bungee */
};