Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ if(BUILD_TESTING)
ament_lint_auto_find_test_dependencies()
endif()

foreach(asset_dir assets docs launch rviz scripts)
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${asset_dir}")
install(DIRECTORY ${asset_dir} DESTINATION share/${PROJECT_NAME})
foreach(install_dir assets launch rviz scripts)
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${install_dir}")
install(DIRECTORY ${install_dir} DESTINATION share/${PROJECT_NAME})
endif()
endforeach()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ link2:
pitch: -0
yaw: 0
geometry:
mesh: "package://openarm_description/assets/end_effector/pinch_gripper/meshes/collision/finger_outter.stl"
mesh: "package://openarm_description/assets/end_effector/pinch_gripper/meshes/collision/finger_outer.stl"
scale:
x: 1
y: 1
Expand Down
2 changes: 1 addition & 1 deletion assets/end_effector/pinch_gripper/config/link/visuals.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ link2:
pitch: -0
yaw: 0
geometry:
mesh: "package://openarm_description/assets/end_effector/pinch_gripper/meshes/visual/finger_outter.dae"
mesh: "package://openarm_description/assets/end_effector/pinch_gripper/meshes/visual/finger_outer.dae"
scale:
x: 1
y: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ links:
canonical_to_original:
base_link: ee_base_link
link1: finger_inner
link2: finger_outter
link2: finger_outer
original_to_canonical:
ee_base_link: base_link
finger_inner: link1
finger_outter: link2
finger_outer: link2
joints:
canonical_to_original:
joint1: finger_inner_joint
joint2: finger_outter_joint
joint2: finger_outer_joint
original_to_canonical:
finger_inner_joint: joint1
finger_outter_joint: joint2
finger_outer_joint: joint2
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
80 changes: 22 additions & 58 deletions assets/end_effector/pinch_gripper/meshes/visual/ee_base_link.dae

Large diffs are not rendered by default.

156 changes: 23 additions & 133 deletions assets/end_effector/pinch_gripper/meshes/visual/finger_inner.dae

Large diffs are not rendered by default.

213 changes: 213 additions & 0 deletions assets/end_effector/pinch_gripper/meshes/visual/finger_outer.dae

Large diffs are not rendered by default.

323 changes: 0 additions & 323 deletions assets/end_effector/pinch_gripper/meshes/visual/finger_outter.dae

This file was deleted.

Binary file modified assets/robot/openarm_v2.0/meshes/arm/collision/base_link.stl
Binary file not shown.
Binary file modified assets/robot/openarm_v2.0/meshes/arm/collision/link1.stl
Binary file not shown.
Binary file modified assets/robot/openarm_v2.0/meshes/arm/collision/link2.stl
Binary file not shown.
Binary file modified assets/robot/openarm_v2.0/meshes/arm/collision/link3.stl
Binary file not shown.
Binary file modified assets/robot/openarm_v2.0/meshes/arm/collision/link4.stl
Binary file not shown.
Binary file modified assets/robot/openarm_v2.0/meshes/arm/collision/link5.stl
Binary file not shown.
Binary file modified assets/robot/openarm_v2.0/meshes/arm/collision/link6.stl
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
88 changes: 44 additions & 44 deletions assets/robot/openarm_v2.0/meshes/arm/visual/base_link.dae

Large diffs are not rendered by default.

124 changes: 52 additions & 72 deletions assets/robot/openarm_v2.0/meshes/arm/visual/link1.dae

Large diffs are not rendered by default.

124 changes: 52 additions & 72 deletions assets/robot/openarm_v2.0/meshes/arm/visual/link2.dae

Large diffs are not rendered by default.

124 changes: 52 additions & 72 deletions assets/robot/openarm_v2.0/meshes/arm/visual/link3.dae

Large diffs are not rendered by default.

124 changes: 52 additions & 72 deletions assets/robot/openarm_v2.0/meshes/arm/visual/link4.dae

Large diffs are not rendered by default.

124 changes: 52 additions & 72 deletions assets/robot/openarm_v2.0/meshes/arm/visual/link5.dae

Large diffs are not rendered by default.

