diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-03-09 22:10:46 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-03-09 22:10:46 +0400 |
| commit | 7de6513950e7e66606cc34e92a6e0dfb6fc55c9d (patch) | |
| tree | fc2486917ac6beda289c99e32f6865df213a89b5 /src/lib/launchdetection/CatapultLaunchMethod.cpp | |
| parent | 320624e995d46d80db0d219d9c61af08e1b8cadf (diff) | |
| parent | 647142764fa3ffd5d99f4d43950975cc6a19bded (diff) | |
| download | px4-firmware-7de6513950e7e66606cc34e92a6e0dfb6fc55c9d.tar.gz px4-firmware-7de6513950e7e66606cc34e92a6e0dfb6fc55c9d.tar.bz2 px4-firmware-7de6513950e7e66606cc34e92a6e0dfb6fc55c9d.zip | |
Merge branch 'master' into beta_mavlink2
Diffstat (limited to 'src/lib/launchdetection/CatapultLaunchMethod.cpp')
| -rw-r--r-- | src/lib/launchdetection/CatapultLaunchMethod.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/launchdetection/CatapultLaunchMethod.cpp b/src/lib/launchdetection/CatapultLaunchMethod.cpp index d5c759b17..1039b4a09 100644 --- a/src/lib/launchdetection/CatapultLaunchMethod.cpp +++ b/src/lib/launchdetection/CatapultLaunchMethod.cpp @@ -42,7 +42,7 @@ #include <systemlib/err.h> CatapultLaunchMethod::CatapultLaunchMethod() : - last_timestamp(0), + last_timestamp(hrt_absolute_time()), integrator(0.0f), launchDetected(false), threshold_accel(NULL, "LAUN_CAT_A", false), @@ -88,3 +88,9 @@ void CatapultLaunchMethod::updateParams() threshold_accel.update(); threshold_time.update(); } + +void CatapultLaunchMethod::reset() +{ + integrator = 0.0f; + launchDetected = false; +} |