mirror of
https://github.com/micro-ROS/micro-ROS-Agent.git
synced 2026-09-06 18:05:17 +02:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4dd8ffe63b | ||
|
|
375bf3e674 | ||
|
|
1325442eb5 | ||
|
|
b17a6ef959 | ||
|
|
fd5d6adc00 | ||
|
|
1904c562ef | ||
|
|
726692af04 | ||
|
|
2326a201bc | ||
|
|
5b566f7b4f | ||
|
|
0af992145e | ||
|
|
f9e6daf6bf | ||
|
|
e356e14e84 | ||
|
|
37885214e1 | ||
|
|
820bcdb5f6 | ||
|
|
fd5bc39536 | ||
|
|
fe1b3ade97 | ||
|
|
7f3f560bc7 | ||
|
|
80916d4949 | ||
|
|
d1e851ba4e | ||
|
|
6047f7135d | ||
|
|
9d3fbc63a0 |
+29
-29
@@ -2,37 +2,37 @@ name: CI micro-ROS Agent
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches:
|
||||
- '**'
|
||||
branches:
|
||||
- 'foxy'
|
||||
schedule:
|
||||
- cron: '33 6 * * *'
|
||||
|
||||
jobs:
|
||||
|
||||
microros_agent_ci:
|
||||
runs-on: ubuntu-20.04
|
||||
container: microros/base:rolling
|
||||
runs-on: ubuntu-20.04
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ ubuntu-20.04 ]
|
||||
ros_distribution: [ foxy ]
|
||||
include:
|
||||
- docker_image: ubuntu:20.04
|
||||
ros_distribution: foxy
|
||||
container:
|
||||
image: ubuntu:20.04
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: ros-tooling/setup-ros@0.3.2
|
||||
with:
|
||||
use-ros2-testing: false
|
||||
required-ros-distributions: ${{ matrix.ros_distribution }}
|
||||
- name : Download and install dependencies
|
||||
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
|
||||
with:
|
||||
package-name: "micro_ros_agent"
|
||||
target-ros2-distro: ${{ matrix.ros_distribution }}
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
path: urosagent
|
||||
|
||||
- name: Download dependencies
|
||||
run: |
|
||||
apt update
|
||||
cd /uros_ws
|
||||
. /opt/ros/$ROS_DISTRO/setup.sh
|
||||
. install/local_setup.sh
|
||||
rosdep update
|
||||
ros2 run micro_ros_setup create_agent_ws.sh
|
||||
|
||||
- name: Patch branch
|
||||
run: |
|
||||
rm -rf /uros_ws/src/uros/micro-ROS-Agent/*
|
||||
cp -R urosagent/* /uros_ws/src/uros/micro-ROS-Agent/
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
cd /uros_ws
|
||||
. /opt/ros/$ROS_DISTRO/setup.sh
|
||||
. install/local_setup.sh
|
||||
ros2 run micro_ros_setup build_agent.sh
|
||||
@@ -55,3 +55,4 @@ see the file [3rd-party-licenses.txt](3rd-party-licenses.txt).
|
||||
Please notice the following issues/limitations:
|
||||
|
||||
* There is an unknown issue when dealing with serial ports shared with the micro-ROS agent running inside a Docker. Sometimes it works with a remarkable packet loss.
|
||||
* There is an known issues with serial port communication on micro-ros-agent snap version. It is recommended to use the dockerized version or build it from source.
|
||||
@@ -2,10 +2,19 @@
|
||||
Changelog for package micro-ros_agent
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
3.0.0 (2021-09-13)
|
||||
1.5.2 (2022-05-25)
|
||||
------------------
|
||||
|
||||
1.0.1 (2021-09-13)
|
||||
1.5.1 (2022-03-25)
|
||||
------------------
|
||||
* Add services to graph manager (backport `#127 <https://github.com/micro-ROS/micro-ROS-Agent/issues/127>`_) (`#128 <https://github.com/micro-ROS/micro-ROS-Agent/issues/128>`_)
|
||||
* Add used missing includes (`#116 <https://github.com/micro-ROS/micro-ROS-Agent/issues/116>`_)
|
||||
* Add system logger flag (`#118 <https://github.com/micro-ROS/micro-ROS-Agent/issues/118>`_) (`#120 <https://github.com/micro-ROS/micro-ROS-Agent/issues/120>`_)
|
||||
* Add condition variable include (`#113 <https://github.com/micro-ROS/micro-ROS-Agent/issues/113>`_) (`#115 <https://github.com/micro-ROS/micro-ROS-Agent/issues/115>`_)
|
||||
* pass system name to xrceagent (`#110 <https://github.com/micro-ROS/micro-ROS-Agent/issues/110>`_) (`#111 <https://github.com/micro-ROS/micro-ROS-Agent/issues/111>`_)
|
||||
* Fix memory leak in FastDDS datawriter (`#107 <https://github.com/micro-ROS/micro-ROS-Agent/issues/107>`_) (`#108 <https://github.com/micro-ROS/micro-ROS-Agent/issues/108>`_)
|
||||
|
||||
1.5.0 (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>`_)
|
||||
|
||||
@@ -20,6 +20,7 @@ option(UROSAGENT_GENERATE_PROFILE
|
||||
set(CMAKE_C_CLANG_TIDY clang-tidy -checks=*)
|
||||
|
||||
option(MICROROSAGENT_SUPERBUILD "Enable superbuild compilation." ON)
|
||||
option(UAGENT_USE_SYSTEM_LOGGER "Force use of system installed spdlog logger on superbuild." OFF)
|
||||
|
||||
if(NOT MICROROSAGENT_SUPERBUILD)
|
||||
project(micro_ros_agent LANGUAGES CXX)
|
||||
|
||||
@@ -42,8 +42,10 @@ if(NOT xrceagent_FOUND)
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
|
||||
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
|
||||
-DCMAKE_PREFIX_PATH:PATH=<INSTALL_DIR>
|
||||
-DCMAKE_SYSTEM_NAME:STRING=${CMAKE_SYSTEM_NAME}
|
||||
-DUAGENT_USE_SYSTEM_FASTDDS:BOOL=ON
|
||||
-DUAGENT_USE_SYSTEM_FASTCDR:BOOL=ON
|
||||
-DUAGENT_USE_SYSTEM_LOGGER:BOOL=${UAGENT_USE_SYSTEM_LOGGER}
|
||||
-DUAGENT_CED_PROFILE:BOOL=OFF
|
||||
-DUAGENT_P2P_PROFILE:BOOL=OFF
|
||||
-DUAGENT_BUILD_EXECUTABLE:BOOL=OFF
|
||||
|
||||
@@ -20,6 +20,10 @@
|
||||
#include <uxr/agent/middleware/utils/Callbacks.hpp>
|
||||
|
||||
#include <agent/graph_manager/graph_manager.hpp>
|
||||
|
||||
#include <map>
|
||||
#include <memory>
|
||||
|
||||
// TODO(jamoralp): class Documentation
|
||||
namespace uros {
|
||||
namespace agent {
|
||||
|
||||
@@ -12,6 +12,9 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#ifndef _UROS_AGENT_GRAPH_MANAGER_HPP
|
||||
#define _UROS_AGENT_GRAPH_MANAGER_HPP
|
||||
|
||||
#include "fastrtps/Domain.h"
|
||||
#include <fastrtps/TopicDataType.h>
|
||||
#include "fastrtps/attributes/ParticipantAttributes.h"
|
||||
@@ -58,8 +61,10 @@
|
||||
#include <agent/graph_manager/graph_typesupport.hpp>
|
||||
#include <agent/utils/demangle.hpp>
|
||||
|
||||
#ifndef _UROS_AGENT_GRAPH_MANAGER_HPP
|
||||
#define _UROS_AGENT_GRAPH_MANAGER_HPP
|
||||
#include <condition_variable>
|
||||
#include <string>
|
||||
#include <memory>
|
||||
#include <map>
|
||||
|
||||
namespace uros {
|
||||
namespace agent {
|
||||
@@ -132,6 +137,21 @@ public:
|
||||
const eprosima::fastrtps::rtps::GUID_t& participant_guid,
|
||||
const eprosima::fastdds::dds::DataWriterQos& writer_qos);
|
||||
|
||||
/**
|
||||
* @brief Adds a DDS datawriter to the graph tree.
|
||||
* @param datawriter_guid rtps::GUID_t of the datawriter to be added.
|
||||
* @param topic_name Name of the topic to which the datawriter sends information to.
|
||||
* @param type_name Type name of the sent topic.
|
||||
* @param participant_guid rtps::GUID_t of the participant which owns this datawriter.
|
||||
* @param writer_qos QOS of the datawriter to be included into the graph tree.
|
||||
*/
|
||||
void add_datawriter(
|
||||
const eprosima::fastrtps::rtps::GUID_t& datawriter_guid,
|
||||
const std::string& topic_name,
|
||||
const std::string& type_name,
|
||||
const eprosima::fastrtps::rtps::GUID_t& participant_guid,
|
||||
const eprosima::fastdds::dds::WriterQos& writer_qos);
|
||||
|
||||
/**
|
||||
* @brief Removes a DDS datawriter from the graph tree.
|
||||
* @param datawriter_guid rtps::GUID_t of the datawriter to be removed.
|
||||
@@ -165,6 +185,21 @@ public:
|
||||
const eprosima::fastrtps::rtps::GUID_t& participant_guid,
|
||||
const eprosima::fastdds::dds::DataReaderQos& reader_qos);
|
||||
|
||||
/**
|
||||
* @brief Adds a DDS datareader to the graph tree.
|
||||
* @param datareader_guid rtps::GUID_t of the datareader to be added.
|
||||
* @param topic_name Name of the topic to which the datareader sends information to.
|
||||
* @param type_name Type name of the sent topic.
|
||||
* @param participant_guid rtps::GUID_t of the participant which owns this datareader.
|
||||
* @param writer_qos QOS of the datareader to be included into the graph tree.
|
||||
*/
|
||||
void add_datareader(
|
||||
const eprosima::fastrtps::rtps::GUID_t& datareader_guid,
|
||||
const std::string& topic_name,
|
||||
const std::string& type_name,
|
||||
const eprosima::fastrtps::rtps::GUID_t& participant_guid,
|
||||
const eprosima::fastdds::dds::ReaderQos& reader_qos);
|
||||
|
||||
/**
|
||||
* @brief Removes a DDS datareader from the graph tree.
|
||||
* @param datareader_guid rtps::GUID_t of the datareader to be removed.
|
||||
|
||||
@@ -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>3.0.0</version>
|
||||
<version>1.5.2</version>
|
||||
<description>micro-ROS Agent package</description>
|
||||
<maintainer email="pablogarrido@eprosima.com">Pablo Garrido</maintainer>
|
||||
<maintainer email="antoniocuadros@eprosima.com">Antonio Cuadros</maintainer>
|
||||
|
||||
@@ -17,6 +17,9 @@
|
||||
|
||||
#include <agent/Agent.hpp>
|
||||
|
||||
#include <utility>
|
||||
#include <memory>
|
||||
|
||||
namespace uros {
|
||||
namespace agent {
|
||||
|
||||
@@ -166,6 +169,149 @@ bool Agent::create(
|
||||
eprosima::uxr::Middleware::Kind::FASTDDS,
|
||||
eprosima::uxr::middleware::CallbackKind::DELETE_DATAREADER,
|
||||
std::move(on_delete_datareader));
|
||||
|
||||
/**
|
||||
* Add CREATE_REQUESTER callback.
|
||||
*/
|
||||
std::function<void (
|
||||
const eprosima::fastdds::dds::DomainParticipant *,
|
||||
const eprosima::fastdds::dds::DataWriter *,
|
||||
const eprosima::fastdds::dds::DataReader *)> on_create_requester
|
||||
([&](
|
||||
const eprosima::fastdds::dds::DomainParticipant* participant,
|
||||
const eprosima::fastdds::dds::DataWriter* datawriter,
|
||||
const eprosima::fastdds::dds::DataReader * datareader) -> void
|
||||
{
|
||||
auto graph_manager_ = find_or_create_graph_manager(participant->get_domain_id());
|
||||
|
||||
// TODO(pablogs): Workaround for Fast-DDS bug #9977. Remove when fixed
|
||||
const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle_dw =
|
||||
datawriter->get_instance_handle();
|
||||
const eprosima::fastrtps::rtps::GUID_t datawriter_guid =
|
||||
eprosima::fastrtps::rtps::iHandle2GUID(instance_handle_dw);
|
||||
|
||||
graph_manager_->add_datawriter(datawriter_guid, participant, datawriter);
|
||||
graph_manager_->associate_entity(
|
||||
datawriter_guid, participant, dds::xrce::OBJK_DATAWRITER);
|
||||
|
||||
// TODO(pablogs): Workaround for Fast-DDS bug #9977. Remove when fixed
|
||||
const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle_dr =
|
||||
datareader->get_instance_handle();
|
||||
const eprosima::fastrtps::rtps::GUID_t datareader_guid =
|
||||
eprosima::fastrtps::rtps::iHandle2GUID(instance_handle_dr);
|
||||
graph_manager_->add_datareader(datareader_guid, participant, datareader);
|
||||
graph_manager_->associate_entity(
|
||||
datareader_guid, participant, dds::xrce::OBJK_DATAREADER);
|
||||
});
|
||||
xrce_dds_agent_instance_.add_middleware_callback(
|
||||
eprosima::uxr::Middleware::Kind::FASTDDS,
|
||||
eprosima::uxr::middleware::CallbackKind::CREATE_REQUESTER,
|
||||
std::move(on_create_requester));
|
||||
|
||||
/**
|
||||
* Add DELETE_REQUESTER callback.
|
||||
*/
|
||||
std::function<void (
|
||||
const eprosima::fastdds::dds::DomainParticipant *,
|
||||
const eprosima::fastdds::dds::DataWriter *,
|
||||
const eprosima::fastdds::dds::DataReader *)> on_delete_requester
|
||||
([&](
|
||||
const eprosima::fastdds::dds::DomainParticipant* participant,
|
||||
const eprosima::fastdds::dds::DataWriter* datawriter,
|
||||
const eprosima::fastdds::dds::DataReader * datareader) -> void
|
||||
{
|
||||
auto graph_manager_ = find_or_create_graph_manager(participant->get_domain_id());
|
||||
|
||||
// TODO(pablogs): Workaround for Fast-DDS bug #9977. Remove when fixed
|
||||
const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle_dw =
|
||||
datawriter->get_instance_handle();
|
||||
const eprosima::fastrtps::rtps::GUID_t datawriter_guid =
|
||||
eprosima::fastrtps::rtps::iHandle2GUID(instance_handle_dw);
|
||||
graph_manager_->remove_datawriter(datawriter_guid);
|
||||
|
||||
// TODO(pablogs): Workaround for Fast-DDS bug #9977. Remove when fixed
|
||||
const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle_dr =
|
||||
datareader->get_instance_handle();
|
||||
const eprosima::fastrtps::rtps::GUID_t datareader_guid =
|
||||
eprosima::fastrtps::rtps::iHandle2GUID(instance_handle_dr);
|
||||
graph_manager_->remove_datareader(datareader_guid);
|
||||
});
|
||||
|
||||
xrce_dds_agent_instance_.add_middleware_callback(
|
||||
eprosima::uxr::Middleware::Kind::FASTDDS,
|
||||
eprosima::uxr::middleware::CallbackKind::DELETE_REQUESTER,
|
||||
std::move(on_delete_requester));
|
||||
|
||||
/**
|
||||
* Add CREATE_REPLIER callback.
|
||||
*/
|
||||
std::function<void (
|
||||
const eprosima::fastdds::dds::DomainParticipant *,
|
||||
const eprosima::fastdds::dds::DataWriter *,
|
||||
const eprosima::fastdds::dds::DataReader *)> on_create_replier
|
||||
([&](
|
||||
const eprosima::fastdds::dds::DomainParticipant* participant,
|
||||
const eprosima::fastdds::dds::DataWriter* datawriter,
|
||||
const eprosima::fastdds::dds::DataReader * datareader) -> void
|
||||
{
|
||||
auto graph_manager_ = find_or_create_graph_manager(participant->get_domain_id());
|
||||
|
||||
// TODO(pablogs): Workaround for Fast-DDS bug #9977. Remove when fixed
|
||||
const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle_dw =
|
||||
datawriter->get_instance_handle();
|
||||
const eprosima::fastrtps::rtps::GUID_t datawriter_guid =
|
||||
eprosima::fastrtps::rtps::iHandle2GUID(instance_handle_dw);
|
||||
graph_manager_->add_datawriter(datawriter_guid, participant, datawriter);
|
||||
graph_manager_->associate_entity(
|
||||
datawriter_guid, participant, dds::xrce::OBJK_DATAWRITER);
|
||||
|
||||
// TODO(pablogs): Workaround for Fast-DDS bug #9977. Remove when fixed
|
||||
const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle_dr =
|
||||
datareader->get_instance_handle();
|
||||
const eprosima::fastrtps::rtps::GUID_t datareader_guid =
|
||||
eprosima::fastrtps::rtps::iHandle2GUID(instance_handle_dr);
|
||||
graph_manager_->add_datareader(datareader_guid, participant, datareader);
|
||||
graph_manager_->associate_entity(
|
||||
datareader_guid, participant, dds::xrce::OBJK_DATAREADER);
|
||||
});
|
||||
xrce_dds_agent_instance_.add_middleware_callback(
|
||||
eprosima::uxr::Middleware::Kind::FASTDDS,
|
||||
eprosima::uxr::middleware::CallbackKind::CREATE_REPLIER,
|
||||
std::move(on_create_replier));
|
||||
|
||||
/**
|
||||
* Add DELETE_REPLIER callback.
|
||||
*/
|
||||
std::function<void (
|
||||
const eprosima::fastdds::dds::DomainParticipant *,
|
||||
const eprosima::fastdds::dds::DataWriter *,
|
||||
const eprosima::fastdds::dds::DataReader *)> on_delete_replier
|
||||
([&](
|
||||
const eprosima::fastdds::dds::DomainParticipant* participant,
|
||||
const eprosima::fastdds::dds::DataWriter* datawriter,
|
||||
const eprosima::fastdds::dds::DataReader * datareader) -> void
|
||||
{
|
||||
auto graph_manager_ = find_or_create_graph_manager(participant->get_domain_id());
|
||||
|
||||
// TODO(pablogs): Workaround for Fast-DDS bug #9977. Remove when fixed
|
||||
const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle_dw =
|
||||
datawriter->get_instance_handle();
|
||||
const eprosima::fastrtps::rtps::GUID_t datawriter_guid =
|
||||
eprosima::fastrtps::rtps::iHandle2GUID(instance_handle_dw);
|
||||
graph_manager_->remove_datawriter(datawriter_guid);
|
||||
|
||||
// TODO(pablogs): Workaround for Fast-DDS bug #9977. Remove when fixed
|
||||
const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle_dr =
|
||||
datareader->get_instance_handle();
|
||||
const eprosima::fastrtps::rtps::GUID_t datareader_guid =
|
||||
eprosima::fastrtps::rtps::iHandle2GUID(instance_handle_dr);
|
||||
graph_manager_->remove_datareader(datareader_guid);
|
||||
});
|
||||
|
||||
xrce_dds_agent_instance_.add_middleware_callback(
|
||||
eprosima::uxr::Middleware::Kind::FASTDDS,
|
||||
eprosima::uxr::middleware::CallbackKind::DELETE_REPLIER,
|
||||
std::move(on_delete_replier));
|
||||
}
|
||||
|
||||
return result;
|
||||
|
||||
@@ -17,6 +17,11 @@
|
||||
|
||||
#include <agent/graph_manager/graph_manager.hpp>
|
||||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
namespace uros {
|
||||
namespace agent {
|
||||
namespace graph_manager {
|
||||
@@ -96,7 +101,7 @@ GraphManager::GraphManager(eprosima::fastdds::dds::DomainId_t domain_id)
|
||||
|
||||
eprosima::fastdds::dds::DataWriterQos ros_to_microros_datawriter_qos_ = datawriter_qos_;
|
||||
ros_to_microros_datawriter_qos_.history().kind =
|
||||
eprosima::fastdds::dds::HistoryQosPolicyKind::KEEP_ALL_HISTORY_QOS;
|
||||
eprosima::fastdds::dds::HistoryQosPolicyKind::KEEP_LAST_HISTORY_QOS;
|
||||
ros_to_microros_graph_datawriter_.reset(
|
||||
publisher_->create_datawriter(ros_to_microros_graph_topic_.get(), ros_to_microros_datawriter_qos_));
|
||||
|
||||
@@ -371,6 +376,24 @@ void GraphManager::add_datawriter(
|
||||
type_name, participant_gid, qos_profile, false);
|
||||
}
|
||||
|
||||
void GraphManager::add_datawriter(
|
||||
const eprosima::fastrtps::rtps::GUID_t& datawriter_guid,
|
||||
const std::string& topic_name,
|
||||
const std::string& type_name,
|
||||
const eprosima::fastrtps::rtps::GUID_t& participant_guid,
|
||||
const eprosima::fastdds::dds::WriterQos& writer_qos)
|
||||
{
|
||||
const rmw_gid_t datawriter_gid = rmw_fastrtps_shared_cpp::create_rmw_gid(
|
||||
"rmw_fastrtps_cpp", datawriter_guid);
|
||||
const rmw_gid_t participant_gid = rmw_fastrtps_shared_cpp::create_rmw_gid(
|
||||
"rmw_fastrtps_cpp", participant_guid);
|
||||
rmw_qos_profile_t qos_profile = rmw_qos_profile_unknown;
|
||||
dds_qos_to_rmw_qos(writer_qos, &qos_profile);
|
||||
|
||||
graphCache_.add_entity(datawriter_gid, topic_name,
|
||||
type_name, participant_gid, qos_profile, false);
|
||||
}
|
||||
|
||||
void GraphManager::remove_datawriter(
|
||||
const eprosima::fastrtps::rtps::GUID_t& datawriter_guid)
|
||||
{
|
||||
@@ -408,6 +431,24 @@ void GraphManager::add_datareader(
|
||||
type_name, participant_gid, qos_profile, true);
|
||||
}
|
||||
|
||||
void GraphManager::add_datareader(
|
||||
const eprosima::fastrtps::rtps::GUID_t& datareader_guid,
|
||||
const std::string& topic_name,
|
||||
const std::string& type_name,
|
||||
const eprosima::fastrtps::rtps::GUID_t& participant_guid,
|
||||
const eprosima::fastdds::dds::ReaderQos& reader_qos)
|
||||
{
|
||||
const rmw_gid_t datareader_gid = rmw_fastrtps_shared_cpp::create_rmw_gid(
|
||||
"rmw_fastrtps_cpp", datareader_guid);
|
||||
const rmw_gid_t participant_gid = rmw_fastrtps_shared_cpp::create_rmw_gid(
|
||||
"rmw_fastrtps_cpp", participant_guid);
|
||||
rmw_qos_profile_t qos_profile = rmw_qos_profile_unknown;
|
||||
dds_qos_to_rmw_qos(reader_qos, &qos_profile);
|
||||
|
||||
graphCache_.add_entity(datareader_gid, topic_name,
|
||||
type_name, participant_gid, qos_profile, true);
|
||||
}
|
||||
|
||||
void GraphManager::remove_datareader(
|
||||
const eprosima::fastrtps::rtps::GUID_t& datareader_guid)
|
||||
{
|
||||
@@ -540,7 +581,7 @@ void GraphManager::update_node_entities_info()
|
||||
if (ros_discovery_datareader_->take_next_sample(&entities_info, &sample_info) ==
|
||||
eprosima::fastrtps::types::ReturnCode_t::RETCODE_OK)
|
||||
{
|
||||
if (sample_info.instance_state == eprosima::fastdds::dds::InstanceStateKind::ALIVE_INSTANCE_STATE)
|
||||
if (sample_info.instance_state == eprosima::fastdds::dds::InstanceStateKind::ALIVE)
|
||||
{
|
||||
graphCache_.update_participant_entities(entities_info);
|
||||
}
|
||||
@@ -625,52 +666,6 @@ void GraphManager::ParticipantListener::on_participant_discovery(
|
||||
}
|
||||
}
|
||||
|
||||
static eprosima::fastdds::dds::DataWriterQos writer_qos_conversion(
|
||||
const eprosima::fastdds::dds::WriterQos& writer_qos)
|
||||
{
|
||||
eprosima::fastdds::dds::DataWriterQos datawriter_qos;
|
||||
datawriter_qos.durability(writer_qos.m_durability);
|
||||
datawriter_qos.durability_service(writer_qos.m_durabilityService);
|
||||
datawriter_qos.deadline(writer_qos.m_deadline);
|
||||
datawriter_qos.latency_budget(writer_qos.m_latencyBudget);
|
||||
datawriter_qos.liveliness(writer_qos.m_liveliness);
|
||||
datawriter_qos.reliability(writer_qos.m_reliability);
|
||||
datawriter_qos.destination_order(writer_qos.m_destinationOrder);
|
||||
datawriter_qos.lifespan(writer_qos.m_lifespan);
|
||||
datawriter_qos.user_data(writer_qos.m_userData);
|
||||
datawriter_qos.ownership(writer_qos.m_ownership);
|
||||
datawriter_qos.ownership_strength(writer_qos.m_ownershipStrength);
|
||||
datawriter_qos.publish_mode(writer_qos.m_publishMode);
|
||||
datawriter_qos.representation(writer_qos.representation);
|
||||
datawriter_qos.data_sharing(writer_qos.data_sharing);
|
||||
|
||||
return datawriter_qos;
|
||||
}
|
||||
|
||||
static eprosima::fastdds::dds::DataReaderQos reader_qos_conversion(
|
||||
const eprosima::fastdds::dds::ReaderQos& reader_qos)
|
||||
{
|
||||
eprosima::fastdds::dds::DataReaderQos datareader_qos;
|
||||
|
||||
datareader_qos.durability(reader_qos.m_durability);
|
||||
datareader_qos.deadline(reader_qos.m_deadline);
|
||||
datareader_qos.latency_budget(reader_qos.m_latencyBudget);
|
||||
datareader_qos.liveliness(reader_qos.m_liveliness);
|
||||
datareader_qos.reliability(reader_qos.m_reliability);
|
||||
datareader_qos.destination_order(reader_qos.m_destinationOrder);
|
||||
datareader_qos.user_data(reader_qos.m_userData);
|
||||
datareader_qos.ownership(reader_qos.m_ownership);
|
||||
datareader_qos.time_based_filter(reader_qos.m_timeBasedFilter);
|
||||
datareader_qos.lifespan(reader_qos.m_lifespan);
|
||||
datareader_qos.durability_service(reader_qos.m_durabilityService);
|
||||
eprosima::fastdds::dds::TypeConsistencyQos consistency;
|
||||
consistency.type_consistency = reader_qos.type_consistency;
|
||||
datareader_qos.type_consistency(consistency);
|
||||
datareader_qos.data_sharing(reader_qos.data_sharing);
|
||||
|
||||
return datareader_qos;
|
||||
}
|
||||
|
||||
template <>
|
||||
void GraphManager::ParticipantListener::process_discovery_info<eprosima::fastrtps::rtps::ReaderDiscoveryInfo>(
|
||||
const eprosima::fastrtps::rtps::ReaderDiscoveryInfo& reader_info)
|
||||
@@ -687,7 +682,7 @@ void GraphManager::ParticipantListener::process_discovery_info<eprosima::fastrtp
|
||||
const std::string type_name = reader_info.info.typeName().to_string();
|
||||
|
||||
graphManager_from_->add_datareader(reader_info.info.guid(), topic_name, type_name,
|
||||
iHandle2GUID(reader_info.info.RTPSParticipantKey()), reader_qos_conversion(reader_info.info.m_qos));
|
||||
iHandle2GUID(reader_info.info.RTPSParticipantKey()), reader_info.info.m_qos);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
@@ -714,7 +709,7 @@ void GraphManager::ParticipantListener::process_discovery_info<eprosima::fastrtp
|
||||
const std::string type_name = writer_info.info.typeName().to_string();
|
||||
|
||||
graphManager_from_->add_datawriter(writer_info.info.guid(), topic_name, type_name,
|
||||
iHandle2GUID(writer_info.info.RTPSParticipantKey()), writer_qos_conversion(writer_info.info.m_qos));
|
||||
iHandle2GUID(writer_info.info.RTPSParticipantKey()), writer_info.info.m_qos);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
@@ -756,4 +751,4 @@ void GraphManager::DatareaderListener::on_data_available(
|
||||
} // namespace agent
|
||||
} // namespace uros
|
||||
|
||||
#endif // _UROS_AGENT_GRAPH_MANAGER_CPP
|
||||
#endif // _UROS_AGENT_GRAPH_MANAGER_CPP
|
||||
|
||||
@@ -17,6 +17,8 @@
|
||||
|
||||
#include <agent/graph_manager/graph_typesupport.hpp>
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace uros {
|
||||
namespace agent {
|
||||
namespace graph_manager {
|
||||
@@ -41,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);
|
||||
}
|
||||
|
||||
@@ -133,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);
|
||||
}
|
||||
|
||||
|
||||
@@ -14,6 +14,9 @@
|
||||
|
||||
#include <agent/Agent.hpp>
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
uros::agent::Agent micro_ros_agent;
|
||||
|
||||
Reference in New Issue
Block a user