Merge branch 'master' of github.com:PX4/Firmware into control_state

src/modules/fw_att_control/CMakeLists.txt

@@ -1,6 +1,6 @@
 ############################################################################
 #
-#   Copyright (c) 2013 PX4 Development Team. All rights reserved.
+#   Copyright (c) 2015 PX4 Development Team. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -30,18 +30,16 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-
-#
-# Fixedwing attitude control application
-#
-
-MODULE_COMMAND	= fw_att_control
-
-SRCS		= fw_att_control_main.cpp \
-		  fw_att_control_params.c
-
-# Startup handler, the actual app stack size is
-# in the task_spawn command
-MODULE_STACKSIZE = 1200
-
-MAXOPTIMIZATION = -Os
+px4_add_module(
+	MODULE modules__fw_att_control
+	MAIN fw_att_control
+	STACK 1200
+	COMPILE_FLAGS
+		-Os
+	SRCS
+		fw_att_control_main.cpp
+		fw_att_control_params.c
+	DEPENDS
+		platforms__common
+	)
+# vim: set noet ft=cmake fenc=utf-8 ff=unix : 

src/modules/fw_att_control/fw_att_control_main.cpp

@@ -1112,7 +1112,7 @@ FixedwingAttitudeControl::start()
 	_control_task = px4_task_spawn_cmd("fw_att_control",
 				       SCHED_DEFAULT,
 				       SCHED_PRIORITY_MAX - 5,
-				       1600,
+				       1300,
 				       (px4_main_t)&FixedwingAttitudeControl::task_main_trampoline,
 				       nullptr);