merged release_v1.0.0 into master

This commit is contained in:
Lorenz Meier
2015-06-30 15:30:45 +02:00
23 changed files with 1085 additions and 105 deletions

View File

@@ -150,11 +150,12 @@ PARAM_DEFINE_FLOAT(COM_EF_THROT, 0.5f);
/**
* Engine Failure Current/Throttle Threshold
*
* Engine failure triggers only below this current/throttle value
* Engine failure triggers only below this current value
*
* @group Commander
* @min 0.0
* @max 7.0
* @max 30.0
* @unit ampere
*/
PARAM_DEFINE_FLOAT(COM_EF_C2T, 5.0f);
@@ -167,7 +168,7 @@ PARAM_DEFINE_FLOAT(COM_EF_C2T, 5.0f);
* @group Commander
* @unit second
* @min 0.0
* @max 7.0
* @max 60.0
*/
PARAM_DEFINE_FLOAT(COM_EF_TIME, 10.0f);