mirror of
https://github.com/micro-ROS/micro-ROS-Agent.git
synced 2026-09-06 18:05:17 +02:00
Compare commits
13
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d7dab5c671 | ||
|
|
e85eccb7c0 | ||
|
|
ac9f09b656 | ||
|
|
7ffd5f0bb6 | ||
|
|
ceb1a1436c | ||
|
|
c98705319f | ||
|
|
d149bb7018 | ||
|
|
646ca52aab | ||
|
|
95fecd77ae | ||
|
|
69f17c28a8 | ||
|
|
f6a2aa3b60 | ||
|
|
a623308505 | ||
|
|
e133754746 |
@@ -9,7 +9,7 @@ jobs:
|
||||
|
||||
microros_agent_ci:
|
||||
runs-on: ubuntu-20.04
|
||||
container: microros/base:foxy
|
||||
container: microros/base:rolling
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
@@ -2,6 +2,25 @@
|
||||
Changelog for package micro-ros_agent
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
3.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>`_)
|
||||
* Modify argument type (`#91 <https://github.com/micro-ROS/micro-ROS-Agent/issues/91>`_)
|
||||
* Fix graph manager datawriters behaviour (`#84 <https://github.com/micro-ROS/micro-ROS-Agent/issues/84>`_)
|
||||
* Graph manager: Fix participant mask for listener callbacks (`#81 <https://github.com/micro-ROS/micro-ROS-Agent/issues/81>`_)
|
||||
* Fix agent launch (`#78 <https://github.com/micro-ROS/micro-ROS-Agent/issues/78>`_)
|
||||
* Fix graph manager node namespaces (`#75 <https://github.com/micro-ROS/micro-ROS-Agent/issues/75>`_)
|
||||
* Fix Rolling agent (`#61 <https://github.com/micro-ROS/micro-ROS-Agent/issues/61>`_)
|
||||
* Add multi domain graph manager (`#69 <https://github.com/micro-ROS/micro-ROS-Agent/issues/69>`_)
|
||||
* Add ros2 launch capabilities and example launch file (`#47 <https://github.com/micro-ROS/micro-ROS-Agent/issues/47>`_)
|
||||
* Snap build for the micro-ROS-Agent (`#43 <https://github.com/micro-ROS/micro-ROS-Agent/issues/43>`_)
|
||||
* Create graph manager after checking passed CLI arguments and launch xrce-dds server (`#41 <https://github.com/micro-ROS/micro-ROS-Agent/issues/41>`_)
|
||||
* Contributors: Antonio Cuadros, Jose Antonio Moral, Pablo Garrido, mergify[bot]
|
||||
|
||||
0.0.1 (2019-04-24)
|
||||
-----------------
|
||||
* Initial release
|
||||
|
||||
@@ -19,7 +19,15 @@ option(UROSAGENT_GENERATE_PROFILE
|
||||
)
|
||||
set(CMAKE_C_CLANG_TIDY clang-tidy -checks=*)
|
||||
|
||||
option(MICROROSAGENT_SUPERBUILD "Enable superbuild compilation." ON)
|
||||
|
||||
if(NOT MICROROSAGENT_SUPERBUILD)
|
||||
project(micro_ros_agent LANGUAGES CXX)
|
||||
else()
|
||||
project(uagent_superbuild NONE)
|
||||
include(${PROJECT_SOURCE_DIR}/cmake/SuperBuild.cmake)
|
||||
return()
|
||||
endif()
|
||||
|
||||
find_package(ament_cmake REQUIRED)
|
||||
find_package(microxrcedds_agent REQUIRED)
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
# Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima).
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
set(@PROJECT_NAME@_VERSION @PROJECT_VERSION@)
|
||||
|
||||
@PACKAGE_INIT@
|
||||
|
||||
if(MSVC OR MSVC_IDE)
|
||||
set_and_check(@PROJECT_NAME@_BIN_DIR "@PACKAGE_BIN_INSTALL_DIR@")
|
||||
endif()
|
||||
set_and_check(@PROJECT_NAME@_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
|
||||
set_and_check(@PROJECT_NAME@_LIB_DIR "@PACKAGE_LIB_INSTALL_DIR@")
|
||||
set_and_check(@PROJECT_NAME@_DATA_DIR "@PACKAGE_DATA_INSTALL_DIR@")
|
||||
|
||||
foreach(d @_deps@)
|
||||
list(GET d 0 _name)
|
||||
list(GET d 1 _version)
|
||||
find_package(${_name} ${_version} REQUIRED)
|
||||
endforeach()
|
||||
|
||||
include(${@PROJECT_NAME@_DATA_DIR}/@PROJECT_NAME@/cmake/@PROJECT_NAME@Targets.cmake)
|
||||
@@ -0,0 +1,66 @@
|
||||
# Copyright 2019 Proyectos y Sistemas de Mantenimiento SL (eProsima).
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
include(ExternalProject)
|
||||
|
||||
unset(_deps)
|
||||
|
||||
enable_language(C)
|
||||
enable_language(CXX)
|
||||
|
||||
unset(xrceagent_DIR CACHE)
|
||||
find_package(xrceagent 2 EXACT QUIET)
|
||||
if(NOT xrceagent_FOUND)
|
||||
ExternalProject_Add(xrceagent
|
||||
GIT_REPOSITORY
|
||||
https://github.com/eProsima/Micro-XRCE-DDS-Agent.git
|
||||
GIT_TAG
|
||||
ros2
|
||||
PREFIX
|
||||
${PROJECT_BINARY_DIR}/agent
|
||||
INSTALL_DIR
|
||||
${CMAKE_INSTALL_PREFIX}
|
||||
CMAKE_CACHE_ARGS
|
||||
-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
|
||||
-DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
|
||||
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
|
||||
-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}
|
||||
-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
|
||||
-DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS}
|
||||
-DCMAKE_SHARED_LINKER_FLAGS:STRING=${CMAKE_SHARED_LINKER_FLAGS}
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
|
||||
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
|
||||
-DCMAKE_PREFIX_PATH:PATH=<INSTALL_DIR>
|
||||
-DUAGENT_USE_SYSTEM_FASTDDS:BOOL=ON
|
||||
-DUAGENT_USE_SYSTEM_FASTCDR:BOOL=ON
|
||||
-DUAGENT_CED_PROFILE:BOOL=OFF
|
||||
-DUAGENT_P2P_PROFILE:BOOL=OFF
|
||||
-DUAGENT_BUILD_EXECUTABLE:BOOL=OFF
|
||||
-DUAGENT_ISOLATED_INSTALL:BOOL=OFF
|
||||
)
|
||||
endif()
|
||||
|
||||
# Main project.
|
||||
ExternalProject_Add(micro_ros_agent
|
||||
SOURCE_DIR
|
||||
${PROJECT_SOURCE_DIR}
|
||||
BINARY_DIR
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
CMAKE_CACHE_ARGS
|
||||
-DMICROROSAGENT_SUPERBUILD:BOOL=OFF
|
||||
INSTALL_COMMAND
|
||||
""
|
||||
DEPENDS
|
||||
xrceagent
|
||||
)
|
||||
@@ -32,103 +32,20 @@ public:
|
||||
|
||||
~Agent() = default;
|
||||
|
||||
/**
|
||||
* @brief Agent class shall not be copy constructible.
|
||||
*/
|
||||
UXR_AGENT_EXPORT Agent(
|
||||
const Agent &) = delete;
|
||||
|
||||
UXR_AGENT_EXPORT Agent(
|
||||
Agent &&) = delete;
|
||||
|
||||
/**
|
||||
* @brief Agent class shall not be copy assignable.
|
||||
*/
|
||||
UXR_AGENT_EXPORT Agent& operator =(
|
||||
const Agent &) = delete;
|
||||
|
||||
UXR_AGENT_EXPORT Agent& operator =(
|
||||
Agent &&) = delete;
|
||||
|
||||
static Agent& getInstance()
|
||||
{
|
||||
static Agent instance;
|
||||
return instance;
|
||||
}
|
||||
|
||||
bool create(
|
||||
int argc,
|
||||
char** argv);
|
||||
|
||||
void run();
|
||||
|
||||
void stop();
|
||||
|
||||
void add_callbacks();
|
||||
|
||||
private:
|
||||
|
||||
eprosima::uxr::AgentInstance& xrce_dds_agent_instance_;
|
||||
std::map<eprosima::fastdds::dds::DomainId_t, std::shared_ptr<graph_manager::GraphManager>> graph_manager_map_;
|
||||
|
||||
std::shared_ptr<graph_manager::GraphManager> find_or_create_graph_manager(eprosima::fastdds::dds::DomainId_t domain_id);
|
||||
bool started = false;
|
||||
};
|
||||
|
||||
template<typename AgentType>
|
||||
class AgentAPI
|
||||
{
|
||||
public:
|
||||
AgentAPI()
|
||||
: agent_instance_(agent_instance_.getInstance())
|
||||
{};
|
||||
|
||||
~AgentAPI() = default;
|
||||
|
||||
void create(uint16_t port)
|
||||
{
|
||||
xrce_dds_agent_instance_API.configure(port);
|
||||
}
|
||||
|
||||
void create(std::string dev, const std::string baudrate);
|
||||
void create(std::vector<std::string> devs, const std::string baudrate);
|
||||
void create(const std::string baudrate);
|
||||
|
||||
void set_verbose_level(uint8_t verbose_level)
|
||||
{
|
||||
xrce_dds_agent_instance_API.set_verbose_level(verbose_level);
|
||||
}
|
||||
|
||||
void run()
|
||||
{
|
||||
agent_instance_.add_callbacks();
|
||||
xrce_dds_agent_instance_API.run();
|
||||
}
|
||||
|
||||
void stop()
|
||||
{
|
||||
xrce_dds_agent_instance_API.stop();
|
||||
}
|
||||
|
||||
private:
|
||||
Agent& agent_instance_;
|
||||
eprosima::uxr::AgentInstanceAPI<AgentType> xrce_dds_agent_instance_API;
|
||||
};
|
||||
|
||||
template<> inline UXR_AGENT_EXPORT void AgentAPI<eprosima::uxr::TermiosAgent>::create(std::string dev, const std::string baudrate)
|
||||
{
|
||||
xrce_dds_agent_instance_API.configure(dev, baudrate);
|
||||
}
|
||||
|
||||
template<> inline UXR_AGENT_EXPORT void AgentAPI<eprosima::uxr::MultiTermiosAgent>::create(std::vector<std::string> devs, const std::string baudrate)
|
||||
{
|
||||
xrce_dds_agent_instance_API.configure(devs, baudrate);
|
||||
|
||||
}
|
||||
|
||||
template<> inline UXR_AGENT_EXPORT void AgentAPI<eprosima::uxr::PseudoTerminalAgent>::create(const std::string baudrate)
|
||||
{
|
||||
xrce_dds_agent_instance_API.configure(baudrate);
|
||||
}
|
||||
|
||||
} // namespace agent
|
||||
} // namespace uros
|
||||
#endif // _UROS_AGENT_AGENT_HPP
|
||||
@@ -80,16 +80,7 @@ public:
|
||||
/**
|
||||
* @brief Default destructor.
|
||||
*/
|
||||
~GraphManager()
|
||||
{
|
||||
exit = true;
|
||||
cv_.notify_one();
|
||||
|
||||
if (microros_graph_publisher_.joinable())
|
||||
{
|
||||
microros_graph_publisher_.join();
|
||||
}
|
||||
}
|
||||
~GraphManager() = default;
|
||||
|
||||
/**
|
||||
* @brief Implementation of the notification logic that updates the micro-ROS graph.
|
||||
@@ -141,21 +132,6 @@ 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.
|
||||
@@ -189,21 +165,6 @@ 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.
|
||||
@@ -307,7 +268,6 @@ private:
|
||||
std::string& node_name,
|
||||
std::string& node_namespace);
|
||||
|
||||
bool exit = false;
|
||||
eprosima::fastdds::dds::DomainId_t domain_id_;
|
||||
bool graph_changed_;
|
||||
bool display_on_change_;
|
||||
|
||||
@@ -7,6 +7,6 @@ def generate_launch_description():
|
||||
package='micro_ros_agent',
|
||||
executable='micro_ros_agent',
|
||||
name='micro_ros_agent',
|
||||
arguments={"udp4", "-p", "8888", "-v6"}
|
||||
arguments=["udp4", "-p", "8888", "-v6"]
|
||||
)
|
||||
])
|
||||
|
||||
@@ -2,9 +2,10 @@
|
||||
<?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>0.0.1</version>
|
||||
<description>DDS-XCRE agent implementation </description>
|
||||
<maintainer email="borjaouterelo@eprosima.com">Borja Outerelo</maintainer>
|
||||
<version>3.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>
|
||||
<license>Apache License 2.0</license>
|
||||
|
||||
<buildtool_depend>ament_cmake</buildtool_depend>
|
||||
@@ -14,7 +15,6 @@
|
||||
<test_depend>ament_lint_auto</test_depend>
|
||||
<test_depend>ament_lint_common</test_depend>
|
||||
|
||||
<depend>microxrcedds_agent</depend>
|
||||
<depend>rmw</depend>
|
||||
<depend>rcutils</depend>
|
||||
<depend>rmw_fastrtps_shared_cpp</depend>
|
||||
|
||||
@@ -29,12 +29,8 @@ bool Agent::create(
|
||||
int argc,
|
||||
char** argv)
|
||||
{
|
||||
return xrce_dds_agent_instance_.create(argc, argv);
|
||||
}
|
||||
|
||||
void Agent::add_callbacks()
|
||||
{
|
||||
if (!started)
|
||||
bool result = xrce_dds_agent_instance_.create(argc, argv);
|
||||
if (result)
|
||||
{
|
||||
/**
|
||||
* Add CREATE_PARTICIPANT callback.
|
||||
@@ -104,6 +100,7 @@ void Agent::add_callbacks()
|
||||
const eprosima::fastdds::dds::DomainParticipant* participant,
|
||||
const eprosima::fastdds::dds::DataWriter* datawriter) -> void
|
||||
{
|
||||
|
||||
auto graph_manager_ = find_or_create_graph_manager(participant->get_domain_id());
|
||||
|
||||
// TODO(jamoralp): Workaround for Fast-DDS bug #9977. Remove when fixed
|
||||
@@ -169,9 +166,9 @@ void Agent::add_callbacks()
|
||||
eprosima::uxr::Middleware::Kind::FASTDDS,
|
||||
eprosima::uxr::middleware::CallbackKind::DELETE_DATAREADER,
|
||||
std::move(on_delete_datareader));
|
||||
|
||||
started = true;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
void Agent::run()
|
||||
@@ -179,11 +176,6 @@ void Agent::run()
|
||||
return xrce_dds_agent_instance_.run();
|
||||
}
|
||||
|
||||
void Agent::stop()
|
||||
{
|
||||
return xrce_dds_agent_instance_.stop();
|
||||
}
|
||||
|
||||
std::shared_ptr<graph_manager::GraphManager> Agent::find_or_create_graph_manager(eprosima::fastdds::dds::DomainId_t domain_id)
|
||||
{
|
||||
|
||||
|
||||
@@ -137,15 +137,10 @@ inline void GraphManager::publish_microros_graph()
|
||||
std::unique_lock<std::mutex> lock(mtx_);
|
||||
cv_.wait(lock, [this]()
|
||||
{
|
||||
return this->graph_changed_ || exit;
|
||||
return this->graph_changed_;
|
||||
});
|
||||
}
|
||||
|
||||
if (exit)
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
if (display_on_change_)
|
||||
{
|
||||
std::cout << "Updated uros Graph: graph changed" << std::endl;
|
||||
@@ -376,24 +371,6 @@ 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)
|
||||
{
|
||||
@@ -431,24 +408,6 @@ 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)
|
||||
{
|
||||
@@ -581,7 +540,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)
|
||||
if (sample_info.instance_state == eprosima::fastdds::dds::InstanceStateKind::ALIVE_INSTANCE_STATE)
|
||||
{
|
||||
graphCache_.update_participant_entities(entities_info);
|
||||
}
|
||||
@@ -666,6 +625,52 @@ 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)
|
||||
@@ -682,7 +687,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_info.info.m_qos);
|
||||
iHandle2GUID(reader_info.info.RTPSParticipantKey()), reader_qos_conversion(reader_info.info.m_qos));
|
||||
break;
|
||||
}
|
||||
default:
|
||||
@@ -709,7 +714,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_info.info.m_qos);
|
||||
iHandle2GUID(writer_info.info.RTPSParticipantKey()), writer_qos_conversion(writer_info.info.m_qos));
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
||||
@@ -41,7 +41,7 @@ ParticipantEntitiesInfoTypeSupport::ParticipantEntitiesInfoTypeSupport()
|
||||
ss << "dds_::" << message_name << "_";
|
||||
this->setName(ss.str().c_str());
|
||||
|
||||
bool full_bounded = true;
|
||||
char full_bounded;
|
||||
m_typeSize = 4 + callbacks_->max_serialized_size(full_bounded);
|
||||
}
|
||||
|
||||
@@ -133,7 +133,7 @@ MicrorosGraphInfoTypeSupport::MicrorosGraphInfoTypeSupport()
|
||||
ss << "dds_::" << message_name << "_";
|
||||
this->setName(ss.str().c_str());
|
||||
|
||||
bool full_bounded = true;
|
||||
char full_bounded;
|
||||
m_typeSize = 4 + callbacks_->max_serialized_size(full_bounded);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user