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

src/modules/fw_pos_control_l1/CMakeLists.txt

@@ -39,11 +39,9 @@ px4_add_module(
 		-Os
 	SRCS
 		fw_pos_control_l1_main.cpp
-		fw_pos_control_l1_params.c
 		landingslope.cpp
 		mtecs/mTecs.cpp
 		mtecs/limitoverride.cpp
-		mtecs/mTecs_params.c
 	DEPENDS
 		platforms__common
 		lib__external_lgpl

src/modules/fw_pos_control_l1/fw_pos_control_l1_params.c

@@ -39,9 +39,6 @@
  * @author Lorenz Meier <lm@inf.ethz.ch>
  */
 
-#include <px4_config.h>
-#include <systemlib/param/param.h>
-
 /*
  * Controller parameters, accessible via MAVLink
  */

src/modules/fw_pos_control_l1/mtecs/mTecs_params.c

@@ -39,9 +39,6 @@
  * @author Thomas Gubler <thomasgubler@gmail.com>
  */
 
-#include <px4_config.h>
-#include <systemlib/param/param.h>
-
 /*
  * Controller parameters, accessible via MAVLink
  */