From 01ca3b860d6b631d153ffa108acae3efa603d12d Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Mon, 10 Jan 2022 10:02:28 +0100
Subject: [PATCH] fix launch files
---
launch/dummy-cell_ads-table.launch | 2 +-
launch/dummy-cell_ceti-table.launch | 2 +-
launch/dummy-cell_st-table.launch | 2 +-
launch/main_controller_virtual-table.launch | 4 +++-
launch/robot-cell_ads-table.launch | 2 +-
launch/robot-cell_ceti-table.launch | 2 +-
launch/robot-cell_st-table.launch | 2 +-
launch/simulated-cell_ads-table.launch | 2 +-
launch/simulated-cell_ceti-table.launch | 2 +-
launch/simulated-cell_st-table.launch | 2 +-
10 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/launch/dummy-cell_ads-table.launch b/launch/dummy-cell_ads-table.launch
index d73c4d0..6a4409d 100644
--- a/launch/dummy-cell_ads-table.launch
+++ b/launch/dummy-cell_ads-table.launch
@@ -2,7 +2,7 @@
<arg name="connection_address" default="tcp://*:6576"/>
- <node pkg="ccf_immersive_sorting" type="dummy_sorting_controller" name="ads-cell" output="screen">
+ <node pkg="ccf_immersive_sorting" type="dummy_sorting_controller" name="ads_cell" output="screen">
<param name="connection_address" type="string" value="$(arg connection_address)"/>
<param name="scene" type="string" value="$(find ccf_immersive_sorting)/config/config_scene_ads-table.json"/>
</node>
diff --git a/launch/dummy-cell_ceti-table.launch b/launch/dummy-cell_ceti-table.launch
index a53069b..f52b78e 100644
--- a/launch/dummy-cell_ceti-table.launch
+++ b/launch/dummy-cell_ceti-table.launch
@@ -2,7 +2,7 @@
<arg name="connection_address" default="tcp://*:6576"/>
- <node pkg="ccf_immersive_sorting" type="dummy_sorting_controller" name="ceti-cell" output="screen">
+ <node pkg="ccf_immersive_sorting" type="dummy_sorting_controller" name="ceti_cell" output="screen">
<param name="connection_address" type="string" value="$(arg connection_address)"/>
<param name="scene" type="string" value="$(find ccf_immersive_sorting)/config/config_scene_ceti-table.json"/>
</node>
diff --git a/launch/dummy-cell_st-table.launch b/launch/dummy-cell_st-table.launch
index bf81551..28e1aad 100644
--- a/launch/dummy-cell_st-table.launch
+++ b/launch/dummy-cell_st-table.launch
@@ -2,7 +2,7 @@
<arg name="connection_address" default="tcp://*:6576"/>
- <node pkg="ccf_immersive_sorting" type="dummy_sorting_controller" name="st-cell" output="screen">
+ <node pkg="ccf_immersive_sorting" type="dummy_sorting_controller" name="st_cell" output="screen">
<param name="connection_address" type="string" value="$(arg connection_address)"/>
<param name="scene" type="string" value="$(find ccf_immersive_sorting)/config/config_scene_st-table.json"/>
</node>
diff --git a/launch/main_controller_virtual-table.launch b/launch/main_controller_virtual-table.launch
index 936bc7c..eca8065 100644
--- a/launch/main_controller_virtual-table.launch
+++ b/launch/main_controller_virtual-table.launch
@@ -1,12 +1,14 @@
<launch>
<arg name="connection_address" default="tcp://*:6576"/>
- <arg name="client_controllers" default="['ads-cell', 'st-cell', 'ceti-cell']"/>
+ <arg name="mqtt_server" default="tcp://127.0.0.1:1883"/>
+ <arg name="client_controllers" default="['ceti_cell']"/>
<node pkg="ccf_immersive_sorting" type="main_controller" name="main_controller" output="screen">
<param name="connection_address" type="string" value="$(arg connection_address)"/>
<param name="client_controllers" type="yaml" value="$(arg client_controllers)"/>
+ <param name="mqtt_server" type="yaml" value="$(arg mqtt_server)"/>
<param name="scene" type="string" value="$(find ccf_immersive_sorting)/config/config_scene_virtual-table.json"/>
</node>
diff --git a/launch/robot-cell_ads-table.launch b/launch/robot-cell_ads-table.launch
index 5065cc7..b57fc69 100644
--- a/launch/robot-cell_ads-table.launch
+++ b/launch/robot-cell_ads-table.launch
@@ -8,7 +8,7 @@
<arg name="load_gripper" value="$(arg load_gripper)"/>
</include>
- <node pkg="ccf_immersive_sorting" type="moveit_sorting_controller" name="ads-cell" output="screen">
+ <node pkg="ccf_immersive_sorting" type="moveit_sorting_controller" name="ads_cell" output="screen">
<param name="connection_address" type="string" value="$(arg connection_address)"/>
<param name="scene" type="string" value="$(find ccf_immersive_sorting)/config/config_scene_ads-table.json"/>
</node>
diff --git a/launch/robot-cell_ceti-table.launch b/launch/robot-cell_ceti-table.launch
index a2eb31c..2c9faac 100644
--- a/launch/robot-cell_ceti-table.launch
+++ b/launch/robot-cell_ceti-table.launch
@@ -8,7 +8,7 @@
<arg name="load_gripper" value="$(arg load_gripper)"/>
</include>
- <node pkg="ccf_immersive_sorting" type="moveit_sorting_controller" name="ceti-cell" output="screen">
+ <node pkg="ccf_immersive_sorting" type="moveit_sorting_controller" name="ceti_cell" output="screen">
<param name="connection_address" type="string" value="$(arg connection_address)"/>
<param name="scene" type="string" value="$(find ccf_immersive_sorting)/config/config_scene_ceti-table.json"/>
</node>
diff --git a/launch/robot-cell_st-table.launch b/launch/robot-cell_st-table.launch
index b6a9e73..b046714 100644
--- a/launch/robot-cell_st-table.launch
+++ b/launch/robot-cell_st-table.launch
@@ -8,7 +8,7 @@
<arg name="load_gripper" value="$(arg load_gripper)"/>
</include>
- <node pkg="ccf_immersive_sorting" type="moveit_sorting_controller" name="st-cell" output="screen">
+ <node pkg="ccf_immersive_sorting" type="moveit_sorting_controller" name="st_cell" output="screen">
<param name="connection_address" type="string" value="$(arg connection_address)"/>
<param name="scene" type="string" value="$(find ccf_immersive_sorting)/config/config_scene_st-table.json"/>
</node>
diff --git a/launch/simulated-cell_ads-table.launch b/launch/simulated-cell_ads-table.launch
index 7e34f02..3c639f0 100644
--- a/launch/simulated-cell_ads-table.launch
+++ b/launch/simulated-cell_ads-table.launch
@@ -4,7 +4,7 @@
<include file="$(find ccf)/launch/simulation_setup.launch"/>
- <node pkg="ccf_immersive_sorting" type="moveit_sorting_controller" name="ads-cell" output="screen">
+ <node pkg="ccf_immersive_sorting" type="moveit_sorting_controller" name="ads_cell" output="screen">
<param name="connection_address" type="string" value="$(arg connection_address)"/>
<param name="scene" type="string" value="$(find ccf_immersive_sorting)/config/config_scene_ads-table.json"/>
</node>
diff --git a/launch/simulated-cell_ceti-table.launch b/launch/simulated-cell_ceti-table.launch
index ca6b923..f507f38 100644
--- a/launch/simulated-cell_ceti-table.launch
+++ b/launch/simulated-cell_ceti-table.launch
@@ -4,7 +4,7 @@
<include file="$(find ccf)/launch/simulation_setup.launch"/>
- <node pkg="ccf_immersive_sorting" type="moveit_sorting_controller" name="ceti-cell" output="screen">
+ <node pkg="ccf_immersive_sorting" type="moveit_sorting_controller" name="ceti_cell" output="screen">
<param name="connection_address" type="string" value="$(arg connection_address)"/>
<param name="scene" type="string" value="$(find ccf_immersive_sorting)/config/config_scene_ceti-table.json"/>
</node>
diff --git a/launch/simulated-cell_st-table.launch b/launch/simulated-cell_st-table.launch
index 25563d7..4cbe2bb 100644
--- a/launch/simulated-cell_st-table.launch
+++ b/launch/simulated-cell_st-table.launch
@@ -4,7 +4,7 @@
<include file="$(find ccf)/launch/simulation_setup.launch"/>
- <node pkg="ccf_immersive_sorting" type="moveit_sorting_controller" name="st-cell" output="screen">
+ <node pkg="ccf_immersive_sorting" type="moveit_sorting_controller" name="st_cell" output="screen">
<param name="connection_address" type="string" value="$(arg connection_address)"/>
<param name="scene" type="string" value="$(find ccf_immersive_sorting)/config/config_scene_st-table.json"/>
</node>
--
GitLab