diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-12 09:39:52 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-12 09:39:52 +0200 |
| commit | 7c75f61863436df3ca7610b11d2022dd422cca8c (patch) | |
| tree | 44a91e4e39e396272bd8b16121721fceb5b5582b /src/modules/mc_att_control | |
| parent | 8cbd38061ccccf2173b16ea4b5db69bb1fbd2fd4 (diff) | |
| parent | 3f4c264050774e79add989cb85a80623038478c0 (diff) | |
| download | px4-firmware-7c75f61863436df3ca7610b11d2022dd422cca8c.tar.gz px4-firmware-7c75f61863436df3ca7610b11d2022dd422cca8c.tar.bz2 px4-firmware-7c75f61863436df3ca7610b11d2022dd422cca8c.zip | |
Merge remote-tracking branch 'upstream/master' into manualcontrolrename
Conflicts:
src/modules/commander/commander.cpp
src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
src/modules/uORB/topics/manual_control_setpoint.h
Diffstat (limited to 'src/modules/mc_att_control')
| -rw-r--r-- | src/modules/mc_att_control/mc_att_control_main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/mc_att_control/mc_att_control_main.cpp b/src/modules/mc_att_control/mc_att_control_main.cpp index 5f6963ce9..7580c8a78 100644 --- a/src/modules/mc_att_control/mc_att_control_main.cpp +++ b/src/modules/mc_att_control/mc_att_control_main.cpp @@ -225,9 +225,9 @@ private: static void task_main_trampoline(int argc, char *argv[]); /** - * Main sensor collection task. + * Main attitude control task. */ - void task_main() __attribute__((noreturn)); + void task_main(); }; namespace mc_att_control |