Merged master

This commit is contained in:
Lorenz Meier
2013-07-15 15:02:45 +02:00
56 changed files with 1926 additions and 958 deletions
+1 -1
View File
@@ -515,7 +515,7 @@ usage(const char *reason)
* Makefile does only apply to this management task.
*
* The actual stack size should be set in the call
* to task_create().
* to task_spawn_cmd().
*/
int ex_fixedwing_control_main(int argc, char *argv[])
{
@@ -102,7 +102,7 @@ usage(const char *reason)
* Makefile does only apply to this management task.
*
* The actual stack size should be set in the call
* to task_spawn().
* to task_spawn_cmd().
*/
int flow_position_control_main(int argc, char *argv[])
{
@@ -119,7 +119,7 @@ int flow_position_control_main(int argc, char *argv[])
}
thread_should_exit = false;
deamon_task = task_spawn("flow_position_control",
deamon_task = task_spawn_cmd("flow_position_control",
SCHED_DEFAULT,
SCHED_PRIORITY_MAX - 6,
4096,
@@ -91,7 +91,7 @@ static void usage(const char *reason)
* Makefile does only apply to this management task.
*
* The actual stack size should be set in the call
* to task_create().
* to task_spawn_cmd().
*/
int flow_position_estimator_main(int argc, char *argv[])
{
@@ -108,7 +108,7 @@ int flow_position_estimator_main(int argc, char *argv[])
}
thread_should_exit = false;
daemon_task = task_spawn("flow_position_estimator",
daemon_task = task_spawn_cmd("flow_position_estimator",
SCHED_RR,
SCHED_PRIORITY_MAX - 5,
4096,
@@ -100,7 +100,7 @@ usage(const char *reason)
* Makefile does only apply to this management task.
*
* The actual stack size should be set in the call
* to task_spawn().
* to task_spawn_cmd().
*/
int flow_speed_control_main(int argc, char *argv[])
{
@@ -117,7 +117,7 @@ int flow_speed_control_main(int argc, char *argv[])
}
thread_should_exit = false;
deamon_task = task_spawn("flow_speed_control",
deamon_task = task_spawn_cmd("flow_speed_control",
SCHED_DEFAULT,
SCHED_PRIORITY_MAX - 6,
4096,