diff --git a/franka_control/config/franka_combined_control_node.yaml b/franka_control/config/franka_combined_control_node.yaml index 9ca2df8e56ee6de6c6868c7392a6cccd24aa4415..fa103fabc97615ed6f0e37f686e53ba7cdc3d338 100644 --- a/franka_control/config/franka_combined_control_node.yaml +++ b/franka_control/config/franka_combined_control_node.yaml @@ -5,7 +5,6 @@ robot_hardware: panda_1: type: franka_hw/FrankaCombinableHW arm_id: panda_1 - robot_ip: robot_1 joint_names: - panda_1_joint1 - panda_1_joint2 @@ -38,7 +37,6 @@ panda_1: panda_2: type: franka_hw/FrankaCombinableHW arm_id: panda_2 - robot_ip: robot_2 joint_names: - panda_2_joint1 - panda_2_joint2 diff --git a/franka_control/launch/franka_combined_control.launch b/franka_control/launch/franka_combined_control.launch index 12ff4f476d66790cb6c71c95c603525ebdeeeddd..bfdf67336a144b64800d5c199443eb3282dba7a0 100644 --- a/franka_control/launch/franka_combined_control.launch +++ b/franka_control/launch/franka_combined_control.launch @@ -17,7 +17,7 @@ <!-- 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>} --> - <arg name="robot_ips" default="{}" /> + <arg name="robot_ips" /> <!-- 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" />