From dc4a428a75b99a4a897c82d19591e2c2b8788b9e Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Fri, 31 May 2024 09:12:02 +0200 Subject: [PATCH] Bump Micro XRCE-DDS Agent (#226) --- .github/workflows/ci.yml | 8 ++++---- micro_ros_agent/cmake/SuperBuild.cmake | 2 +- .../src/agent/graph_manager/graph_typesupport.cpp | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4dd05dc..084aac1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,13 +17,13 @@ jobs: os: [ ubuntu-latest ] ros_distribution: [ rolling ] include: - - docker_image: ubuntu:22.04 + - docker_image: ubuntu:24.04 ros_distribution: rolling container: - image: ubuntu:22.04 + image: ${{ matrix.docker_image }} steps: - - uses: actions/checkout@v3 - - uses: ros-tooling/setup-ros@0.7.1 + - uses: actions/checkout@v4 + - uses: ros-tooling/setup-ros@0.7.7 with: use-ros2-testing: false required-ros-distributions: ${{ matrix.ros_distribution }} diff --git a/micro_ros_agent/cmake/SuperBuild.cmake b/micro_ros_agent/cmake/SuperBuild.cmake index bead827..defffa1 100644 --- a/micro_ros_agent/cmake/SuperBuild.cmake +++ b/micro_ros_agent/cmake/SuperBuild.cmake @@ -26,7 +26,7 @@ if(NOT xrceagent_FOUND) GIT_REPOSITORY https://github.com/eProsima/Micro-XRCE-DDS-Agent.git GIT_TAG - ros2 + v2.4.3 PREFIX ${PROJECT_BINARY_DIR}/agent INSTALL_DIR diff --git a/micro_ros_agent/src/agent/graph_manager/graph_typesupport.cpp b/micro_ros_agent/src/agent/graph_manager/graph_typesupport.cpp index 70bc977..77a16c0 100644 --- a/micro_ros_agent/src/agent/graph_manager/graph_typesupport.cpp +++ b/micro_ros_agent/src/agent/graph_manager/graph_typesupport.cpp @@ -54,14 +54,14 @@ bool ParticipantEntitiesInfoTypeSupport::serialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); eprosima::fastcdr::Cdr scdr(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, - eprosima::fastcdr::Cdr::DDS_CDR); + eprosima::fastcdr::DDS_CDR); scdr.serialize_encapsulation(); if (callbacks_->cdr_serialize(data, scdr)) { payload->encapsulation = (scdr.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS) ? CDR_BE : CDR_LE; - payload->length = static_cast(scdr.getSerializedDataLength()); + payload->length = static_cast(scdr.get_serialized_data_length()); return true; } else @@ -77,7 +77,7 @@ bool ParticipantEntitiesInfoTypeSupport::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); eprosima::fastcdr::Cdr dcdr(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, - eprosima::fastcdr::Cdr::DDS_CDR); + eprosima::fastcdr::DDS_CDR); dcdr.read_encapsulation(); return callbacks_->cdr_deserialize(dcdr, data); @@ -146,14 +146,14 @@ bool MicrorosGraphInfoTypeSupport::serialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); eprosima::fastcdr::Cdr scdr(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, - eprosima::fastcdr::Cdr::DDS_CDR); + eprosima::fastcdr::DDS_CDR); scdr.serialize_encapsulation(); if (callbacks_->cdr_serialize(data, scdr)) { payload->encapsulation = (scdr.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS) ? CDR_BE : CDR_LE; - payload->length = static_cast(scdr.getSerializedDataLength()); + payload->length = static_cast(scdr.get_serialized_data_length()); return true; } else @@ -169,7 +169,7 @@ bool MicrorosGraphInfoTypeSupport::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); eprosima::fastcdr::Cdr dcdr(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, - eprosima::fastcdr::Cdr::DDS_CDR); + eprosima::fastcdr::DDS_CDR); dcdr.read_encapsulation(); return callbacks_->cdr_deserialize(dcdr, data);