ecl update to latest master with separate libraries (#9406)

This commit is contained in:
Daniel Agar
2018-05-03 23:48:09 -04:00
committed by GitHub
parent 94d1593e5b
commit 2e92484325
18 changed files with 28 additions and 19 deletions
+2
View File
@@ -46,5 +46,7 @@ px4_add_module(
output_rc.cpp output_rc.cpp
vmount.cpp vmount.cpp
DEPENDS DEPENDS
git_ecl
ecl_geo
) )
+2
View File
@@ -38,5 +38,7 @@ px4_add_module(
SRCS SRCS
bottle_drop.cpp bottle_drop.cpp
DEPENDS DEPENDS
git_ecl
ecl_geo
) )
@@ -40,5 +40,7 @@ px4_add_module(
SRCS SRCS
attitude_estimator_q_main.cpp attitude_estimator_q_main.cpp
DEPENDS DEPENDS
git_ecl
ecl_geo_lookup
) )
+2 -3
View File
@@ -37,11 +37,10 @@ px4_add_module(
-Wno-sign-compare # TODO: fix all sign-compare -Wno-sign-compare # TODO: fix all sign-compare
STACK_MAIN 2500 STACK_MAIN 2500
STACK_MAX 4000 STACK_MAX 4000
INCLUDES
${PX4_SOURCE_DIR}/src/lib/ecl
SRCS SRCS
ekf2_main.cpp ekf2_main.cpp
DEPENDS DEPENDS
git_ecl git_ecl
ecl ecl_EKF
ecl_geo
) )
+1 -1
View File
@@ -37,5 +37,5 @@ px4_add_module(
FixedwingAttitudeControl.cpp FixedwingAttitudeControl.cpp
DEPENDS DEPENDS
git_ecl git_ecl
ecl ecl_attitude_fw
) )
+2 -3
View File
@@ -38,14 +38,13 @@ px4_add_module(
MODULE modules__fw_pos_control_l1 MODULE modules__fw_pos_control_l1
MAIN fw_pos_control_l1 MAIN fw_pos_control_l1
STACK_MAIN 1200 STACK_MAIN 1200
INCLUDES
${PX4_SOURCE_DIR}/src/lib/ecl
SRCS SRCS
FixedwingPositionControl.cpp FixedwingPositionControl.cpp
Landingslope.cpp Landingslope.cpp
DEPENDS DEPENDS
git_ecl git_ecl
ecl ecl_l1
ecl_tecs
launchdetection launchdetection
runway_takeoff runway_takeoff
) )
@@ -38,6 +38,4 @@ px4_add_module(
SRCS SRCS
GroundRoverAttitudeControl.cpp GroundRoverAttitudeControl.cpp
DEPENDS DEPENDS
git_ecl
ecl
) )
+1 -5
View File
@@ -33,13 +33,9 @@
px4_add_module( px4_add_module(
MODULE modules__gnd_pos_control MODULE modules__gnd_pos_control
MAIN gnd_pos_control MAIN gnd_pos_control
STACK_MAIN 1200
COMPILE_FLAGS
INCLUDES
${PX4_SOURCE_DIR}/src/lib/ecl
SRCS SRCS
GroundRoverPositionControl.cpp GroundRoverPositionControl.cpp
DEPENDS DEPENDS
git_ecl git_ecl
ecl ecl_l1
) )
@@ -51,4 +51,6 @@ px4_add_module(
sensors/landing_target.cpp sensors/landing_target.cpp
DEPENDS DEPENDS
controllib controllib
git_ecl
ecl_geo
) )
+2
View File
@@ -64,4 +64,6 @@ px4_add_module(
DEPENDS DEPENDS
git_mavlink_v2 git_mavlink_v2
conversion conversion
git_ecl
ecl_geo
) )
+1 -1
View File
@@ -43,5 +43,5 @@ px4_add_module(
controllib controllib
flight_tasks flight_tasks
git_ecl git_ecl
ecl ecl_geo
) )
+1 -1
View File
@@ -55,5 +55,5 @@ px4_add_module(
follow_target.cpp follow_target.cpp
DEPENDS DEPENDS
git_ecl git_ecl
ecl ecl_geo
) )
@@ -42,4 +42,6 @@ px4_add_module(
inertial_filter.cpp inertial_filter.cpp
DEPENDS DEPENDS
terrain_estimation terrain_estimation
git_ecl
ecl_geo
) )
+1 -1
View File
@@ -49,5 +49,5 @@ px4_add_module(
drivers__device drivers__device
battery battery
git_ecl git_ecl
ecl ecl_validation
) )
+2
View File
@@ -68,6 +68,8 @@ px4_add_module(
battery battery
conversion conversion
drivers__ledsim drivers__ledsim
git_ecl
ecl_geo
) )
target_include_directories(modules__simulator INTERFACE ${PX4_SOURCE_DIR}/mavlink/include/mavlink) target_include_directories(modules__simulator INTERFACE ${PX4_SOURCE_DIR}/mavlink/include/mavlink)
@@ -37,4 +37,7 @@ px4_add_module(
${PX4_SOURCE_DIR}/src/lib/ecl ${PX4_SOURCE_DIR}/src/lib/ecl
SRCS SRCS
wind_estimator_main.cpp wind_estimator_main.cpp
DEPENDS
git_ecl
ecl_airdata
) )
+1 -1
View File
@@ -92,5 +92,5 @@ px4_add_module(
DEPENDS DEPENDS
modules__mc_pos_control__mc_pos_control_tests modules__mc_pos_control__mc_pos_control_tests
git_ecl git_ecl
ecl ecl_geo_lookup # TODO: move this
) )