diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2013-12-13 21:07:27 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2013-12-13 21:07:27 +0100 |
commit | c3cbaf5deb00577efa9198f246ebc6011284ff34 (patch) | |
tree | 8f40fef6a2230cf6be262443ac520807cc66aba2 /src/modules/fw_att_control/fw_att_control_params.c | |
parent | 54e739926d3414e29b13d2aa14ebb94fd8ffd4f4 (diff) | |
parent | 0b9b68f0d96f59c9cd406547ee52fb52617a298f (diff) | |
download | px4-firmware-c3cbaf5deb00577efa9198f246ebc6011284ff34.tar.gz px4-firmware-c3cbaf5deb00577efa9198f246ebc6011284ff34.tar.bz2 px4-firmware-c3cbaf5deb00577efa9198f246ebc6011284ff34.zip |
Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator_termination_controlgroups
Conflicts:
src/drivers/px4io/px4io.cpp
Diffstat (limited to 'src/modules/fw_att_control/fw_att_control_params.c')
-rw-r--r-- | src/modules/fw_att_control/fw_att_control_params.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/fw_att_control/fw_att_control_params.c b/src/modules/fw_att_control/fw_att_control_params.c index 240749fed..0b37f48ba 100644 --- a/src/modules/fw_att_control/fw_att_control_params.c +++ b/src/modules/fw_att_control/fw_att_control_params.c @@ -33,9 +33,9 @@ f * Copyright (c) 2013 PX4 Development Team. All rights reserved. ****************************************************************************/ /** - * @file fw_pos_control_l1_params.c + * @file fw_att_control_params.c * - * Parameters defined by the L1 position control task + * Parameters defined by the fixed-wing attitude control task * * @author Lorenz Meier <lm@inf.ethz.ch> */ |