2.0.4

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

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

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

.github/workflows/ci.yml

@@ -3,27 +3,27 @@ name: CI micro-ROS Agent
 on:
     pull_request:
       branches:
-        - 'rolling'
+        - 'galactic'
     schedule:
       - cron: '33 6 * * *'
 
 jobs:
 
     microros_agent_ci:
-      runs-on: ${{ matrix.os }}
+      runs-on: ubuntu-20.04
       strategy:
         fail-fast: false
         matrix:
-          os: [ ubuntu-latest ]
+          os: [ ubuntu-20.04 ]
-          ros_distribution: [ rolling ]
+          ros_distribution: [ galactic ]
           include:
-            - docker_image: ubuntu:22.04
+            - docker_image: ubuntu:20.04
-              ros_distribution: rolling
+              ros_distribution: galactic
       container:
-        image: ubuntu:22.04
+        image: ubuntu:20.04
       steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
-      - uses: ros-tooling/setup-ros@0.7.1
+      - uses: ros-tooling/setup-ros@0.3.2
         with:
           use-ros2-testing: false
           required-ros-distributions: ${{ matrix.ros_distribution }}
@@ -31,7 +31,8 @@ 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.3.6
+      - uses : ros-tooling/action-ros-ci@0.2.5
         with:
           package-name: "micro_ros_agent"
           target-ros2-distro: ${{ matrix.ros_distribution }}
+

micro_ros_agent/CHANGELOG.rst

@@ -2,40 +2,29 @@
 Changelog for package micro-ros_agent
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-5.0.1 (2024-01-29)
+2.0.4 (2022-09-28)
 ------------------
-* 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>`_)
+* Fix Datawriter destruction (`#169 <https://github.com/micro-ROS/micro-ROS-Agent/issues/169>`_) (`#172 <https://github.com/micro-ROS/micro-ROS-Agent/issues/172>`_)
+* Synchronise predicate (`#160 <https://github.com/micro-ROS/micro-ROS-Agent/issues/160>`_) (`#166 <https://github.com/micro-ROS/micro-ROS-Agent/issues/166>`_)
 
-5.0.0 (2023-06-06)
+2.0.3 (2022-06-13)
 ------------------
-* Add empty type key hash to GraphCache (`#189 <https://github.com/micro-ROS/micro-ROS-Agent/issues/189>`_)
+* Fix memory leak in graph manager (`#147 <https://github.com/micro-ROS/micro-ROS-Agent/issues/147>`_) (`#150 <https://github.com/micro-ROS/micro-ROS-Agent/issues/150>`_)
-* Contributors: Antonio Cuadros
 
-4.0.2 (2022-09-28)
+2.0.2 (2022-05-25)
-------------------
-* 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>`_)
-* Synchronise predicate (`#160 <https://github.com/micro-ROS/micro-ROS-Agent/issues/160>`_) (`#165 <https://github.com/micro-ROS/micro-ROS-Agent/issues/165>`_)
-
-4.0.1 (2022-06-13)
-------------------
-* Fix memory leak in graph manager (`#147 <https://github.com/micro-ROS/micro-ROS-Agent/issues/147>`_) (`#148 <https://github.com/micro-ROS/micro-ROS-Agent/issues/148>`_)
-
-4.0.0 (2022-05-25)
 ------------------
 
-3.0.1 (2022-03-25)
+2.0.1 (2022-03-25)
 ------------------
