Skip to content
Snippets Groups Projects
Commit 4e7a7cba authored by Christoph Jähne's avatar Christoph Jähne
Browse files

removed robot ips from combined control yaml, ips mandatory in launch

parent e96769e4
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,6 @@ robot_hardware: ...@@ -5,7 +5,6 @@ robot_hardware:
panda_1: panda_1:
type: franka_hw/FrankaCombinableHW type: franka_hw/FrankaCombinableHW
arm_id: panda_1 arm_id: panda_1
robot_ip: robot_1
joint_names: joint_names:
- panda_1_joint1 - panda_1_joint1
- panda_1_joint2 - panda_1_joint2
...@@ -38,7 +37,6 @@ panda_1: ...@@ -38,7 +37,6 @@ panda_1:
panda_2: panda_2:
type: franka_hw/FrankaCombinableHW type: franka_hw/FrankaCombinableHW
arm_id: panda_2 arm_id: panda_2
robot_ip: robot_2
joint_names: joint_names:
- panda_2_joint1 - panda_2_joint1
- panda_2_joint2 - panda_2_joint2
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<!-- Optional arg to manually configure the ips of all robots, overwriting ips that are configured in hw_config_file --> <!-- Optional arg to manually configure the ips of all robots, overwriting ips that are configured in hw_config_file -->
<!-- The ips must be set as dictionary like {<arm_id_1>/robot_ip: <my_ip_1>, <arm_id_2>/robot_ip: <my_ip_2>} --> <!-- The ips must be set as dictionary like {<arm_id_1>/robot_ip: <my_ip_1>, <arm_id_2>/robot_ip: <my_ip_2>} -->
<arg name="robot_ips" default="{}" /> <arg name="robot_ips" />
<!-- The config file containing the parameterization for all controllers to start with this launch file --> <!-- The config file containing the parameterization for all controllers to start with this launch file -->
<arg name="controllers_file" default="$(find franka_control)/config/default_combined_controllers.yaml" /> <arg name="controllers_file" default="$(find franka_control)/config/default_combined_controllers.yaml" />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment