Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace xacro.py to xacro --inorder #70

Closed
wants to merge 1 commit into from
Closed

Replace xacro.py to xacro --inorder #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mantis/mantis_config/launch/mantis_sia20d_automated_pick_place_setup.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<!-- fixed parameters -->
<arg name="arm_namespace" value="sia20d_arm"/>
<arg name="robot_description" value="$(find xacro)/xacro.py '$(find mantis_config)/urdf/mantis_sia20d_arm_workspace.xacro'"/>
<arg name="robot_description" value="$(find xacro)/xacro --inorder '$(find mantis_config)/urdf/mantis_sia20d_arm_workspace.xacro'"/>
<arg name="sensor_name" value="$(arg arm_namespace)_kinect"/>

<!-- launching environment configuration -->
Expand Down
2 changes: 1 addition & 1 deletion mantis/mantis_config/launch/mantis_sia20d_automated_setup_no_sensor.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<!-- fixed parameters -->
<arg name="arm_namespace" value="sia20d_arm"/>
<arg name="robot_description" value="$(find xacro)/xacro.py '$(find mantis_config)/urdf/mantis_sia20d_arm_workspace.xacro'"/>
<arg name="robot_description" value="$(find xacro)/xacro --inorder '$(find mantis_config)/urdf/mantis_sia20d_arm_workspace.xacro'"/>
<arg name="sensor_name" value="$(arg arm_namespace)_kinect"/>

<!-- launching environment configuration -->
Expand Down
2 changes: 1 addition & 1 deletion mantis/mantis_config/launch/mantis_sia20d_gripper_bringup.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<arg name="launch_io" default="false"/>

<!-- ____________________________ Fixed Parameters ____________________________ -->
<arg name="robot_description" value="$(find xacro)/xacro.py '$(find mantis_config)/urdf/mantis_sia20d_arm_workspace.xacro'"/>
<arg name="robot_description" value="$(find xacro)/xacro --inorder '$(find mantis_config)/urdf/mantis_sia20d_arm_workspace.xacro'"/>
<arg name="arm_namespace" value="sia20d_arm"/>

<!-- starting io -->
Expand Down
2 changes: 1 addition & 1 deletion mantis/mantis_config/launch/mantis_sia20d_sort_clutter_setup.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<!-- fixed parameters -->
<arg name="arm_namespace" value="sia20d_arm"/>
<arg name="robot_description" value="$(find xacro)/xacro.py '$(find mantis_config)/urdf/mantis_sia20d_arm_workspace.xacro'"/>
<arg name="robot_description" value="$(find xacro)/xacro --inorder '$(find mantis_config)/urdf/mantis_sia20d_arm_workspace.xacro'"/>
<arg name="sensor_name" value="$(arg arm_namespace)_kinect"/>

<!-- launch bringup -->
Expand Down
2 changes: 1 addition & 1 deletion mantis/mantis_config/launch/mantis_sia20d_sphere_picking_setup.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<!-- fixed parameters -->
<arg name="arm_namespace" value="sia20d_arm"/>
<arg name="robot_description" value="$(find xacro)/xacro.py '$(find mantis_config)/urdf/mantis_sia20d_arm_workspace.xacro'"/>
<arg name="robot_description" value="$(find xacro)/xacro --inorder '$(find mantis_config)/urdf/mantis_sia20d_arm_workspace.xacro'"/>
<arg name="sensor_name" value="$(arg arm_namespace)_kinect"/>

<!-- launching environment configuration -->
Expand Down
2 changes: 1 addition & 1 deletion mantis/mantis_config/launch/mantis_ur5_automated_pick_place_setup.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<!-- fixed parameters -->
<arg name="arm_namespace" value="ur5_arm"/>
<arg name="robot_description" value="$(find xacro)/xacro.py '$(find mantis_config)/urdf/mantis_ur5_arm_workspace.xacro'"/>
<arg name="robot_description" value="$(find xacro)/xacro --inorder '$(find mantis_config)/urdf/mantis_ur5_arm_workspace.xacro'"/>
<arg name="sensor_name" value="$(arg arm_namespace)_kinect"/>

<!-- launching environment configuration -->
Expand Down
2 changes: 1 addition & 1 deletion mantis/mantis_config/launch/mantis_ur5_automated_setup_no_sensor.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<!-- fixed parameters -->
<arg name="arm_namespace" value="ur5_arm"/>
<arg name="robot_description" value="$(find xacro)/xacro.py '$(find mantis_config)/urdf/mantis_ur5_arm_workspace.xacro'"/>
<arg name="robot_description" value="$(find xacro)/xacro --inorder '$(find mantis_config)/urdf/mantis_ur5_arm_workspace.xacro'"/>
<arg name="sensor_name" value="$(arg arm_namespace)_kinect"/>

