Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-30 18:06:39 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

microRTPS: templates: check only the major and minor of FastRTPS to set the 'discovery_config' namespace

Browse Source
This commit is contained in:
TSC21
2020-03-24 16:25:29 +00:00
committed by Nuno Marques
parent a13e8e573e
commit 1b453ed849
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
msg/templates/urtps/Publisher.cpp.em
+1 -1
View File
@@ -91,7 +91,7 @@ bool @(topic)_Publisher::init()
// Create RTPSParticipant // Create RTPSParticipant
ParticipantAttributes PParam; ParticipantAttributes PParam;
PParam.rtps.builtin.domainId = 0; PParam.rtps.builtin.domainId = 0;
@[if version.parse(fastrtps_version) <= version.parse('1.8')]@ @[if version.parse(fastrtps_version[:3]) <= version.parse('1.8')]@
PParam.rtps.builtin.leaseDuration = c_TimeInfinite; PParam.rtps.builtin.leaseDuration = c_TimeInfinite;
@[else]@ @[else]@
PParam.rtps.builtin.discovery_config.leaseDuration = c_TimeInfinite; PParam.rtps.builtin.discovery_config.leaseDuration = c_TimeInfinite;
msg/templates/urtps/Subscriber.cpp.em
+1 -1
View File
@@ -91,7 +91,7 @@ bool @(topic)_Subscriber::init(uint8_t topic_ID, std::condition_variable* t_send
// Create RTPSParticipant // Create RTPSParticipant
ParticipantAttributes PParam; ParticipantAttributes PParam;
PParam.rtps.builtin.domainId = 0; // MUST BE THE SAME AS IN THE PUBLISHER PParam.rtps.builtin.domainId = 0; // MUST BE THE SAME AS IN THE PUBLISHER
@[if version.parse(fastrtps_version) <= version.parse('1.8')]@ @[if version.parse(fastrtps_version[:3]) <= version.parse('1.8')]@
PParam.rtps.builtin.leaseDuration = c_TimeInfinite; PParam.rtps.builtin.leaseDuration = c_TimeInfinite;
@[else]@ @[else]@
PParam.rtps.builtin.discovery_config.leaseDuration = c_TimeInfinite; PParam.rtps.builtin.discovery_config.leaseDuration = c_TimeInfinite;