fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-26 08:03:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

move RTPS to dedicated px4fmu-v{3,4,4pro,5}, posix, sdflight builds (#8113)

Browse Source
This commit is contained in:
Daniel Agar
2017-10-17 16:29:55 -04:00
committed by GitHub
parent 979d092628
commit d83073f016
24 changed files with 260 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/common/px4_git.cmake
+4 -5
View File
@@ -41,7 +41,6 @@ include(common/px4_base)
# utility functions
#
# * px4_add_git_submodule
# * px4_create_git_hash_header
#
#=============================================================================
@@ -71,13 +70,13 @@ function(px4_add_git_submodule)
string(REPLACE "/" "_" NAME ${PATH})
add_custom_command(OUTPUT ${PX4_BINARY_DIR}/git_init_${NAME}.stamp
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/git_init_${NAME}.stamp
COMMAND bash ${PX4_SOURCE_DIR}/Tools/check_submodules.sh ${PATH}
COMMAND cmake -E touch ${PX4_BINARY_DIR}/git_init_${NAME}.stamp
COMMAND cmake -E touch ${CMAKE_CURRENT_BINARY_DIR}/git_init_${NAME}.stamp
DEPENDS ${PX4_SOURCE_DIR}/.gitmodules ${PATH}/.git
WORKING_DIRECTORY ${PX4_SOURCE_DIR}
COMMENT "git submodule ${PATH}"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
add_custom_target(${TARGET} DEPENDS ${PX4_BINARY_DIR}/git_init_${NAME}.stamp)
add_custom_target(${TARGET} DEPENDS git_init_${NAME}.stamp)
endfunction()
cmake/configs/nuttx_mindpx-v2_default.cmake
+1 -12
View File
@@ -134,9 +134,6 @@ set(config_module_list
modules/uORB
modules/dataman
# micro RTPS
modules/micrortps_bridge/micrortps_client
#
# Libraries
#
@@ -197,12 +194,4 @@ set(config_module_list
# EKF
#examples/ekf_att_pos_estimator
)
set(config_rtps_send_topics
sensor_combined
)
set(config_rtps_receive_topics
sensor_baro
)
)
cmake/configs/nuttx_nxphlite-v3_default.cmake
+1 -14
View File
@@ -143,10 +143,6 @@ set(config_module_list
modules/uORB
modules/dataman
# micro RTPS
modules/micrortps_bridge/micrortps_client
#
# Libraries
#
@@ -214,13 +210,4 @@ set(config_module_list
# EKF
examples/ekf_att_pos_estimator
)
set(config_rtps_send_topics
sensor_combined
)
set(config_rtps_receive_topics
sensor_baro
)
)
cmake/configs/nuttx_px4fmu-v3_default.cmake
+1 -12
View File
@@ -138,9 +138,6 @@ set(config_module_list
modules/systemlib/mixer
modules/uORB
# micro RTPS
modules/micrortps_bridge/micrortps_client
#
# Libraries
#
@@ -207,12 +204,4 @@ set(config_module_list
# EKF
examples/ekf_att_pos_estimator
)
set(config_rtps_send_topics
sensor_combined
)
set(config_rtps_receive_topics
sensor_baro
)
)
cmake/configs/nuttx_px4fmu-v3_rtps.cmake
+5
View File
@@ -0,0 +1,5 @@
include(configs/nuttx_px4fmu-v3_default)
list(APPEND config_module_list
modules/micrortps_bridge
)
cmake/configs/nuttx_px4fmu-v4_default.cmake
+1 -12
View File
@@ -139,9 +139,6 @@ set(config_module_list
modules/uORB
modules/dataman
# micro RTPS
modules/micrortps_bridge/micrortps_client
#
# Libraries
#
@@ -209,12 +206,4 @@ set(config_module_list
# EKF
examples/ekf_att_pos_estimator
)
set(config_rtps_send_topics
sensor_combined
)
set(config_rtps_receive_topics
sensor_baro
)
)
cmake/configs/nuttx_px4fmu-v4_rtps.cmake
+5
View File
@@ -0,0 +1,5 @@
include(configs/nuttx_px4fmu-v4_default)
list(APPEND config_module_list
modules/micrortps_bridge
)
cmake/configs/nuttx_px4fmu-v4pro_default.cmake
+1 -12
View File
@@ -139,9 +139,6 @@ set(config_module_list
modules/systemlib/mixer
modules/uORB
# micro RTPS
modules/micrortps_bridge/micrortps_client
#
# Libraries
#
@@ -208,12 +205,4 @@ set(config_module_list
# EKF
#examples/ekf_att_pos_estimator
)
set(config_rtps_send_topics
sensor_combined
)
set(config_rtps_receive_topics
sensor_baro
)
)
cmake/configs/nuttx_px4fmu-v4pro_rtps.cmake
+5
View File
@@ -0,0 +1,5 @@
include(configs/nuttx_px4fmu-v4pro_default)
list(APPEND config_module_list
modules/micrortps_bridge
)
cmake/configs/nuttx_px4fmu-v5_default.cmake
+1 -12
View File
@@ -139,9 +139,6 @@ set(config_module_list
modules/systemlib/mixer
modules/uORB
# micro RTPS
modules/micrortps_bridge/micrortps_client
#
# Libraries
#
@@ -209,12 +206,4 @@ set(config_module_list
# EKF
#examples/ekf_att_pos_estimator
)
set(config_rtps_send_topics
sensor_combined
)
set(config_rtps_receive_topics
sensor_baro
)
)
cmake/configs/nuttx_px4fmu-v5_rtps.cmake
+5
View File
@@ -0,0 +1,5 @@
include(configs/nuttx_px4fmu-v4_default)
list(APPEND config_module_list
modules/micrortps_bridge
)
cmake/configs/posix_sdflight_default.cmake
+1 -12
View File
@@ -66,9 +66,6 @@ set(config_module_list
modules/commander
modules/navigator
# micro RTPS
modules/micrortps_bridge/micrortps_client
lib/controllib
lib/mathlib
lib/mathlib/math/filter
@@ -86,12 +83,4 @@ set(config_module_list
platforms/common
platforms/posix/px4_layer
platforms/posix/work_queue
)
set(config_rtps_send_topics
sensor_baro
)
set(config_rtps_receive_topics
sensor_combined
)
)
cmake/configs/posix_sdflight_legacy.cmake
+1 -4
View File
@@ -58,9 +58,6 @@ set(config_module_list
modules/commander
modules/navigator
# micro RTPS
modules/micrortps_bridge/micrortps_client
lib/controllib
lib/mathlib
lib/mathlib/math/filter
@@ -78,4 +75,4 @@ set(config_module_list
platforms/common
platforms/posix/px4_layer
platforms/posix/work_queue
)
)
cmake/configs/posix_sdflight_rtps.cmake
+5
View File
@@ -0,0 +1,5 @@
include(configs/posix_sdflight_default)
list(APPEND config_module_list
modules/micrortps_bridge
)
cmake/configs/posix_sitl_default.cmake
+5 -29
View File
@@ -114,9 +114,6 @@ set(config_module_list
modules/systemlib/mixer
modules/uORB
# micro RTPS
modules/micrortps_bridge/micrortps_client
#
# Libraries
#
@@ -189,39 +186,18 @@ set(config_module_list
# EKF
examples/ekf_att_pos_estimator
# micro-RTPS
)
set(config_rtps_send_topics
sensor_baro
)
set(config_rtps_receive_topics
sensor_combined
)
# Default config_sitl_rcS_dir (posix_sitl_default), this is overwritten later
# for the config posix_sitl_efk2 and set again, explicitly, for posix_sitl_lpe,
# which are based on posix_sitl_default.
set(config_sitl_rcS_dir
posix-configs/SITL/init/ekf2
CACHE INTERNAL "init script dir for sitl"
)
set(config_sitl_rcS_dir posix-configs/SITL/init/ekf2 CACHE INTERNAL "init script dir for sitl")
set(config_sitl_viewer
jmavsim
CACHE STRING "viewer for sitl"
)
set_property(CACHE config_sitl_viewer
PROPERTY STRINGS "jmavsim;none")
set(config_sitl_viewer jmavsim CACHE STRING "viewer for sitl")
set_property(CACHE config_sitl_viewer PROPERTY STRINGS "jmavsim;none")
set(config_sitl_debugger
disable
CACHE STRING "debugger for sitl"
)
set_property(CACHE config_sitl_debugger
PROPERTY STRINGS "disable;gdb;lldb")
set(config_sitl_debugger disable CACHE STRING "debugger for sitl")
set_property(CACHE config_sitl_debugger PROPERTY STRINGS "disable;gdb;lldb")
# If the environment variable 'replay' is defined, we are building with replay
# support. In this case, we enable the orb publisher rules.
cmake/configs/posix_sitl_rtps.cmake
+5
View File
@@ -0,0 +1,5 @@
include(configs/posix_sitl_default)
list(APPEND config_module_list
modules/micrortps_bridge
)