124 changes: 52 additions & 72 deletions assets/robot/openarm_v2.0/meshes/arm/visual/link6.dae

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions assets/robot/openarm_v2.0/urdf/example/v2.urdf
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@
<visual name="openarm_left_ee_link2_visual">
<origin rpy="0 0 0" xyz="0 0 0"/>
<geometry>
<mesh filename="package://openarm_description/assets/end_effector/pinch_gripper/meshes/visual/finger_outter.dae" scale="1 -1 1"/>
<mesh filename="package://openarm_description/assets/end_effector/pinch_gripper/meshes/visual/finger_outer.dae" scale="1 -1 1"/>
</geometry>
<material name="openarm_left_ee_link2_material">
<color rgba="0.752941176470588 0.752941176470588 0.752941176470588 1"/>
Expand All @@ -298,7 +298,7 @@
<collision name="openarm_left_ee_link2_collision">
<origin rpy="0 0 0" xyz="0 0 0"/>
<geometry>
<mesh filename="package://openarm_description/assets/end_effector/pinch_gripper/meshes/collision/finger_outter.stl" scale="1 -1 1"/>
<mesh filename="package://openarm_description/assets/end_effector/pinch_gripper/meshes/collision/finger_outer.stl" scale="1 -1 1"/>
</geometry>
</collision>
<inertial>
Expand Down Expand Up @@ -579,7 +579,7 @@
<visual name="openarm_right_ee_link2_visual">
<origin rpy="0 0 0" xyz="0 0 0"/>
<geometry>
<mesh filename="package://openarm_description/assets/end_effector/pinch_gripper/meshes/visual/finger_outter.dae" scale="1 1 1"/>
<mesh filename="package://openarm_description/assets/end_effector/pinch_gripper/meshes/visual/finger_outer.dae" scale="1 1 1"/>
</geometry>
<material name="openarm_right_ee_link2_material">
<color rgba="0.752941176470588 0.752941176470588 0.752941176470588 1"/>
Expand All @@ -588,7 +588,7 @@
<collision name="openarm_right_ee_link2_collision">
<origin rpy="0 0 0" xyz="0 0 0"/>
<geometry>
<mesh filename="package://openarm_description/assets/end_effector/pinch_gripper/meshes/collision/finger_outter.stl" scale="1 1 1"/>
<mesh filename="package://openarm_description/assets/end_effector/pinch_gripper/meshes/collision/finger_outer.stl" scale="1 1 1"/>
</geometry>
</collision>
<inertial>
Expand Down
8 changes: 4 additions & 4 deletions output.urdf
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@
<visual name="openarm_left_ee_link2_visual">
<origin rpy="0 0 0" xyz="0 0 0"/>
<geometry>
<mesh filename="package://openarm_description/assets/end_effector/pinch_gripper/meshes/visual/finger_outter.dae" scale="1 -1 1"/>
<mesh filename="package://openarm_description/assets/end_effector/pinch_gripper/meshes/visual/finger_outer.dae" scale="1 -1 1"/>
Comment thread
stevenaya marked this conversation as resolved.
</geometry>
<material name="openarm_left_ee_link2_material">
<color rgba="0.752941176470588 0.752941176470588 0.752941176470588 1"/>
Expand All @@ -298,7 +298,7 @@
<collision name="openarm_left_ee_link2_collision">
<origin rpy="0 0 0" xyz="0 0 0"/>
<geometry>
<mesh filename="package://openarm_description/assets/end_effector/pinch_gripper/meshes/collision/finger_outter.stl" scale="1 -1 1"/>
<mesh filename="package://openarm_description/assets/end_effector/pinch_gripper/meshes/collision/finger_outer.stl" scale="1 -1 1"/>
Comment thread
stevenaya marked this conversation as resolved.
</geometry>
</collision>
<inertial>
Expand Down Expand Up @@ -579,7 +579,7 @@
<visual name="openarm_right_ee_link2_visual">
<origin rpy="0 0 0" xyz="0 0 0"/>
<geometry>
<mesh filename="package://openarm_description/assets/end_effector/pinch_gripper/meshes/visual/finger_outter.dae" scale="1 1 1"/>
<mesh filename="package://openarm_description/assets/end_effector/pinch_gripper/meshes/visual/finger_outer.dae" scale="1 1 1"/>
</geometry>
<material name="openarm_right_ee_link2_material">
<color rgba="0.752941176470588 0.752941176470588 0.752941176470588 1"/>
Expand All @@ -588,7 +588,7 @@
<collision name="openarm_right_ee_link2_collision">
<origin rpy="0 0 0" xyz="0 0 0"/>
<geometry>
<mesh filename="package://openarm_description/assets/end_effector/pinch_gripper/meshes/collision/finger_outter.stl" scale="1 1 1"/>
<mesh filename="package://openarm_description/assets/end_effector/pinch_gripper/meshes/collision/finger_outer.stl" scale="1 1 1"/>
</geometry>
</collision>
<inertial>
Expand Down