From: Gabriel Schmitz Date: Tue, 15 Jan 2019 07:58:32 +0000 (-0200) Subject: Alterações em miitzhand_bringup. X-Git-Tag: sbai2019submitted~26 X-Git-Url: http://git.ece.ufrgs.br/?a=commitdiff_plain;h=7038f768d495a6e9ddd0c0cff012b4dd06070e06;p=users%2Fgschmitz%2Fmiitzhand.git Alterações em miitzhand_bringup. --- diff --git a/miitzhand_description/CMakeLists.txt b/miitzhand_description/CMakeLists.txt index 48b5c00..6192161 100644 --- a/miitzhand_description/CMakeLists.txt +++ b/miitzhand_description/CMakeLists.txt @@ -11,8 +11,8 @@ find_package(catkin REQUIRED COMPONENTS urdf rviz ) -find_package(t2f_ros) -find_package(robot_state_controller) +find_package(tf2_ros) +find_package(robot_state_publisher) ## System dependencies are found with CMake's conventions @@ -106,7 +106,7 @@ find_package(robot_state_controller) ## DEPENDS: system dependencies of this project that dependent projects also need catkin_package( LIBRARIES ${PROJECT_NAME} - CATKIN_DEPENDS urdf t2f_ros rviz robot_state_controller + CATKIN_DEPENDS urdf tf2_ros rviz robot_state_publisher # INCLUDE_DIRS include # LIBRARIES gabrielquanser_controllers # CATKIN_DEPENDS roscpp rospy diff --git a/miitzhand_description/meshes/base_link.STL b/miitzhand_description/meshes/base_link.stl similarity index 100% rename from miitzhand_description/meshes/base_link.STL rename to miitzhand_description/meshes/base_link.stl diff --git a/miitzhand_description/meshes/index_l1.STL b/miitzhand_description/meshes/index_l1.stl similarity index 100% rename from miitzhand_description/meshes/index_l1.STL rename to miitzhand_description/meshes/index_l1.stl diff --git a/miitzhand_description/meshes/index_l2.STL b/miitzhand_description/meshes/index_l2.stl similarity index 100% rename from miitzhand_description/meshes/index_l2.STL rename to miitzhand_description/meshes/index_l2.stl diff --git a/miitzhand_description/meshes/index_l3.STL b/miitzhand_description/meshes/index_l3.stl similarity index 100% rename from miitzhand_description/meshes/index_l3.STL rename to miitzhand_description/meshes/index_l3.stl diff --git a/miitzhand_description/meshes/little_l1.STL b/miitzhand_description/meshes/little_l1.stl similarity index 100% rename from miitzhand_description/meshes/little_l1.STL rename to miitzhand_description/meshes/little_l1.stl diff --git a/miitzhand_description/meshes/little_l2.STL b/miitzhand_description/meshes/little_l2.stl similarity index 100% rename from miitzhand_description/meshes/little_l2.STL rename to miitzhand_description/meshes/little_l2.stl diff --git a/miitzhand_description/meshes/little_l3.STL b/miitzhand_description/meshes/little_l3.stl similarity index 100% rename from miitzhand_description/meshes/little_l3.STL rename to miitzhand_description/meshes/little_l3.stl diff --git a/miitzhand_description/meshes/middle_l1.STL b/miitzhand_description/meshes/middle_l1.stl similarity index 100% rename from miitzhand_description/meshes/middle_l1.STL rename to miitzhand_description/meshes/middle_l1.stl diff --git a/miitzhand_description/meshes/middle_l2.STL b/miitzhand_description/meshes/middle_l2.stl similarity index 100% rename from miitzhand_description/meshes/middle_l2.STL rename to miitzhand_description/meshes/middle_l2.stl diff --git a/miitzhand_description/meshes/middle_l3.STL b/miitzhand_description/meshes/middle_l3.stl similarity index 100% rename from miitzhand_description/meshes/middle_l3.STL rename to miitzhand_description/meshes/middle_l3.stl diff --git a/miitzhand_description/meshes/ring_l1.STL b/miitzhand_description/meshes/ring_l1.stl similarity index 100% rename from miitzhand_description/meshes/ring_l1.STL rename to miitzhand_description/meshes/ring_l1.stl diff --git a/miitzhand_description/meshes/ring_l2.STL b/miitzhand_description/meshes/ring_l2.stl similarity index 100% rename from miitzhand_description/meshes/ring_l2.STL rename to miitzhand_description/meshes/ring_l2.stl diff --git a/miitzhand_description/meshes/ring_l3.STL b/miitzhand_description/meshes/ring_l3.stl similarity index 100% rename from miitzhand_description/meshes/ring_l3.STL rename to miitzhand_description/meshes/ring_l3.stl diff --git a/miitzhand_description/meshes/thumb_l1.STL b/miitzhand_description/meshes/thumb_l1.stl similarity index 100% rename from miitzhand_description/meshes/thumb_l1.STL rename to miitzhand_description/meshes/thumb_l1.stl diff --git a/miitzhand_description/meshes/thumb_l2.STL b/miitzhand_description/meshes/thumb_l2.stl similarity index 100% rename from miitzhand_description/meshes/thumb_l2.STL rename to miitzhand_description/meshes/thumb_l2.stl diff --git a/miitzhand_description/meshes/thumb_l3.STL b/miitzhand_description/meshes/thumb_l3.stl similarity index 100% rename from miitzhand_description/meshes/thumb_l3.STL rename to miitzhand_description/meshes/thumb_l3.stl diff --git a/miitzhand_description/package.xml b/miitzhand_description/package.xml index 891397d..a6699b5 100644 --- a/miitzhand_description/package.xml +++ b/miitzhand_description/package.xml @@ -19,14 +19,14 @@ catkin urdf - robot_state_controller - t2f_ros + robot_state_publisher + tf2_ros rviz urdf - robot_state_controller + robot_state_publisher joint_state_controller - t2f_ros + tf2_ros rviz diff --git a/miitzhand_description/urdf/miitzhand.urdf b/miitzhand_description/urdf/miitzhand.urdf index feee073..ec517ae 100644 --- a/miitzhand_description/urdf/miitzhand.urdf +++ b/miitzhand_description/urdf/miitzhand.urdf @@ -30,7 +30,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/base_link.stl" /> @@ -44,7 +44,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/base_link.stl" /> @@ -74,7 +74,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/little_l1.stl" /> @@ -88,7 +88,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/little_l1.stl" /> @@ -132,7 +132,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/little_l2.stl" /> @@ -146,7 +146,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/little_l2.stl" /> @@ -191,7 +191,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/little_l3.stl" /> @@ -205,7 +205,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/little_l3.stl" /> @@ -250,7 +250,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/ring_l1.stl" /> @@ -264,7 +264,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/ring_l1.stl" /> @@ -308,7 +308,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/ring_l2.stl" /> @@ -322,7 +322,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/ring_l2.stl" /> @@ -367,7 +367,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/ring_l3.stl" /> @@ -381,7 +381,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/ring_l3.stl" /> @@ -426,7 +426,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/middle_l1.stl" /> @@ -440,7 +440,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/middle_l1.stl" /> @@ -484,7 +484,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/middle_l2.stl" /> @@ -498,7 +498,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/middle_l2.stl" /> @@ -543,7 +543,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/middle_l3.stl" /> @@ -557,7 +557,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/middle_l3.stl" /> @@ -602,7 +602,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/index_l1.stl" /> @@ -616,7 +616,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/index_l1.stl" /> @@ -660,7 +660,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/index_l2.stl" /> @@ -674,7 +674,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/index_l2.stl" /> @@ -719,7 +719,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/index_l3.stl" /> @@ -733,7 +733,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/index_l3.stl" /> @@ -778,7 +778,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/thumb_l1.stl" /> @@ -792,7 +792,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/thumb_l1.stl" /> @@ -836,7 +836,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/thumb_l2.stl" /> @@ -850,7 +850,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/thumb_l2.stl" /> @@ -894,7 +894,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/thumb_l3.stl" /> @@ -908,7 +908,7 @@ rpy="0 0 0" /> + filename="package://miitzhand_description/meshes/thumb_l3.stl" />