<!-- launching environment configuration -->
Expand Down
2 changes: 1 addition & 1 deletion mantis/mantis_config/launch/mantis_ur5_gripper_bringup.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<!-- ____________________________ Fixed Parameters ____________________________ -->
<arg name="robot_description"
default="$(find xacro)/xacro.py '$(find mantis_config)/urdf/mantis_ur5_arm_workspace.xacro'"/>
default="$(find xacro)/xacro --inorder '$(find mantis_config)/urdf/mantis_ur5_arm_workspace.xacro'"/>

<arg name="arm_namespace" value="ur5_arm"/>

Expand Down
2 changes: 1 addition & 1 deletion mantis/mantis_config/launch/mantis_ur5_sort_clutter_setup.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<!-- fixed parameters -->
<arg name="arm_namespace" value="ur5_arm"/>
<arg name="robot_description" value="$(find xacro)/xacro.py '$(find mantis_config)/urdf/mantis_ur5_arm_workspace.xacro'"/>
<arg name="robot_description" value="$(find xacro)/xacro --inorder '$(find mantis_config)/urdf/mantis_ur5_arm_workspace.xacro'"/>
<arg name="sensor_name" value="$(arg arm_namespace)_kinect"/>

<!-- launching bringup -->
Expand Down
2 changes: 1 addition & 1 deletion mantis/mantis_config/launch/mantis_ur5_sphere_picking_setup.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<!-- fixed parameters -->
<arg name="arm_namespace" value="ur5_arm"/>
<arg name="robot_description" value="$(find xacro)/xacro.py '$(find mantis_config)/urdf/mantis_ur5_arm_workspace.xacro'"/>
<arg name="robot_description" value="$(find xacro)/xacro --inorder '$(find mantis_config)/urdf/mantis_ur5_arm_workspace.xacro'"/>
<arg name="sensor_name" value="$(arg arm_namespace)_kinect"/>

<!-- launching environment configuration -->
Expand Down
2 changes: 1 addition & 1 deletion mantis/mantis_perception/launch/cph_rec.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<!-- fixed parameters -->
<arg name="arm_namespace" value="ur5_arm"/>
<arg name="robot_description" value="$(find xacro)/xacro.py '$(find mantis_config)/urdf/mantis_ur5_arm_workspace.xacro'"/>
<arg name="robot_description" value="$(find xacro)/xacro --inorder '$(find mantis_config)/urdf/mantis_ur5_arm_workspace.xacro'"/>
<arg name="sensor_name" value="$(arg arm_namespace)_kinect"/>

<!-- launch bringup -->
Expand Down
4 changes: 2 additions & 2 deletions mantis/mantis_perception/launch/mantis_record_sensor_session.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<!--arm 1 state pub-->
<group ns="$(arg arm1_namespace)">
<param name="robot_description" command="$(find xacro)/xacro.py '$(find mantis_config)/urdf/mantis_ur5_arm_workspace.xacro'"/>
<param name="robot_description" command="$(find xacro)/xacro --inorder '$(find mantis_config)/urdf/mantis_ur5_arm_workspace.xacro'"/>
<node pkg="robot_state_publisher" name="st_pub" type="state_publisher"/>
</group>

Expand All @@ -29,7 +29,7 @@

<!--arm 2 state pub-->
<group ns="$(arg arm2_namespace)">
<param name="robot_description" command="$(find xacro)/xacro.py '$(find mantis_config)/urdf/mantis_sia20d_arm_workspace.xacro'"/>
<param name="robot_description" command="$(find xacro)/xacro --inorder '$(find mantis_config)/urdf/mantis_sia20d_arm_workspace.xacro'"/>
<node pkg="robot_state_publisher" name="st_pub" type="state_publisher"/>
</group>

Expand Down
2 changes: 1 addition & 1 deletion swri_demos/armadillo/launch/upload.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<arg name="calibrated" default="true" />

<group unless="$(arg calibrated)">
<param name="robot_description" command="$(find xacro)/xacro.py '$(find armadillo)/cfg/armadillo.xacro'" />
<param name="robot_description" command="$(find xacro)/xacro --inorder '$(find armadillo)/cfg/armadillo.xacro'" />
</group>

<group if="$(arg calibrated)">
Expand Down