nicco/micro-ROS-Agent
1
0
Fork 0
mirror of https://github.com/micro-ROS/micro-ROS-Agent.git synced 2026-09-06 09:55:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bump Micro XRCE-DDS Agent (#226)

Browse Source
This commit is contained in:
Pablo Garrido
2024-05-31 09:12:02 +02:00
committed by GitHub
parent 7f0af6b953
commit dc4a428a75
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yml
+4 -4
View File
@@ -17,13 +17,13 @@ jobs:
os: [ ubuntu-latest ] os: [ ubuntu-latest ]
ros_distribution: [ rolling ] ros_distribution: [ rolling ]
include: include:
- docker_image: ubuntu:22.04 - docker_image: ubuntu:24.04
ros_distribution: rolling ros_distribution: rolling
container: container:
image: ubuntu:22.04 image: ${{ matrix.docker_image }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: ros-tooling/setup-ros@0.7.1 - uses: ros-tooling/setup-ros@0.7.7
with: with:
use-ros2-testing: false use-ros2-testing: false
required-ros-distributions: ${{ matrix.ros_distribution }} required-ros-distributions: ${{ matrix.ros_distribution }}
micro_ros_agent/cmake/SuperBuild.cmake
+1 -1
View File
@@ -26,7 +26,7 @@ if(NOT xrceagent_FOUND)
GIT_REPOSITORY GIT_REPOSITORY
https://github.com/eProsima/Micro-XRCE-DDS-Agent.git https://github.com/eProsima/Micro-XRCE-DDS-Agent.git
GIT_TAG GIT_TAG
ros2 v2.4.3
PREFIX PREFIX
${PROJECT_BINARY_DIR}/agent ${PROJECT_BINARY_DIR}/agent
INSTALL_DIR INSTALL_DIR
micro_ros_agent/src/agent/graph_manager/graph_typesupport.cpp
+6 -6
View File
@@ -54,14 +54,14 @@ bool ParticipantEntitiesInfoTypeSupport::serialize(
eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(payload->data), eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(payload->data),
payload->max_size); payload->max_size);
eprosima::fastcdr::Cdr scdr(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, eprosima::fastcdr::Cdr scdr(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN,
eprosima::fastcdr::Cdr::DDS_CDR); eprosima::fastcdr::DDS_CDR);
scdr.serialize_encapsulation(); scdr.serialize_encapsulation();
if (callbacks_->cdr_serialize(data, scdr)) if (callbacks_->cdr_serialize(data, scdr))
{ {
payload->encapsulation = (scdr.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS) ? payload->encapsulation = (scdr.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS) ?
CDR_BE : CDR_LE; CDR_BE : CDR_LE;
payload->length = static_cast<uint32_t>(scdr.getSerializedDataLength()); payload->length = static_cast<uint32_t>(scdr.get_serialized_data_length());
return true; return true;
} }
else else
@@ -77,7 +77,7 @@ bool ParticipantEntitiesInfoTypeSupport::deserialize(
eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(payload->data), eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(payload->data),
payload->length); payload->length);
eprosima::fastcdr::Cdr dcdr(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, eprosima::fastcdr::Cdr dcdr(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN,
eprosima::fastcdr::Cdr::DDS_CDR); eprosima::fastcdr::DDS_CDR);
dcdr.read_encapsulation(); dcdr.read_encapsulation();
return callbacks_->cdr_deserialize(dcdr, data); return callbacks_->cdr_deserialize(dcdr, data);
@@ -146,14 +146,14 @@ bool MicrorosGraphInfoTypeSupport::serialize(
eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(payload->data), eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(payload->data),
payload->max_size); payload->max_size);
eprosima::fastcdr::Cdr scdr(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, eprosima::fastcdr::Cdr scdr(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN,
eprosima::fastcdr::Cdr::DDS_CDR); eprosima::fastcdr::DDS_CDR);
scdr.serialize_encapsulation(); scdr.serialize_encapsulation();
if (callbacks_->cdr_serialize(data, scdr)) if (callbacks_->cdr_serialize(data, scdr))
{ {
payload->encapsulation = (scdr.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS) ? payload->encapsulation = (scdr.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS) ?
CDR_BE : CDR_LE; CDR_BE : CDR_LE;
payload->length = static_cast<uint32_t>(scdr.getSerializedDataLength()); payload->length = static_cast<uint32_t>(scdr.get_serialized_data_length());
return true; return true;
} }
else else
@@ -169,7 +169,7 @@ bool MicrorosGraphInfoTypeSupport::deserialize(
eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(payload->data), eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(payload->data),
payload->length); payload->length);
eprosima::fastcdr::Cdr dcdr(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, eprosima::fastcdr::Cdr dcdr(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN,
eprosima::fastcdr::Cdr::DDS_CDR); eprosima::fastcdr::DDS_CDR);
dcdr.read_encapsulation(); dcdr.read_encapsulation();
return callbacks_->cdr_deserialize(dcdr, data); return callbacks_->cdr_deserialize(dcdr, data);