Merged master

This commit is contained in:
Lorenz Meier
2014-08-09 12:22:28 +02:00
812 changed files with 33323 additions and 125051 deletions
+2 -2
View File
@@ -122,7 +122,7 @@ private:
actuator_controls_s _controls;
static void task_main_trampoline(int argc, char *argv[]);
void task_main() __attribute__((noreturn));
void task_main();
static int control_callback(uintptr_t handle,
uint8_t control_group,
@@ -229,7 +229,7 @@ HIL::init()
_task = task_spawn_cmd("fmuhil",
SCHED_DEFAULT,
SCHED_PRIORITY_DEFAULT,
2048,
1200,
(main_t)&HIL::task_main_trampoline,
nullptr);