fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-01 04:31:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

ported vtol module to posix

Browse Source
This commit is contained in:
tumbili
2015-11-25 13:28:23 +01:00
parent 7127f6a92f
commit 27f027b3e4
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/vtol_att_control/vtol_att_control_main.cpp
-4
View File
@@ -741,11 +741,7 @@ VtolAttitudeControl::start()
SCHED_DEFAULT, SCHED_DEFAULT,
SCHED_PRIORITY_MAX - 10, SCHED_PRIORITY_MAX - 10,
2048, 2048,
<<<<<<< HEAD
(px4_main_t)&VtolAttitudeControl::task_main_trampoline, (px4_main_t)&VtolAttitudeControl::task_main_trampoline,
=======
(main_t)&VtolAttitudeControl::task_main_trampoline,
>>>>>>> fixed code style
nullptr); nullptr);
if (_control_task < 0) { if (_control_task < 0) {