Commit a37ef3b0 authored by Rohan Budhiraja's avatar Rohan Budhiraja
Browse files

change mesh requirement in urdf from talos_description to talos-data.

TODO: add package.xml file.
parent 415d3be1
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Changelog for package talos_description
Changelog for package talos-data
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
0.0.13 (2016-11-15)
......
roslaunch talos_description upload_legs.launch
roslaunch talos-data upload_legs.launch
rosrun joint_state_publisher joint_state_publisher _use_gui:=True
......
......@@ -13,8 +13,8 @@
xmlns:controller="http://playerstage.sourceforge.net/gazebo/xmlschema/#controller"
xmlns:interface="http://playerstage.sourceforge.net/gazebo/xmlschema/#interface">
<xacro:include filename="$(find talos_description)/urdf/arm/arm.urdf.xacro" />
<xacro:include filename="$(find talos_description)/urdf/gripper/gripper.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/arm/arm.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/gripper/gripper.urdf.xacro" />
<link name="talos_2_link">
<inertial>
......@@ -28,7 +28,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="package://talos_description/meshes/talos/talos_2.STL" scale="1 1 1"/>
<mesh filename="package://talos-data/meshes/talos/talos_2.STL" scale="1 1 1"/>
</geometry>
<material name="LightGrey" />
</visual>
......@@ -36,7 +36,7 @@
<collision>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="package://talos_description/meshes/talos/talos_2_collision.STL" scale="1 1 1"/>
<mesh filename="package://talos-data/meshes/talos/talos_2_collision.STL" scale="1 1 1"/>
</geometry>
</collision>
</link>
......@@ -48,8 +48,8 @@
<xacro:talos_gripper name="right_gripper" parent="arm_right_7_link"/>
<!-- Generic simulatalos_gazebo plugins -->
<xacro:include filename="$(find talos_description)/gazebo/gazebo.urdf.xacro" />
<xacro:include filename="$(find talos-data)/gazebo/gazebo.urdf.xacro" />
<!-- Materials for visualization -->
<xacro:include filename="$(find talos_description)/urdf/materials.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/materials.urdf.xacro" />
</robot>
This diff is collapsed.
......@@ -13,12 +13,12 @@
xmlns:controller="http://playerstage.sourceforge.net/gazebo/xmlschema/#controller"
xmlns:interface="http://playerstage.sourceforge.net/gazebo/xmlschema/#interface">
<xacro:include filename="$(find talos_description)/urdf/torso/torso.urdf.xacro" />
<xacro:include filename="$(find talos_description)/urdf/head/head.urdf.xacro" />
<xacro:include filename="$(find talos_description)/urdf/arm/arm.urdf.xacro" />
<xacro:include filename="$(find talos_description)/urdf/sensors/ftsensor.urdf.xacro" />
<xacro:include filename="$(find talos_description)/urdf/gripper/gripper.urdf.xacro" />
<xacro:include filename="$(find talos_description)/urdf/leg/leg.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/torso/torso.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/head/head.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/arm/arm.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/sensors/ftsensor.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/gripper/gripper.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/leg/leg.urdf.xacro" />
<xacro:talos_torso name="torso" />
......@@ -37,8 +37,8 @@
<xacro:talos_leg prefix="right" reflect="-1" />
<!-- Generic simulatalos_gazebo plugins -->
<xacro:include filename="$(find talos_description)/gazebo/gazebo.urdf.xacro" />
<xacro:include filename="$(find talos-data)/gazebo/gazebo.urdf.xacro" />
<!-- Materials for visualization -->
<xacro:include filename="$(find talos_description)/urdf/materials.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/materials.urdf.xacro" />
</robot>
This diff is collapsed.
......@@ -13,11 +13,11 @@
xmlns:controller="http://playerstage.sourceforge.net/gazebo/xmlschema/#controller"
xmlns:interface="http://playerstage.sourceforge.net/gazebo/xmlschema/#interface">
<xacro:include filename="$(find talos_description)/urdf/torso/torso.urdf.xacro" />
<xacro:include filename="$(find talos_description)/urdf/head/head.urdf.xacro" />
<xacro:include filename="$(find talos_description)/urdf/arm/arm.urdf.xacro" />
<xacro:include filename="$(find talos_description)/urdf/sensors/ftsensor.urdf.xacro" />
<xacro:include filename="$(find talos_description)/urdf/leg/leg.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/torso/torso.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/head/head.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/arm/arm.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/sensors/ftsensor.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/leg/leg.urdf.xacro" />
<xacro:talos_torso name="torso" />
......@@ -33,8 +33,8 @@
<xacro:talos_leg prefix="right" reflect="-1" />
<!-- Generic simulatalos_gazebo plugins -->
<xacro:include filename="$(find talos_description)/gazebo/gazebo.urdf.xacro" />
<xacro:include filename="$(find talos-data)/gazebo/gazebo.urdf.xacro" />
<!-- Materials for visualization -->
<xacro:include filename="$(find talos_description)/urdf/materials.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/materials.urdf.xacro" />
</robot>
......@@ -13,12 +13,12 @@
xmlns:controller="http://playerstage.sourceforge.net/gazebo/xmlschema/#controller"
xmlns:interface="http://playerstage.sourceforge.net/gazebo/xmlschema/#interface">
<xacro:include filename="$(find talos_description)/urdf/torso/torso.urdf.xacro" />
<xacro:include filename="$(find talos_description)/urdf/head/head.urdf.xacro" />
<xacro:include filename="$(find talos_description)/urdf/arm/arm.urdf.xacro" />
<xacro:include filename="$(find talos_description)/urdf/sensors/ftsensor.urdf.xacro" />
<xacro:include filename="$(find talos_description)/urdf/gripper/gripper.urdf.xacro" />
<xacro:include filename="$(find talos_description)/urdf/leg/leg.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/torso/torso.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/head/head.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/arm/arm.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/sensors/ftsensor.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/gripper/gripper.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/leg/leg.urdf.xacro" />
<xacro:talos_torso name="torso" />
......@@ -32,8 +32,8 @@
<xacro:talos_leg prefix="right" reflect="-1" />
<!-- Generic simulatalos_gazebo plugins -->
<xacro:include filename="$(find talos_description)/gazebo/gazebo.urdf.xacro" />
<xacro:include filename="$(find talos-data)/gazebo/gazebo.urdf.xacro" />
<!-- Materials for visualization -->
<xacro:include filename="$(find talos_description)/urdf/materials.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/materials.urdf.xacro" />
</robot>
......@@ -13,17 +13,17 @@
xmlns:controller="http://playerstage.sourceforge.net/gazebo/xmlschema/#controller"
xmlns:interface="http://playerstage.sourceforge.net/gazebo/xmlschema/#interface">
<xacro:include filename="$(find talos_description)/urdf/gripper/gripper.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/gripper/gripper.urdf.xacro" />
<xacro:include filename="$(find talos_description)/urdf/torso/torso.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/torso/torso.urdf.xacro" />
<xacro:talos_torso name="torso" />
<xacro:talos_gripper name="gripper" parent="torso_2_link"/>
<!-- Generic simulatalos_gazebo plugins -->
<xacro:include filename="$(find talos_description)/gazebo/gazebo.urdf.xacro" />
<xacro:include filename="$(find talos-data)/gazebo/gazebo.urdf.xacro" />
<!-- Materials for visualization -->
<xacro:include filename="$(find talos_description)/urdf/materials.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/materials.urdf.xacro" />
</robot>
......@@ -13,7 +13,7 @@
xmlns:controller="http://playerstage.sourceforge.net/gazebo/xmlschema/#controller"
xmlns:interface="http://playerstage.sourceforge.net/gazebo/xmlschema/#interface">
<xacro:include filename="$(find talos_description)/urdf/head/head.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/head/head.urdf.xacro" />
<link name="talos_2_link">
<inertial>
......@@ -27,7 +27,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="package://talos_description/meshes/talos/talos_2.STL" scale="1 1 1"/>
<mesh filename="package://talos-data/meshes/talos/talos_2.STL" scale="1 1 1"/>
</geometry>
<material name="LightGrey" />
</visual>
......@@ -35,7 +35,7 @@
<collision>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="package://talos_description/meshes/talos/talos_2_collision.STL" scale="1 1 1"/>
<mesh filename="package://talos-data/meshes/talos/talos_2_collision.STL" scale="1 1 1"/>
</geometry>
</collision>
</link>
......@@ -43,8 +43,8 @@
<xacro:talos_head name="head" parent="talos_2_link"/>
<!-- Generic simulatalos_gazebo plugins -->
<xacro:include filename="$(find talos_description)/gazebo/gazebo.urdf.xacro" />
<xacro:include filename="$(find talos-data)/gazebo/gazebo.urdf.xacro" />
<!-- Materials for visualization -->
<xacro:include filename="$(find talos_description)/urdf/materials.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/materials.urdf.xacro" />
</robot>
......@@ -13,7 +13,7 @@
xmlns:controller="http://playerstage.sourceforge.net/gazebo/xmlschema/#controller"
xmlns:interface="http://playerstage.sourceforge.net/gazebo/xmlschema/#interface">
<xacro:include filename="$(find talos_description)/urdf/leg/leg.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/leg/leg.urdf.xacro" />
<link name="base_link">
<inertial>
<origin xyz="-0.08222 0.00838 -0.07261" rpy="0.00000 0.00000 0.00000"/>
......@@ -26,7 +26,7 @@
<visual>
<origin rpy="0 0 0" xyz="0 0 0"/>
<geometry>
<mesh filename="package://talos_description/meshes/talos/base_link.STL" scale="1 1 1"/>
<mesh filename="package://talos-data/meshes/talos/base_link.STL" scale="1 1 1"/>
</geometry>
<material name="DarkGrey" />
</visual>
......@@ -34,7 +34,7 @@
<collision>
<origin rpy="0 0 0" xyz="0 0 0"/>
<geometry>
<mesh filename="package://talos_description/meshes/talos/base_link_collision.STL" scale="1 1 1"/>
<mesh filename="package://talos-data/meshes/talos/base_link_collision.STL" scale="1 1 1"/>
</geometry>
</collision>
</link>
......@@ -44,8 +44,8 @@
<xacro:talos_leg prefix="right" reflect="-1" />
<!-- Generic simulatalos_gazebo plugins -->
<xacro:include filename="$(find talos_description)/gazebo/gazebo.urdf.xacro" />
<xacro:include filename="$(find talos-data)/gazebo/gazebo.urdf.xacro" />
<!-- Materials for visualization -->
<xacro:include filename="$(find talos_description)/urdf/materials.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/materials.urdf.xacro" />
</robot>
......@@ -13,12 +13,12 @@
xmlns:controller="http://playerstage.sourceforge.net/gazebo/xmlschema/#controller"
xmlns:interface="http://playerstage.sourceforge.net/gazebo/xmlschema/#interface">
<xacro:include filename="$(find talos_description)/urdf/torso/torso.urdf.xacro" />
<xacro:include filename="$(find talos_description)/urdf/head/head.urdf.xacro" />
<xacro:include filename="$(find talos_description)/urdf/arm/arm.urdf.xacro" />
<xacro:include filename="$(find talos_description)/urdf/sensors/ftsensor.urdf.xacro" />
<xacro:include filename="$(find talos_description)/urdf/gripper/gripper.urdf.xacro" />
<xacro:include filename="$(find talos_description)/urdf/leg/leg.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/torso/torso.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/head/head.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/arm/arm.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/sensors/ftsensor.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/gripper/gripper.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/leg/leg.urdf.xacro" />
<xacro:talos_torso name="torso" />
......@@ -28,8 +28,8 @@
<xacro:talos_leg prefix="right" reflect="-1" />
<!-- Generic simulatalos_gazebo plugins -->
<xacro:include filename="$(find talos_description)/gazebo/gazebo.urdf.xacro" />
<xacro:include filename="$(find talos-data)/gazebo/gazebo.urdf.xacro" />
<!-- Materials for visualization -->
<xacro:include filename="$(find talos_description)/urdf/materials.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/materials.urdf.xacro" />
</robot>
This diff is collapsed.
......@@ -13,12 +13,12 @@
xmlns:controller="http://playerstage.sourceforge.net/gazebo/xmlschema/#controller"
xmlns:interface="http://playerstage.sourceforge.net/gazebo/xmlschema/#interface">
<xacro:include filename="$(find talos_description)/urdf/torso/torso.urdf.xacro" />
<xacro:include filename="$(find talos_description)/urdf/head/head.urdf.xacro" />
<xacro:include filename="$(find talos_description)/urdf/arm/arm.urdf.xacro" />
<xacro:include filename="$(find talos_description)/urdf/sensors/ftsensor.urdf.xacro" />
<!-- <xacro:include filename="$(find talos_description)/urdf/gripper/gripper.urdf.xacro" /> -->
<xacro:include filename="$(find talos_description)/urdf/leg/leg.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/torso/torso.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/head/head.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/arm/arm.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/sensors/ftsensor.urdf.xacro" />
<!-- <xacro:include filename="$(find talos-data)/urdf/gripper/gripper.urdf.xacro" /> -->
<xacro:include filename="$(find talos-data)/urdf/leg/leg.urdf.xacro" />
<xacro:talos_torso name="torso" />
......@@ -38,8 +38,8 @@
<xacro:talos_leg prefix="right" reflect="-1" />
<!-- Generic simulatalos_gazebo plugins -->
<xacro:include filename="$(find talos_description)/gazebo/gazebo.urdf.xacro" />
<xacro:include filename="$(find talos-data)/gazebo/gazebo.urdf.xacro" />
<!-- Materials for visualization -->
<xacro:include filename="$(find talos_description)/urdf/materials.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/materials.urdf.xacro" />
</robot>
......@@ -13,13 +13,13 @@
xmlns:controller="http://playerstage.sourceforge.net/gazebo/xmlschema/#controller"
xmlns:interface="http://playerstage.sourceforge.net/gazebo/xmlschema/#interface">
<xacro:include filename="$(find talos_description)/urdf/torso/torso.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/torso/torso.urdf.xacro" />
<xacro:talos_torso name="torso" />
<!-- Generic simulatalos_gazebo plugins -->
<xacro:include filename="$(find talos_description)/gazebo/gazebo.urdf.xacro" />
<xacro:include filename="$(find talos-data)/gazebo/gazebo.urdf.xacro" />
<!-- Materials for visualization -->
<xacro:include filename="$(find talos_description)/urdf/materials.urdf.xacro" />
<xacro:include filename="$(find talos-data)/urdf/materials.urdf.xacro" />
</robot>
<launch>
<!-- Robot description -->
<param name="robot_description" command="$(find xacro)/xacro.py '$(find talos_description)/robots/talos_arm.urdf.xacro'" />
<param name="robot_description" command="$(find xacro)/xacro.py '$(find talos-data)/robots/talos_arm.urdf.xacro'" />
</launch>
<launch>
<!-- Robot description -->
<param name="robot_description" command="$(find xacro)/xacro.py '$(find talos_description)/robots/talos_gripper.urdf.xacro'" />
<param name="robot_description" command="$(find xacro)/xacro.py '$(find talos-data)/robots/talos_gripper.urdf.xacro'" />
</launch>
<launch>
<!-- Robot description -->
<param name="robot_description" command="$(find xacro)/xacro.py '$(find talos_description)/robots/talos_head.urdf.xacro'" />
<param name="robot_description" command="$(find xacro)/xacro.py '$(find talos-data)/robots/talos_head.urdf.xacro'" />
</launch>
<launch>
<!-- Robot description -->
<param name="robot_description" command="$(find xacro)/xacro.py '$(find talos_description)/robots/talos_lower_body.urdf.xacro'" />
<param name="robot_description" command="$(find xacro)/xacro.py '$(find talos-data)/robots/talos_lower_body.urdf.xacro'" />
</launch>
......@@ -3,6 +3,6 @@
<arg name="robot" default="full"/>
<!-- Robot description -->
<param name="robot_description" command="$(find xacro)/xacro.py '$(find talos_description)/robots/talos_$(arg robot).urdf.xacro'" />
<param name="robot_description" command="$(find xacro)/xacro.py '$(find talos-data)/robots/talos_$(arg robot).urdf.xacro'" />
</launch>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment