6.0.0

* Fix thread include

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

* Update CI

* Revert "Fix thread include"

This reverts commit 1427fb6246.

* fix

* Fix

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

---------

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
(cherry picked from commit cd321caabe)

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: CI micro-ROS Agent
 on:
     pull_request:
       branches:
-        - 'main'
+        - 'rolling'
     schedule:
       - cron: '33 6 * * *'
 
@@ -14,16 +14,16 @@ jobs:
       strategy:
         fail-fast: false
         matrix:
-          os: [ ubuntu-20.04 ]
+          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@v2
-      - uses: ros-tooling/setup-ros@0.3.2
+      - uses: actions/checkout@v4
+      - uses: ros-tooling/setup-ros@0.7.7
         with:
           use-ros2-testing: false
           required-ros-distributions: ${{ matrix.ros_distribution }}
@@ -31,7 +31,7 @@ jobs:
         run: |
           apt-get install ros-${{ matrix.ros_distribution }}-micro-ros-msgs
           apt-get install ros-${{ matrix.ros_distribution }}-rmw-fastrtps-cpp
-      - uses : ros-tooling/action-ros-ci@0.2.5
+      - uses : ros-tooling/action-ros-ci@0.3.6
         with:
           package-name: "micro_ros_agent"
           target-ros2-distro: ${{ matrix.ros_distribution }}

micro_ros_agent/CHANGELOG.rst

@@ -2,6 +2,19 @@
 Changelog for package micro-ros_agent
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+6.0.0 (2024-05-31)
+------------------
+* Bump Micro XRCE-DDS Agent (`#226 <https://github.com/micro-ROS/micro-ROS-Agent/issues/226>`_)
+
+5.0.1 (2024-01-29)
+------------------
+* Fix thread include (`#216 <https://github.com/micro-ROS/micro-ROS-Agent/issues/216>`_) (`#218 <https://github.com/micro-ROS/micro-ROS-Agent/issues/218>`_)
+
+5.0.0 (2023-06-06)
+------------------
+* Add empty type key hash to GraphCache (`#189 <https://github.com/micro-ROS/micro-ROS-Agent/issues/189>`_)
+* Contributors: Antonio Cuadros
+
 4.0.2 (2022-09-28)
 ------------------
 * Fix Datawriter destruction (`#169 <https://github.com/micro-ROS/micro-ROS-Agent/issues/169>`_) (`#170 <https://github.com/micro-ROS/micro-ROS-Agent/issues/170>`_)

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

micro_ros_agent/include/agent/graph_manager/graph_manager.hpp

@@ -65,6 +65,7 @@
 #include <string>
 #include <memory>
 #include <map>
+#include <thread>
 
 namespace uros {
 namespace agent {

micro_ros_agent/package.xml

@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>micro_ros_agent</name>
-  <version>4.0.2</version>
+  <version>6.0.0</version>
   <description>micro-ROS Agent package</description>
   <maintainer email="pablogarrido@eprosima.com">Pablo Garrido</maintainer>
   <maintainer email="antoniocuadros@eprosima.com">Antonio Cuadros</maintainer>

micro_ros_agent/src/agent/graph_manager/graph_manager.cpp

@@ -374,8 +374,8 @@ void GraphManager::add_datawriter(
         "rmw_fastrtps_cpp", participant_guid);
     const rmw_qos_profile_t qos_profile = fastdds_qos_to_rmw_qos(writer_qos);
 
-    graphCache_.add_entity(datawriter_gid, topic_name,
-        type_name, participant_gid, qos_profile, false);
+    graphCache_.add_entity(datawriter_gid, topic_name, type_name,
+        rosidl_get_zero_initialized_type_hash(), participant_gid, qos_profile, false);
 }
 
 void GraphManager::remove_datawriter(
@@ -411,8 +411,13 @@ void GraphManager::add_datareader(
         "rmw_fastrtps_cpp", participant_guid);
     const rmw_qos_profile_t qos_profile = fastdds_qos_to_rmw_qos(reader_qos);
 
-    graphCache_.add_entity(datareader_gid, topic_name,
-        type_name, participant_gid, qos_profile, true);
+    // TODO(acuadros95): Use typesupport to calculate type hash on micro-ROS and save and get it from reader_qos.user_data.
+    // Related PRs:
+    // https://github.com/ros2/rmw_dds_common/pull/70
+    // https://github.com/ros2/rmw_fastrtps/pull/671
+    // https://github.com/ros2/rmw_fastrtps/pull/680
+    graphCache_.add_entity(datareader_gid, topic_name, type_name,
+        rosidl_get_zero_initialized_type_hash(), participant_gid, qos_profile, true);
 }
 
 void GraphManager::remove_datareader(

micro_ros_agent/src/agent/graph_manager/graph_typesupport.cpp

@@ -54,14 +54,14 @@ bool ParticipantEntitiesInfoTypeSupport::serialize(
     eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(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<uint32_t>(scdr.getSerializedDataLength());
+        payload->length = static_cast<uint32_t>(scdr.get_serialized_data_length());
         return true;
     }
     else
@@ -77,7 +77,7 @@ bool ParticipantEntitiesInfoTypeSupport::deserialize(
     eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(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<char *>(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<uint32_t>(scdr.getSerializedDataLength());
+        payload->length = static_cast<uint32_t>(scdr.get_serialized_data_length());
         return true;
     }
     else
@@ -169,7 +169,7 @@ bool MicrorosGraphInfoTypeSupport::deserialize(
     eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(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);