From 12f1004ec61317ecdb00065feff6ba309d4c0983 Mon Sep 17 00:00:00 2001 From: Sergi Hernandez Juan <shernand@iri.upc.edu> Date: Wed, 25 Mar 2020 13:10:49 +0100 Subject: [PATCH] Removed the reference to the iri_ana_bringup package. --- config/default_mux.yaml | 26 ++++++++++++++++++++++++++ launch/include/cmd_vel_mux.launch | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 config/default_mux.yaml diff --git a/config/default_mux.yaml b/config/default_mux.yaml new file mode 100644 index 0000000..f8dad3f --- /dev/null +++ b/config/default_mux.yaml @@ -0,0 +1,26 @@ +subscribers: + - name: "Default input" + topic: "/ana/default/cmd_vel" + timeout: 0.1 + priority: 0 + short_desc: "The default cmd_vel, controllers unaware that we are multiplexing cmd_vel should come here" + + - name: "Platform orientation" + topic: "/ana/orientation/cmd_vel" + timeout: 0.1 + priority: 4 + short_desc: "Platform orientation to people" + + - name: "Navigation stack" + topic: "/ana/navigation/cmd_vel" + timeout: 0.5 + priority: 5 + short_desc: "Navigation stack controller" + + - name: "Teleop" + topic: "/ana/teleop/cmd_vel" + timeout: 0.1 + priority: 10 + short_desc: "Teleop wii/ps3 pad" + +publisher: "/ana/cmd_vel" diff --git a/launch/include/cmd_vel_mux.launch b/launch/include/cmd_vel_mux.launch index 44ad4d3..3262f05 100644 --- a/launch/include/cmd_vel_mux.launch +++ b/launch/include/cmd_vel_mux.launch @@ -4,7 +4,7 @@ <arg name="ns" default="ana"/> <arg name="nodelet_manager_name" default="nodelet_manager"/> - <arg name="config" default="$(find iri_ana_bringup)/config/mux.yaml"/> + <arg name="config" default="$(find iri_rosnav)/config/default_mux.yaml"/> <arg name="output" default="log" /> <arg name="launch_prefix" default="" /> -- GitLab