From ce1fd8a677beb3a0bda263fb8c1f9504d6c67571 Mon Sep 17 00:00:00 2001 From: gavanderhoorn <g.a.vanderhoorn@tudelft.nl> Date: Mon, 2 Jan 2017 20:13:04 +0100 Subject: [PATCH] description: use '--inorder' to trigger use of jade+ xacro on Indigo. --- ur_description/launch/ur10_upload.launch | 4 ++-- ur_description/launch/ur3_upload.launch | 4 ++-- ur_description/launch/ur5_upload.launch | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ur_description/launch/ur10_upload.launch b/ur_description/launch/ur10_upload.launch index fbfdaaa..a96ee70 100644 --- a/ur_description/launch/ur10_upload.launch +++ b/ur_description/launch/ur10_upload.launch @@ -2,6 +2,6 @@ <launch> <arg name="limited" default="false"/> - <param unless="$(arg limited)" name="robot_description" command="$(find xacro)/xacro '$(find ur_description)/urdf/ur10_robot.urdf.xacro'" /> - <param if="$(arg limited)" name="robot_description" command="$(find xacro)/xacro '$(find ur_description)/urdf/ur10_joint_limited_robot.urdf.xacro'" /> + <param unless="$(arg limited)" name="robot_description" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/ur10_robot.urdf.xacro'" /> + <param if="$(arg limited)" name="robot_description" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/ur10_joint_limited_robot.urdf.xacro'" /> </launch> diff --git a/ur_description/launch/ur3_upload.launch b/ur_description/launch/ur3_upload.launch index bfbdfd6..eb04758 100644 --- a/ur_description/launch/ur3_upload.launch +++ b/ur_description/launch/ur3_upload.launch @@ -2,6 +2,6 @@ <launch> <arg name="limited" default="false"/> - <param unless="$(arg limited)" name="robot_description" command="$(find xacro)/xacro '$(find ur_description)/urdf/ur3_robot.urdf.xacro'" /> - <param if="$(arg limited)" name="robot_description" command="$(find xacro)/xacro '$(find ur_description)/urdf/ur3_joint_limited_robot.urdf.xacro'" /> + <param unless="$(arg limited)" name="robot_description" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/ur3_robot.urdf.xacro'" /> + <param if="$(arg limited)" name="robot_description" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/ur3_joint_limited_robot.urdf.xacro'" /> </launch> diff --git a/ur_description/launch/ur5_upload.launch b/ur_description/launch/ur5_upload.launch index 1089921..79f3310 100644 --- a/ur_description/launch/ur5_upload.launch +++ b/ur_description/launch/ur5_upload.launch @@ -2,6 +2,6 @@ <launch> <arg name="limited" default="false"/> - <param unless="$(arg limited)" name="robot_description" command="$(find xacro)/xacro '$(find ur_description)/urdf/ur5_robot.urdf.xacro'" /> - <param if="$(arg limited)" name="robot_description" command="$(find xacro)/xacro '$(find ur_description)/urdf/ur5_joint_limited_robot.urdf.xacro'" /> + <param unless="$(arg limited)" name="robot_description" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/ur5_robot.urdf.xacro'" /> + <param if="$(arg limited)" name="robot_description" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/ur5_joint_limited_robot.urdf.xacro'" /> </launch> -- GitLab