zrzk
/
px4_autopilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Added more eagle build configurations 

The config_qurt_eagle_travis.cmake target is for CI

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
sbg
Mark Charlebois 10 years ago
parent
e3e00e92d7
commit
8dc5d7532e
15 changed files with 441 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 48
      cmake/configs/config_posix_eagle_default.mk
  2. 37
      cmake/configs/config_posix_eagle_hil.cmake
  3. 19
      cmake/configs/config_posix_eagle_muorb.cmake
  4. 32
      cmake/configs/config_posix_eagle_release.cmake
  5. 30
      cmake/configs/config_qurt_eagle_hello.cmake
  6. 66
      cmake/configs/config_qurt_eagle_hil.cmake
  7. 44
      cmake/configs/config_qurt_eagle_muorb.cmake
  8. 86
      cmake/configs/config_qurt_eagle_release.cmake
  9. 41
      cmake/configs/config_qurt_eagle_test.cmake
  10. 70
      cmake/configs/config_qurt_eagle_travis.cmake
  11. 1
      src/firmware/qurt/CMakeLists.txt
  12. 13
      src/platforms/qurt/px4_layer/CMakeLists.txt
  13. 0
      src/platforms/qurt/px4_layer/commands_muorb.c
  14. 0
      src/platforms/qurt/px4_layer/commands_release.c
  15. 0
      src/platforms/qurt/px4_layer/commands_test.c

48
cmake/configs/config_posix_eagle_default.mk
Unescape View File

@ -0,0 +1,48 @@ @@ -0,0 +1,48 @@
include(posix/px4_impl_posix-arm)
function(px4_set_config_modules out_module_list)
set(config_module_list
drivers/device
drivers/blinkm
drivers/pwm_out_sim
drivers/rgbled
drivers/led
modules/sensors
systemcmds/param
systemcmds/mixer
systemcmds/ver
modules/mavlink
modules/attitude_estimator_ekf
modules/ekf_att_pos_estimator
modules/mc_pos_control
modules/mc_att_control
modules/systemlib
modules/systemlib/mixer
modules/uORB
modules/sensors
modules/dataman
modules/sdlog2
modules/simulator
modules/commander
modules/controllib
lib/mathlib
lib/mathlib/math/filter
lib/geo
lib/geo_lookup
lib/conversion
platforms/posix/px4_layer
platforms/posix/work_queue
)
set(${out_module_list} ${config_module_list} PARENT_SCOPE)
endfunction()

37
cmake/configs/config_posix_eagle_hil.cmake
Unescape View File

@ -0,0 +1,37 @@ @@ -0,0 +1,37 @@
include(posix/px4_impl_posix-arm)
function(px4_set_config_modules out_module_list)
set(config_module_list
drivers/device
drivers/boards/sitl
drivers/led
systemcmds/param
systemcmds/ver
modules/mavlink
modules/systemlib
modules/uORB
modules/sensors
modules/dataman
modules/sdlog2
modules/simulator
modules/commander
lib/mathlib
lib/mathlib/math/filter
lib/geo
lib/geo_lookup
lib/conversion
platforms/posix/px4_layer
platforms/posix/work_queue
modules/muorb/krait
)
set(${out_module_list} ${config_module_list} PARENT_SCOPE)
endfunction()

19
cmake/configs/config_posix_eagle_muorb.cmake
Unescape View File

@ -0,0 +1,19 @@ @@ -0,0 +1,19 @@
include(posix/px4_impl_posix-arm)
function(px4_set_config_modules out_module_list)
set(config_module_list
drivers/device
modules/uORB
platforms/posix/px4_layer
platforms/posix/work_queue
modules/muorb/krait
)
set(${out_module_list} ${config_module_list} PARENT_SCOPE)
endfunction()

32
cmake/configs/config_posix_eagle_release.cmake
Unescape View File

@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@
include(posix/px4_impl_posix-arm)
function(px4_set_config_modules out_module_list)
set(config_module_list
drivers/device
systemcmds/param
systemcmds/ver
modules/mavlink
modules/systemlib
modules/uORB
modules/dataman
lib/mathlib
lib/mathlib/math/filter
lib/geo
lib/geo_lookup
lib/conversion
platforms/posix/px4_layer
platforms/posix/work_queue
modules/muorb/krait
)
set(${out_module_list} ${config_module_list} PARENT_SCOPE)
endfunction()

30
cmake/configs/config_qurt_eagle_hello.cmake
Unescape View File

@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
include(qurt/px4_impl_qurt)
function(px4_set_config_modules out_module_list)
set(config_module_list
drivers/device
#
# System commands
#
systemcmds/param
#
# Library modules
#
modules/systemlib
modules/uORB
#
# QuRT port
#
platforms/common
platforms/qurt/px4_layer
platforms/posix/work_queue
platforms/qurt/tests/hello
)
set(${out_module_list} ${config_module_list} PARENT_SCOPE)
endfunction()

