diff options
| author | Julian Oes <julian@oes.ch> | 2014-04-26 23:08:11 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-04-26 23:08:11 +0200 |
| commit | e8531e8360e4f061f3cd69db90365f64837a7c76 (patch) | |
| tree | fda98a4bf7bd67f339757f921a01976b45e37236 /src/modules/mc_pos_control/mc_pos_control_params.c | |
| parent | 3a12cb46487980dbf85f4606e316d9643a2b3b23 (diff) | |
| parent | 13dfe0447ccfa4f75b551d02b5c979a6ade4c81a (diff) | |
| download | px4-firmware-e8531e8360e4f061f3cd69db90365f64837a7c76.tar.gz px4-firmware-e8531e8360e4f061f3cd69db90365f64837a7c76.tar.bz2 px4-firmware-e8531e8360e4f061f3cd69db90365f64837a7c76.zip | |
Merge remote-tracking branch 'px4/ekf_home_init' into navigator_cleanup_ekf_home_init
Conflicts:
src/modules/commander/commander.cpp
src/modules/mc_pos_control/mc_pos_control_main.cpp
src/modules/navigator/navigator_main.cpp
src/modules/uORB/topics/vehicle_global_position.h
Diffstat (limited to 'src/modules/mc_pos_control/mc_pos_control_params.c')
| -rw-r--r-- | src/modules/mc_pos_control/mc_pos_control_params.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/modules/mc_pos_control/mc_pos_control_params.c b/src/modules/mc_pos_control/mc_pos_control_params.c index 0082a5e6a..fe0004ea8 100644 --- a/src/modules/mc_pos_control/mc_pos_control_params.c +++ b/src/modules/mc_pos_control/mc_pos_control_params.c @@ -100,6 +100,7 @@ PARAM_DEFINE_FLOAT(MPC_Z_VEL_D, 0.0f); * * Maximum vertical velocity in AUTO mode and endpoint for stabilized modes (SEATBELT, EASY). * + * @unit m/s * @min 0.0 * @group Multicopter Position Control */ @@ -155,6 +156,7 @@ PARAM_DEFINE_FLOAT(MPC_XY_VEL_D, 0.01f); * * Maximum horizontal velocity in AUTO mode and endpoint for position stabilized mode (EASY). * + * @unit m/s * @min 0.0 * @group Multicopter Position Control */ @@ -176,15 +178,17 @@ PARAM_DEFINE_FLOAT(MPC_XY_FF, 0.5f); * * Limits maximum tilt in AUTO and EASY modes. * + * @unit deg * @min 0.0 - * @max 1.57 + * @max 90.0 * @group Multicopter Position Control */ -PARAM_DEFINE_FLOAT(MPC_TILT_MAX, 1.0f); +PARAM_DEFINE_FLOAT(MPC_TILT_MAX, 45.0f); /** * Landing descend rate * + * @unit m/s * @min 0.0 * @group Multicopter Position Control */ @@ -195,8 +199,9 @@ PARAM_DEFINE_FLOAT(MPC_LAND_SPEED, 1.0f); * * Limits maximum tilt on landing. * + * @unit deg * @min 0.0 - * @max 1.57 + * @max 90.0 * @group Multicopter Position Control */ -PARAM_DEFINE_FLOAT(MPC_LAND_TILT, 0.3f); +PARAM_DEFINE_FLOAT(MPC_LAND_TILT, 15.0f); |