diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2013-11-01 17:39:06 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2013-11-01 17:39:06 +0100 |
| commit | 7d75d020a7e2bde32bc1ad0e496c30b8876a9a26 (patch) | |
| tree | 975ef7cf67b561f22f671b8125f3db96ec3b0350 /src/modules/fw_pos_control_l1/fw_pos_control_l1_params.c | |
| parent | dd02ded703c86ac56c736e2d1f38ad5004924d6b (diff) | |
| parent | e539a89e225c1d6ab127d7953bceec7efecefbdf (diff) | |
| download | px4-firmware-7d75d020a7e2bde32bc1ad0e496c30b8876a9a26.tar.gz px4-firmware-7d75d020a7e2bde32bc1ad0e496c30b8876a9a26.tar.bz2 px4-firmware-7d75d020a7e2bde32bc1ad0e496c30b8876a9a26.zip | |
Merge branch 'fw_autoland' into fw_autoland_att_tecs
Conflicts:
src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
src/modules/fw_pos_control_l1/fw_pos_control_l1_params.c
Diffstat (limited to 'src/modules/fw_pos_control_l1/fw_pos_control_l1_params.c')
| -rw-r--r-- | src/modules/fw_pos_control_l1/fw_pos_control_l1_params.c | 3 |
1 files changed, 3 insertions, 0 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 a6aa45258..b905c66c3 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 @@ -113,3 +113,6 @@ PARAM_DEFINE_FLOAT(FW_T_PTCH_DAMP, 0.0f); PARAM_DEFINE_FLOAT(FW_T_SINK_MAX, 5.0f); PARAM_DEFINE_FLOAT(FW_T_HRATE_P, 0.05f); + +PARAM_DEFINE_FLOAT(FW_LND_ANG, 10.0f); +PARAM_DEFINE_FLOAT(FW_LND_SLL, 64.0f); |