-* Add services to graph manager (`#127 <https://github.com/micro-ROS/micro-ROS-Agent/issues/127>`_) (`#129 <https://github.com/micro-ROS/micro-ROS-Agent/issues/129>`_)
+* Add services to graph manager (`#127 <https://github.com/micro-ROS/micro-ROS-Agent/issues/127>`_)
-* Add used missing includes (`#116 <https://github.com/micro-ROS/micro-ROS-Agent/issues/116>`_) (`#124 <https://github.com/micro-ROS/micro-ROS-Agent/issues/124>`_)
+* Add used missing includes (`#116 <https://github.com/micro-ROS/micro-ROS-Agent/issues/116>`_) (`#125 <https://github.com/micro-ROS/micro-ROS-Agent/issues/125>`_)
-* Add system logger flag (`#118 <https://github.com/micro-ROS/micro-ROS-Agent/issues/118>`_) (`#119 <https://github.com/micro-ROS/micro-ROS-Agent/issues/119>`_)
+* Add system logger flag (`#118 <https://github.com/micro-ROS/micro-ROS-Agent/issues/118>`_)
-* Add condition variable include (`#113 <https://github.com/micro-ROS/micro-ROS-Agent/issues/113>`_) (`#114 <https://github.com/micro-ROS/micro-ROS-Agent/issues/114>`_)
+* Add condition variable include (`#113 <https://github.com/micro-ROS/micro-ROS-Agent/issues/113>`_)
-* pass system name to xrceagent (`#110 <https://github.com/micro-ROS/micro-ROS-Agent/issues/110>`_) (`#112 <https://github.com/micro-ROS/micro-ROS-Agent/issues/112>`_)
+* pass system name to xrceagent (`#110 <https://github.com/micro-ROS/micro-ROS-Agent/issues/110>`_)
-* Fix memory leak in FastDDS datawriter (`#107 <https://github.com/micro-ROS/micro-ROS-Agent/issues/107>`_) (`#109 <https://github.com/micro-ROS/micro-ROS-Agent/issues/109>`_)
+* Fix memory leak in FastDDS datawriter (`#107 <https://github.com/micro-ROS/micro-ROS-Agent/issues/107>`_)
+* Contributors: Antonio Cuadros, Pablo Garrido, Roland Schwan, mergify[bot]
 
-3.0.0 (2021-09-13)
+2.0.0 (2021-09-13)
-------------------
-
-1.0.1 (2021-09-13)
 ------------------
 * Remove XRCE dependency and add superbuild (`#97 <https://github.com/micro-ROS/micro-ROS-Agent/issues/97>`_)
 * Fixed launch file by using a list for arguments. Ensures order of items is kept. (`#93 <https://github.com/micro-ROS/micro-ROS-Agent/issues/93>`_) (`#94 <https://github.com/micro-ROS/micro-ROS-Agent/issues/94>`_)

micro_ros_agent/include/agent/graph_manager/graph_manager.hpp

@@ -65,7 +65,6 @@
 #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>5.0.1</version>
+  <version>2.0.4</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,
+    graphCache_.add_entity(datawriter_gid, topic_name,
-        rosidl_get_zero_initialized_type_hash(), participant_gid, qos_profile, false);
+        type_name, participant_gid, qos_profile, false);
 }
 
 void GraphManager::remove_datawriter(
@@ -411,13 +411,8 @@ void GraphManager::add_datareader(
         "rmw_fastrtps_cpp", participant_guid);
     const rmw_qos_profile_t qos_profile = fastdds_qos_to_rmw_qos(reader_qos);
 
-    // TODO(acuadros95): Use typesupport to calculate type hash on micro-ROS and save and get it from reader_qos.user_data.
+    graphCache_.add_entity(datareader_gid, topic_name,
-    // Related PRs:
+        type_name, participant_gid, qos_profile, true);
-    // 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

@@ -43,7 +43,7 @@ ParticipantEntitiesInfoTypeSupport::ParticipantEntitiesInfoTypeSupport()
     ss << "dds_::" << message_name << "_";
     this->setName(ss.str().c_str());
 
-    char full_bounded;
+    bool full_bounded = true;
     m_typeSize = 4 + callbacks_->max_serialized_size(full_bounded);
 }
 
@@ -135,7 +135,7 @@ MicrorosGraphInfoTypeSupport::MicrorosGraphInfoTypeSupport()
     ss << "dds_::" << message_name << "_";
     this->setName(ss.str().c_str());
 
-    char full_bounded;
+    bool full_bounded = true;
     m_typeSize = 4 + callbacks_->max_serialized_size(full_bounded);
 }