From 32d062836e85bd2edb94674478edf51ad8a7313c Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Mon, 26 Oct 2015 16:08:32 +0100 Subject: [PATCH] Moved ECL into its own submodule --- .gitmodules | 3 +++ CMakeLists.txt | 1 + src/lib/ecl | 1 + src/modules/fw_att_control/CMakeLists.txt | 2 ++ src/modules/fw_pos_control_l1/CMakeLists.txt | 1 + src/platforms/px4_defines.h | 1 + 6 files changed, 9 insertions(+) create mode 160000 src/lib/ecl diff --git a/.gitmodules b/.gitmodules index b84b78548e..374befd536 100644 --- a/.gitmodules +++ b/.gitmodules @@ -31,3 +31,6 @@ [submodule "src/lib/DriverFramework"] path = src/lib/DriverFramework url = https://github.com/PX4/DriverFramework.git +[submodule "src/lib/ecl"] + path = src/lib/ecl + url = https://github.com/LorenzMeier/ecl.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 607fafb9ee..9bd26e839c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -245,6 +245,7 @@ px4_add_git_submodule(TARGET git_uavcan PATH "src/modules/uavcan/libuavcan") px4_add_git_submodule(TARGET git_nuttx PATH "NuttX") px4_add_git_submodule(TARGET git_dspal PATH "src/lib/dspal") px4_add_git_submodule(TARGET git_driverframework PATH "src/lib/DriverFramework") +px4_add_git_submodule(TARGET git_ecl PATH "src/lib/ecl") px4_add_git_submodule(TARGET git_jmavsim PATH "Tools/jMAVSim") px4_add_git_submodule(TARGET git_gazebo PATH "Tools/sitl_gazebo") px4_add_git_submodule(TARGET git_matrix PATH "src/lib/matrix") diff --git a/src/lib/ecl b/src/lib/ecl new file mode 160000 index 0000000000..e5743d503c --- /dev/null +++ b/src/lib/ecl @@ -0,0 +1 @@ +Subproject commit e5743d503c416693f11be3af13fdcd442e49cbce diff --git a/src/modules/fw_att_control/CMakeLists.txt b/src/modules/fw_att_control/CMakeLists.txt index b093c71cee..5d0e6648c2 100644 --- a/src/modules/fw_att_control/CMakeLists.txt +++ b/src/modules/fw_att_control/CMakeLists.txt @@ -40,5 +40,7 @@ px4_add_module( fw_att_control_main.cpp DEPENDS platforms__common + git_ecl + lib__ecl ) # vim: set noet ft=cmake fenc=utf-8 ff=unix : diff --git a/src/modules/fw_pos_control_l1/CMakeLists.txt b/src/modules/fw_pos_control_l1/CMakeLists.txt index e74b6e4b37..720d97fac7 100644 --- a/src/modules/fw_pos_control_l1/CMakeLists.txt +++ b/src/modules/fw_pos_control_l1/CMakeLists.txt @@ -44,6 +44,7 @@ px4_add_module( mtecs/limitoverride.cpp DEPENDS platforms__common + git_ecl lib__external_lgpl lib__ecl ) diff --git a/src/platforms/px4_defines.h b/src/platforms/px4_defines.h index 4d453e5983..6f46bb2421 100644 --- a/src/platforms/px4_defines.h +++ b/src/platforms/px4_defines.h @@ -40,6 +40,7 @@ #pragma once #include +#include /* Get the name of the default value fiven the param name */ #define PX4_PARAM_DEFAULT_VALUE_NAME(_name) PARAM_##_name##_DEFAULT