fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-22 19:03:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Launch detector: Use idle throttle param

Browse Source
This commit is contained in:
Lorenz Meier
2016-02-17 19:31:01 +01:00
parent e98cd6c746
commit bd606b05df
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/launchdetection/LaunchDetector.cpp
+1 -1
View File
@@ -48,7 +48,7 @@ LaunchDetector::LaunchDetector() :
SuperBlock(NULL, "LAUN"), SuperBlock(NULL, "LAUN"),
activeLaunchDetectionMethodIndex(-1), activeLaunchDetectionMethodIndex(-1),
launchdetection_on(this, "ALL_ON"), launchdetection_on(this, "ALL_ON"),
throttlePreTakeoff(this, "THR_PRE") throttlePreTakeoff(nullptr, "FW_THR_IDLE")
{ {
/* init all detectors */ /* init all detectors */
launchMethods[0] = new CatapultLaunchMethod(this); launchMethods[0] = new CatapultLaunchMethod(this);
src/lib/launchdetection/launchdetection_params.c
+1 -12
View File
@@ -77,7 +77,7 @@ PARAM_DEFINE_FLOAT(LAUN_CAT_T, 0.05f);
* Motor delay * Motor delay
* *
* Delay between starting attitude control and powering up the throttle (giving throttle control to the controller) * Delay between starting attitude control and powering up the throttle (giving throttle control to the controller)
* Before this timespan is up the throttle will be set to LAUN_THR_PRE, set to 0 to deactivate * Before this timespan is up the throttle will be set to FW_THR_IDLE, set to 0 to deactivate
* *
* @unit seconds * @unit seconds
* @min 0 * @min 0
@@ -97,14 +97,3 @@ PARAM_DEFINE_FLOAT(LAUN_CAT_MDEL, 0.0f);
* @group Launch detection * @group Launch detection
*/ */
PARAM_DEFINE_FLOAT(LAUN_CAT_PMAX, 30.0f); PARAM_DEFINE_FLOAT(LAUN_CAT_PMAX, 30.0f);
/**
* Throttle setting while detecting launch.
*
* The throttle is set to this value while the system is waiting for the take-off.
*
* @min 0
* @max 1
* @group Launch detection
*/
PARAM_DEFINE_FLOAT(LAUN_THR_PRE, 0.0f);