mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-05-19 00:59:06 +08:00
microdds_client: rename to uxrce_dds_client
| | old version | new version (second proposal) | |-|-|-| | module name | `microdds_client` | **`uxrce_dds_client`** | | strings / comments about the module | non consistent | **UXRCE-DDS Client** | | menuconfig option | `MODULES_MICRODDS_CLIENT` | **`MODULES_UXRCE_DDS_CLIENT`** | | module parameters group name | `Micro XRCE-DDS` | **UXRCE-DDS Client** | | module parameters name prefix | `XRCE_DDS_` | `UXRCE_DDS_` | | module class name | `MicroddsClient` | **`UxrceddsClient`** | |`init.d/rcS` whenever the module is mentioned | `microdds` | **`uxrce_dds`** | | main doc page name | XRCE-DDS (PX4-FastDDS Bridge) | **uXRCE-DDS (PX4-micro XRCE-DDS Bridge)**| | environment variable to have custom namespace in simulation | PX4_MICRODDS_NS | **PX4_UXRCE_DDS_NS** | Signed-off-by: Beniamino Pozzan <beniamino.pozzan@phd.unipd.it>
This commit is contained in:
parent
1d4b66fcbc
commit
9e5420bbbd
@ -129,7 +129,7 @@ fi
|
||||
# multi-instance setup
|
||||
# shellcheck disable=SC2154
|
||||
param set MAV_SYS_ID $((px4_instance+1))
|
||||
param set XRCE_DDS_KEY $((px4_instance+1))
|
||||
param set UXRCE_DDS_KEY $((px4_instance+1))
|
||||
|
||||
if [ $AUTOCNF = yes ]
|
||||
then
|
||||
@ -265,26 +265,26 @@ fi
|
||||
|
||||
navigator start
|
||||
|
||||
# Try to start the microdds_client with UDP transport if module exists
|
||||
microdds_ns=""
|
||||
# Try to start the UXRCE-DDS Client with UDP transport if module exists
|
||||
uxrce_dds_ns=""
|
||||
if [ "$px4_instance" -ne "0" ]
|
||||
then
|
||||
# for multi intances setup, add namespace prefix
|
||||
microdds_ns="-n px4_$px4_instance"
|
||||
uxrce_dds_ns="-n px4_$px4_instance"
|
||||
fi
|
||||
if [ -n "$PX4_MICRODDS_NS" ]
|
||||
if [ -n "$PX4_UXRCE_DDS_NS" ]
|
||||
then
|
||||
# Override namespace if environment variable is defined
|
||||
microdds_ns="-n $PX4_MICRODDS_NS"
|
||||
uxrce_dds_ns="-n $PX4_UXRCE_DDS_NS"
|
||||
fi
|
||||
if [ -n "$ROS_DOMAIN_ID" ]
|
||||
then
|
||||
# Match XRCE_DDS_DOM_ID with ROS_DOMAIN_ID, if defined
|
||||
param set XRCE_DDS_DOM_ID $ROS_DOMAIN_ID
|
||||
# Match UXRCE_DDS_DOM_ID with ROS_DOMAIN_ID, if defined
|
||||
param set UXRCE_DDS_DOM_ID $ROS_DOMAIN_ID
|
||||
else
|
||||
param set XRCE_DDS_DOM_ID 0
|
||||
param set UXRCE_DDS_DOM_ID 0
|
||||
fi
|
||||
microdds_client start -t udp -h 127.0.0.1 -p 8888 $microdds_ns
|
||||
uxrce_dds_client start -t udp -h 127.0.0.1 -p 8888 $uxrce_dds_ns
|
||||
|
||||
if param greater -s MNT_MODE_IN -1
|
||||
then
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user