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

use a yaml file description instead of json; minor improvements and cleanup

Browse Source
This commit is contained in:
TSC21
2018-09-21 15:55:17 +02:00
committed by Beat Küng
parent 7d40c4f97e
commit bb835382dd
9 changed files with 239 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/micrortps_bridge/micrortps_client/CMakeLists.txt
+4 -2
View File
@@ -72,8 +72,8 @@ if (NOT "${config_rtps_send_topics}" STREQUAL "" OR NOT "${config_rtps_receive_t
)
# Copy json file to the bin dir to be used by empy on the file generation
configure_file("${PX4_SOURCE_DIR}/msg/tools/uorb_rtps_message_ids.json"
"${CMAKE_CURRENT_BINARY_DIR}/uorb_rtps_message_ids.json" COPYONLY)
configure_file("${PX4_SOURCE_DIR}/msg/tools/uorb_rtps_message_ids.yaml"
"${CMAKE_CURRENT_BINARY_DIR}/uorb_rtps_message_ids.yaml" COPYONLY)
add_custom_command(OUTPUT ${topic_bridge_files_out}
COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/msg/tools/generate_microRTPS_bridge.py
@@ -81,6 +81,8 @@ if (NOT "${config_rtps_send_topics}" STREQUAL "" OR NOT "${config_rtps_receive_t
${send_topic_opt} ${send_topic_files}
${receive_topic_opt} ${receive_topic_files}
--topic-msg-dir ${PX4_SOURCE_DIR}/msg
--uorb-templates-dir "/templates/uorb_microcdr"
--urtps-templates-dir "/templates/urtps"
--agent-outdir ${CMAKE_CURRENT_BINARY_DIR}/micrortps_agent
--client-outdir ${CMAKE_CURRENT_BINARY_DIR}/micrortps_client
>micrortps_bridge.log 2>&1 || cat micrortps_bridge.log # quiet successful build output