66
cmake/configs/config_qurt_eagle_hil.cmake
Unescape View File

@ -0,0 +1,66 @@ @@ -0,0 +1,66 @@
include(qurt/px4_impl_qurt)
function(px4_set_config_modules out_module_list)
set(config_module_list
drivers/device
drivers/boards/sitl
drivers/pwm_out_sim
drivers/led
drivers/rgbled
modules/sensors
#
# System commands
#
systemcmds/param
systemcmds/mixer
#
# Estimation modules (EKF/ SO3 / other filters)
#
#modules/attitude_estimator_ekf
modules/ekf_att_pos_estimator
modules/attitude_estimator_q
modules/position_estimator_inav
#
# Vehicle Control
#
modules/mc_att_control
modules/mc_pos_control
#
# Library modules
#
modules/systemlib
modules/systemlib/mixer
modules/uORB
modules/commander
#
# Libraries
#
lib/mathlib
lib/mathlib/math/filter
lib/geo
lib/geo_lookup
lib/conversion
modules/controllib
#
# QuRT port
#
platforms/common
platforms/qurt/px4_layer
platforms/posix/work_queue
#
# sources for muorb over fastrpc
#
modules/muorb/adsp
)
set(${out_module_list} ${config_module_list} PARENT_SCOPE)
endfunction()

44
cmake/configs/config_qurt_eagle_muorb.cmake
Unescape View File

@ -0,0 +1,44 @@ @@ -0,0 +1,44 @@
include(qurt/px4_impl_qurt)
function(px4_set_config_modules out_module_list)
set(config_module_list
drivers/device
#
# System commands
#
systemcmds/param
#
# Library modules
#
modules/systemlib
modules/uORB
#
# Libraries
#
lib/mathlib
lib/mathlib/math/filter
lib/geo
lib/geo_lookup
lib/conversion
#
# QuRT port
#
platforms/common
platforms/qurt/px4_layer
platforms/posix/work_queue
platforms/qurt/tests/muorb
#
# sources for muorb over fastrpc
#
modules/muorb/adsp
)
set(${out_module_list} ${config_module_list} PARENT_SCOPE)
endfunction()

86
cmake/configs/config_qurt_eagle_release.cmake
Unescape View File

@ -0,0 +1,86 @@ @@ -0,0 +1,86 @@
include(qurt/px4_impl_qurt)
if ("${HEXAGON_DRIVERS_ROOT}" STREQUAL "")
message(FATAL_ERROR "HEXAGON_DRIVERS_ROOT is not set")
endif()
if ("${EAGLE_DRIVERS_SRC}" STREQUAL "")
message(FATAL_ERROR "EAGLE_DRIVERS_SRC is not set")
endif()
include_directories(${HEXAGON_DRIVERS_ROOT}/inc)
# For Actual flight we need to link against the driver dynamic libraries
set(target_libraries
-L${HEXAGON_DRIVERS_ROOT}/libs
mpu9x50
uart_esc
csr_gps
rc_receiver
)
function(px4_set_config_modules out_module_list)
set(config_module_list
#
# Board support modules
#
drivers/device
modules/sensors
$(EAGLE_DRIVERS_SRC)/mpu9x50
$(EAGLE_DRIVERS_SRC)/uart_esc
$(EAGLE_DRIVERS_SRC)/rc_receiver
$(EAGLE_DRIVERS_SRC)/csr_gps
#
# System commands
#
systemcmds/param
#
# Estimation modules (EKF/ SO3 / other filters)
#
#modules/attitude_estimator_ekf
modules/ekf_att_pos_estimator
modules/attitude_estimator_q
modules/position_estimator_inav
#
# Vehicle Control
#
modules/mc_att_control
modules/mc_pos_control
#
# Library modules
#
modules/systemlib
modules/systemlib/mixer
modules/uORB
modules/commander
modules/controllib
#
# Libraries
#
lib/mathlib
lib/mathlib/math/filter
lib/geo
lib/geo_lookup
lib/conversion
#
# QuRT port
#
platforms/common
platforms/qurt/px4_layer
platforms/posix/work_queue
#
# sources for muorb over fastrpc
#
modules/muorb/adsp
)
set(${out_module_list} ${config_module_list} PARENT_SCOPE)
endfunction()

41
cmake/configs/config_qurt_eagle_test.cmake
Unescape View File

@ -0,0 +1,41 @@ @@ -0,0 +1,41 @@
include(qurt/px4_impl_qurt)
function(px4_set_config_modules out_module_list)
set(config_module_list
drivers/device
#
# System commands
#
systemcmds/param
#
# Library modules
#
modules/systemlib
modules/mixer
modules/uORB
#
# Libraries
#
lib/mathlib
lib/mathlib/math/filter
lib/conversion
#
# QuRT port
#
platforms/common
platforms/qurt/px4_layer
platforms/posix/work_queue
platforms/qurt/tests/hello
platforms/qurt/tests/vcdev_test
platforms/qurt/tests/hrt_test
platforms/qurt/tests/wqueue
)
set(${out_module_list} ${config_module_list} PARENT_SCOPE)
endfunction()

