From 5ace313da8b8af4adb6652e324eca8986dba57bc Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Fri, 7 Oct 2022 16:06:38 +0200
Subject: [PATCH] update main controller launch files
---
.../main_controller_ceti-table-1_preview.launch | 3 ++-
.../main_controller_virtual_preview.launch | 3 ++-
...er_virtual_preview_ceti-table-1_real_robot.launch | 12 ------------
...er_virtual_preview_ceti-table-2_real_robot.launch | 12 ------------
4 files changed, 4 insertions(+), 26 deletions(-)
delete mode 100644 launch/distributed-sorting/main_controller_virtual_preview_ceti-table-1_real_robot.launch
delete mode 100644 launch/distributed-sorting/main_controller_virtual_preview_ceti-table-2_real_robot.launch
diff --git a/launch/distributed-sorting/main_controller_ceti-table-1_preview.launch b/launch/distributed-sorting/main_controller_ceti-table-1_preview.launch
index b27df83..23fbe93 100644
--- a/launch/distributed-sorting/main_controller_ceti-table-1_preview.launch
+++ b/launch/distributed-sorting/main_controller_ceti-table-1_preview.launch
@@ -2,12 +2,13 @@
<arg name="connection_address" default="tcp://*:6576" doc="connection address for NNG scene-based selection"/>
<arg name="mqtt_server" default="tcp://127.0.0.1:1883" doc="MQTT server for communication with client cells"/>
- <arg name="client_controllers" default="['ceti_cell_1', 'ceti_cell_2', 'ads-cell', 'st-cell']" doc="potential client cell names"/>
+ <arg name="client_controllers" default="['ceti_cell_1', 'ceti_cell_2', 'ads-cell', 'st-cell', 'ceti_cell_empty']" doc="potential client cell names"/>
<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="arm" type="string" value="arm"/>
<param name="scene" type="string" value="$(find ccf_immersive_sorting)/config/config_scene_ceti-table-1.json"/>
</node>
diff --git a/launch/distributed-sorting/main_controller_virtual_preview.launch b/launch/distributed-sorting/main_controller_virtual_preview.launch
index 81171aa..745dd77 100644
--- a/launch/distributed-sorting/main_controller_virtual_preview.launch
+++ b/launch/distributed-sorting/main_controller_virtual_preview.launch
@@ -2,12 +2,13 @@
<arg name="connection_address" default="tcp://*:6576" doc="connection address for NNG scene-based selection"/>
<arg name="mqtt_server" default="tcp://127.0.0.1:1883" doc="MQTT server for communication with client cells"/>
- <arg name="client_controllers" default="['ceti_cell_1', 'ceti_cell_2', 'ads-cell', 'st-cell']" doc="potential client cell names"/>
+ <arg name="client_controllers" default="['ceti_cell_1', 'ceti_cell_2', 'ads-cell', 'st-cell', 'ceti_cell_empty']" doc="potential client cell names"/>
<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="arm" type="string" value="arm"/>
<param name="scene" type="string" value="$(find ccf_immersive_sorting)/config/config_scene_virtual-table.json"/>
</node>
diff --git a/launch/distributed-sorting/main_controller_virtual_preview_ceti-table-1_real_robot.launch b/launch/distributed-sorting/main_controller_virtual_preview_ceti-table-1_real_robot.launch
deleted file mode 100644
index 4690e77..0000000
--- a/launch/distributed-sorting/main_controller_virtual_preview_ceti-table-1_real_robot.launch
+++ /dev/null
@@ -1,12 +0,0 @@
-<launch>
-
- <arg name="connection_address" default="tcp://*:6576" doc="connection address for NNG scene-based selection"/>
- <arg name="mqtt_server" default="tcp://127.0.0.1:1883" doc="MQTT server for communication with client cells"/>
- <arg name="client_controllers" default="['ceti_cell_1', 'ceti_cell_2', 'ads-cell', 'st-cell']" doc="potential client cell names"/>
- <arg name="robot_ip" default="172.31.1.13" doc="robot IP used by the robot controller"/>
-
- <include file="$(find ccf_immersive_sorting)/launch/main_controller_virtual_preview.launch" pass_all_args="true"/>
-
- <include file="$(find ccf_immersive_sorting)/launch/robot-cell_ceti-table-1.launch" pass_all_args="true"/>
-
-</launch>
diff --git a/launch/distributed-sorting/main_controller_virtual_preview_ceti-table-2_real_robot.launch b/launch/distributed-sorting/main_controller_virtual_preview_ceti-table-2_real_robot.launch
deleted file mode 100644
index 05057aa..0000000
--- a/launch/distributed-sorting/main_controller_virtual_preview_ceti-table-2_real_robot.launch
+++ /dev/null
@@ -1,12 +0,0 @@
-<launch>
-
- <arg name="connection_address" default="tcp://*:6576" doc="connection address for NNG scene-based selection"/>
- <arg name="mqtt_server" default="tcp://127.0.0.1:1883" doc="MQTT server for communication with client cells"/>
- <arg name="client_controllers" default="['ceti_cell_1', 'ceti_cell_2', 'ads-cell', 'st-cell']" doc="potential client cell names"/>
- <arg name="robot_ip" default="172.31.1.13" doc="robot IP used by the robot controller"/>
-
- <include file="$(find ccf_immersive_sorting)/launch/main_controller_virtual_preview.launch" pass_all_args="true"/>
-
- <include file="$(find ccf_immersive_sorting)/launch/robot-cell_ceti-table-2.launch" pass_all_args="true"/>
-
-</launch>
--
GitLab