diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-02-10 23:17:51 +0100 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-02-10 23:17:51 +0100 |
| commit | 268f3d757f264fcd1c2217a41d5fa480e0c91a8f (patch) | |
| tree | 772cecf1f330ca94db34c1f1f0649d025b203a56 /src/modules | |
| parent | a9e5e2e31a73e4ca546bf89e807b71187a41b657 (diff) | |
| parent | 1ecaebc50d073f17272f40d7ce0b9b60cf24cda3 (diff) | |
| download | px4-firmware-268f3d757f264fcd1c2217a41d5fa480e0c91a8f.tar.gz px4-firmware-268f3d757f264fcd1c2217a41d5fa480e0c91a8f.tar.bz2 px4-firmware-268f3d757f264fcd1c2217a41d5fa480e0c91a8f.zip | |
Merge branch 'beta' of https://github.com/PX4/Firmware into beta
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/fw_pos_control_l1/fw_pos_control_l1_params.c | 2 | ||||
| -rw-r--r-- | src/modules/navigator/navigator_params.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/fw_pos_control_l1/fw_pos_control_l1_params.c b/src/modules/fw_pos_control_l1/fw_pos_control_l1_params.c index ee8721ff9..512ca7b8a 100644 --- a/src/modules/fw_pos_control_l1/fw_pos_control_l1_params.c +++ b/src/modules/fw_pos_control_l1/fw_pos_control_l1_params.c @@ -168,7 +168,7 @@ PARAM_DEFINE_FLOAT(FW_T_SINK_MAX, 5.0f); PARAM_DEFINE_FLOAT(FW_T_HRATE_P, 0.05f); PARAM_DEFINE_FLOAT(FW_T_SRATE_P, 0.05f); -PARAM_DEFINE_FLOAT(FW_LND_ANG, 10.0f); +PARAM_DEFINE_FLOAT(FW_LND_ANG, 5.0f); PARAM_DEFINE_FLOAT(FW_LND_SLLR, 0.9f); PARAM_DEFINE_FLOAT(FW_LND_HVIRT, 10.0f); PARAM_DEFINE_FLOAT(FW_LND_FLALT, 15.0f); diff --git a/src/modules/navigator/navigator_params.c b/src/modules/navigator/navigator_params.c index d5e00e35d..1ba159a8e 100644 --- a/src/modules/navigator/navigator_params.c +++ b/src/modules/navigator/navigator_params.c @@ -55,7 +55,7 @@ PARAM_DEFINE_FLOAT(NAV_MIN_ALT, 50.0f); PARAM_DEFINE_FLOAT(NAV_ACCEPT_RAD, 10.0f); -PARAM_DEFINE_FLOAT(NAV_LOITER_RAD, 100.0f); +PARAM_DEFINE_FLOAT(NAV_LOITER_RAD, 50.0f); PARAM_DEFINE_INT32(NAV_ONB_MIS_EN, 0); PARAM_DEFINE_FLOAT(NAV_TAKEOFF_ALT, 10.0f); // default TAKEOFF altitude PARAM_DEFINE_FLOAT(NAV_LAND_ALT, 5.0f); // slow descend from this altitude when landing |