aboutsummaryrefslogtreecommitdiff
path: root/src/lib/launchdetection
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2014-01-05 14:19:19 +0100
committerThomas Gubler <thomasgubler@gmail.com>2014-01-05 14:19:19 +0100
commitf387c0ccc3fca38a2989b784847743b752a78de6 (patch)
tree5e045ef2ac772f11fb5180fd73706db2c2790fcd /src/lib/launchdetection
parentd1e991f1f0183ce6855bf2df15e1fdd311d096d4 (diff)
downloadpx4-firmware-f387c0ccc3fca38a2989b784847743b752a78de6.tar.gz
px4-firmware-f387c0ccc3fca38a2989b784847743b752a78de6.tar.bz2
px4-firmware-f387c0ccc3fca38a2989b784847743b752a78de6.zip
launchdetection: rename pre takeoff throttle param and fix usage
Diffstat (limited to 'src/lib/launchdetection')
-rw-r--r--src/lib/launchdetection/LaunchDetector.cpp4
-rw-r--r--src/lib/launchdetection/LaunchDetector.h4
-rw-r--r--src/lib/launchdetection/launchdetection_params.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/launchdetection/LaunchDetector.cpp b/src/lib/launchdetection/LaunchDetector.cpp
index d894d6a6f..67b32ad82 100644
--- a/src/lib/launchdetection/LaunchDetector.cpp
+++ b/src/lib/launchdetection/LaunchDetector.cpp
@@ -44,7 +44,7 @@
LaunchDetector::LaunchDetector() :
launchdetection_on(NULL, "LAUN_ALL_ON", false),
- throttle_min(NULL, "LAUN_THR_MIN", false)
+ throttlePreTakeoff(NULL, "LAUN_THR_PRE", false)
{
/* init all detectors */
launchMethods[0] = new CatapultLaunchMethod();
@@ -85,7 +85,7 @@ void LaunchDetector::updateParams() {
warnx(" LaunchDetector::updateParams()");
launchdetection_on.update();
- throttle_min.update();
+ throttlePreTakeoff.update();
for (uint8_t i = 0; i < sizeof(launchMethods)/sizeof(LaunchMethod); i++) {
launchMethods[i]->updateParams();
diff --git a/src/lib/launchdetection/LaunchDetector.h b/src/lib/launchdetection/LaunchDetector.h
index 3b8aa0ced..7c2ff826c 100644
--- a/src/lib/launchdetection/LaunchDetector.h
+++ b/src/lib/launchdetection/LaunchDetector.h
@@ -59,14 +59,14 @@ public:
void updateParams();
bool launchDetectionEnabled() { return (bool)launchdetection_on.get(); };
- float getMinThrottle() {return throttle_min.get(); }
+ float getThrottlePreTakeoff() {return throttlePreTakeoff.get(); }
// virtual bool getLaunchDetected();
protected:
private:
LaunchMethod* launchMethods[1];
control::BlockParamInt launchdetection_on;
- control::BlockParamFloat throttle_min;
+ control::BlockParamFloat throttlePreTakeoff;
};
diff --git a/src/lib/launchdetection/launchdetection_params.c b/src/lib/launchdetection/launchdetection_params.c
index e07a2b26d..63a8981aa 100644
--- a/src/lib/launchdetection/launchdetection_params.c
+++ b/src/lib/launchdetection/launchdetection_params.c
@@ -69,4 +69,4 @@ PARAM_DEFINE_FLOAT(LAUN_CAT_T, 0.05f);
// @DisplayName Throttle setting while detecting the launch
// @Description The throttle is set to this value while the system is waiting for the takeoff
// @Range 0 to 1
-PARAM_DEFINE_FLOAT(LAUN_THR_MIN, 0.0f);
+PARAM_DEFINE_FLOAT(LAUN_THR_PRE, 0.0f);