Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-01 02:55:07 +08:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

microdds_client: add namespace to partecipant name

Browse Source 
The partecipant name is modified into
"client_namespace"/px4_micro_xrce_dds

For sitl builds the microdds_client is automatically started
with namespace
px4_"instance_number"
and udp port
8888+"intance_number"

Signed-off-by: Beniamino Pozzan <beniamino.pozzan@phd.unipd.it>
This commit is contained in:
Beniamino Pozzan
2022-10-21 16:23:55 -07:00
committed by Daniel Agar
parent 8eb2a0a3ec
commit a92897fb58
2 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ROMFS/px4fmu_common/init.d-posix/rcS
+1 -1
View File
@@ -260,7 +260,7 @@ fi
navigator start navigator start
# Try to start the microdds_client with UDP transport if module exists # Try to start the microdds_client with UDP transport if module exists
microdds_client start -t udp -p 8888 microdds_client start -t udp -p "$((px4_instance+8888))" -n "px4_${px4_instance}"
if param greater -s MNT_MODE_IN -1 if param greater -s MNT_MODE_IN -1
then then
src/modules/microdds_client/microdds_client.cpp
+22 -8
View File
@@ -53,6 +53,8 @@
#define STREAM_HISTORY 4 #define STREAM_HISTORY 4
#define BUFFER_SIZE (UXR_CONFIG_SERIAL_TRANSPORT_MTU * STREAM_HISTORY) // MTU==512 by default #define BUFFER_SIZE (UXR_CONFIG_SERIAL_TRANSPORT_MTU * STREAM_HISTORY) // MTU==512 by default
#define PARTICIPANT_XML_SIZE 512
using namespace time_literals; using namespace time_literals;
void on_time(uxrSession *session, int64_t current_time, int64_t received_timestamp, int64_t transmit_timestamp, void on_time(uxrSession *session, int64_t current_time, int64_t received_timestamp, int64_t transmit_timestamp,
@@ -222,8 +224,9 @@ void MicroddsClient::run()
// uint16_t participant_req = uxr_buffer_create_participant_bin(&session, reliable_out, participant_id, domain_id, // uint16_t participant_req = uxr_buffer_create_participant_bin(&session, reliable_out, participant_id, domain_id,
// participant_name, UXR_REPLACE); // participant_name, UXR_REPLACE);
// TODO: configurable participant name with client namespace? char participant_xml[PARTICIPANT_XML_SIZE];
const char *participant_xml = _localhost_only ? int ret = snprintf(participant_xml, PARTICIPANT_XML_SIZE, "%s<name>%s/px4_micro_xrce_dds</name>%s",
_localhost_only ?
"<dds>" "<dds>"
"<profiles>" "<profiles>"
"<transport_descriptors>" "<transport_descriptors>"
@@ -236,20 +239,31 @@ void MicroddsClient::run()
"</profiles>" "</profiles>"
"<participant>" "<participant>"
"<rtps>" "<rtps>"
"<name>px4_micro_xrce_dds</name>" :
"<dds>"
"<participant>"
"<rtps>",
_client_namespace != nullptr ?
_client_namespace
:
"",
_localhost_only ?
"<useBuiltinTransports>false</useBuiltinTransports>" "<useBuiltinTransports>false</useBuiltinTransports>"
"<userTransports><transport_id>udp_localhost</transport_id></userTransports>" "<userTransports><transport_id>udp_localhost</transport_id></userTransports>"
"</rtps>" "</rtps>"
"</participant>" "</participant>"
"</dds>" "</dds>"
: :
"<dds>"
"<participant>"
"<rtps>"
"<name>px4_micro_xrce_dds</name>"
"</rtps>" "</rtps>"
"</participant>" "</participant>"
"</dds>" ; "</dds>"
);
if (ret < 0 || ret >= TOPIC_NAME_SIZE) {
PX4_ERR("create entities failed: namespace too long");
return;
}
uint16_t participant_req = uxr_buffer_create_participant_xml(&session, reliable_out, participant_id, domain_id, uint16_t participant_req = uxr_buffer_create_participant_xml(&session, reliable_out, participant_id, domain_id,
participant_xml, UXR_REPLACE); participant_xml, UXR_REPLACE);