mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-06 12:28:53 +08:00
Update micro-CDR to latest and fix API usage (#9651)
* uorb_microcdr: msg.cpp.template: update API for how the buffer length is obtained * micrortps_bridge: CMakeLists: temporarily deactivate check endianness option
This commit is contained in:
committed by
Daniel Agar
parent
72de9a901d
commit
83fd5a5fd1
@@ -61,6 +61,9 @@ endif()
|
||||
|
||||
if (GENERATE_RTPS_BRIDGE)
|
||||
|
||||
# temporarily set to OFF
|
||||
option(CHECK_ENDIANNESS OFF)
|
||||
|
||||
add_subdirectory(micrortps_client)
|
||||
|
||||
###############################################################################
|
||||
@@ -132,15 +135,16 @@ if (GENERATE_RTPS_BRIDGE)
|
||||
add_dependencies(uorb_msgs_microcdr
|
||||
uorb_headers_microcdr_gen
|
||||
git_micro_cdr
|
||||
lib__micro-CDR
|
||||
microcdr
|
||||
)
|
||||
|
||||
target_link_libraries(uorb_msgs_microcdr PRIVATE lib__micro-CDR)
|
||||
|
||||
# microCDR
|
||||
target_include_directories(uorb_msgs_microcdr
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/micro-CDR/include
|
||||
${CMAKE_CURRENT_BINARY_DIR}/micro-CDR/include
|
||||
${CMAKE_CURRENT_BINARY_DIR}/micro-CDR/include/microcdr
|
||||
)
|
||||
|
||||
target_link_libraries(uorb_msgs_microcdr PRIVATE microcdr)
|
||||
endif()
|
||||
|
||||
Submodule src/modules/micrortps_bridge/micro-CDR updated: 50776f4ab7...890b118196
@@ -100,4 +100,4 @@ if (NOT "${config_rtps_send_topics}" STREQUAL "" OR NOT "${config_rtps_receive_t
|
||||
topic_bridge_files
|
||||
)
|
||||
target_link_libraries(modules__micrortps_bridge__micrortps_client PRIVATE uorb_msgs_microcdr)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
#include <pthread.h>
|
||||
#include <termios.h>
|
||||
|
||||
#include <microcdr/microCdr.h>
|
||||
#include <microcdr/microcdr.h>
|
||||
#include <px4_config.h>
|
||||
#include <px4_getopt.h>
|
||||
#include <px4_posix.h>
|
||||
|
||||
Reference in New Issue
Block a user