70
cmake/configs/config_qurt_hil_simple.cmake → cmake/configs/config_qurt_eagle_travis.cmake
Unescape View File

@ -1,5 +1,8 @@ @@ -1,5 +1,8 @@
include(qurt/px4_impl_qurt)
# Run a full link with build stubs to make sure qurt target isn't broken
set(QURT_ENABLE_STUBS 1)
function(px4_set_config_modules out_module_list)
set(config_module_list
@ -10,48 +13,37 @@ function(px4_set_config_modules out_module_list) @@ -10,48 +13,37 @@ function(px4_set_config_modules out_module_list)
drivers/rgbled
modules/sensors
# drivers/blinkm
# drivers/ms5611
#
# System commands
#
#
# System commands
#
systemcmds/param
systemcmds/mixer
#
# General system control
#
# modules/mavlink
#
# Estimation modules (EKF/ SO3 / other filters)
#
# modules/attitude_estimator_ekf
#
# Estimation modules (EKF/ SO3 / other filters)
#
#modules/attitude_estimator_ekf
modules/ekf_att_pos_estimator
modules/attitude_estimator_q
modules/position_estimator_inav
#
# Vehicle Control
#
#
# Vehicle Control
#
modules/mc_att_control
modules/mc_pos_control
#
# Library modules
#
#
# Library modules
#
modules/systemlib
modules/systemlib/mixer
modules/uORB
#MODULES += modules/dataman
#MODULES += modules/sdlog2
#MODULES += modules/simulator
modules/commander
#
# Libraries
#
#
# Libraries
#
lib/mathlib
lib/mathlib/math/filter
lib/geo
@ -59,28 +51,16 @@ function(px4_set_config_modules out_module_list) @@ -59,28 +51,16 @@ function(px4_set_config_modules out_module_list)
lib/conversion
modules/controllib
#
# QuRT port
#
#
# QuRT port
#
platforms/common
platforms/qurt/px4_layer
platforms/posix/work_queue
# platforms/posix/drivers/accelsim
# platforms/posix/drivers/gyrosim
# platforms/posix/drivers/adcsim
# platforms/posix/drivers/barosim
#
# Unit tests
#
# platforms/qurt/tests/muorb
# platforms/posix/tests/vcdev_test
# platforms/posix/tests/hrt_test
# platforms/posix/tests/wqueue
#
# sources for muorb over fastrpc
#
#
# sources for muorb over fastrpc
#
modules/muorb/adsp
)
set(${out_module_list} ${config_module_list} PARENT_SCOPE)

1
src/firmware/qurt/CMakeLists.txt
Unescape View File

@ -34,6 +34,7 @@ set_target_properties(mainapp PROPERTIES LINK_FLAGS ${main_link_flags}) @@ -34,6 +34,7 @@ set_target_properties(mainapp PROPERTIES LINK_FLAGS ${main_link_flags})
target_link_libraries(mainapp
-Wl,--whole-archive
${module_libraries}
${target_libraries}
m
-Wl,--no-whole-archive
-Wl,${TOOLSLIB}/pic/libstdc++.a)

13
src/platforms/qurt/px4_layer/CMakeLists.txt
Unescape View File

@ -46,7 +46,18 @@ if ("${QURT_ENABLE_STUBS}" STREQUAL "1") @@ -46,7 +46,18 @@ if ("${QURT_ENABLE_STUBS}" STREQUAL "1")
)
endif()
set(CONFIG_SRC commands_${BOARD}.c)
# For Eagle, the commands are specific to the build config label
# e.g. config_qurt_eagle_hil uses commands_hil.c
if ("${BOARD}" STREQUAL "eagle")
# The CI test target can use the hil commands
if ("${LABEL}" STREQUAL "travis")
set(CONFIG_SRC commands_hil.c)
else("${LABEL}" STREQUAL "travis")
set(CONFIG_SRC commands_${LABEL}.c)
endif()
endif()
px4_add_module(
MODULE platforms__qurt__px4_layer

0
src/platforms/qurt/px4_layer/commands_muorb_test.c → src/platforms/qurt/px4_layer/commands_muorb.c
Unescape View File

0
src/platforms/qurt/px4_layer/commands_adsp.c → src/platforms/qurt/px4_layer/commands_release.c
Unescape View File

0
src/platforms/qurt/px4_layer/commands_default.c → src/platforms/qurt/px4_layer/commands_test.c
Unescape View File

Write Preview
Loading…
Cancel
Save