Skip to content

Commit

Permalink
New version E4: Includes new meshes for lfmetacarpal and palm (#152)
Browse files Browse the repository at this point in the history
* Adding lf_metacarpal

* Adding the new meshes for E4 version

* Fixing orientation

* Fixing orientation

* Fixing orientation

* adding E4 new palm meshes

* fixing collision for lf metacarpal

* fixing collision for lf metacarpal

* Improving meshes

* Improving meshes

* Adding palm material

* Adding palm material

* Adding lf metacarpal material

* Fixing lint errors

* Fixing lint errors

* Fixing lint errors
  • Loading branch information
Beatriz Leon authored Feb 1, 2023
1 parent 17f6dcb commit 5ab01b2
Show file tree
Hide file tree
Showing 13 changed files with 1,568 additions and 10 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
Software License Agreement (BSD License)
Copyright © 2022 belongs to Shadow Robot Company Ltd.
Copyright © 2022-2023 belongs to Shadow Robot Company Ltd.
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
Expand Down Expand Up @@ -52,7 +52,8 @@
<material name="Grey" />
</visual>
<collision>
<origin xyz="0 0 0.038" rpy="0 0 0" />
<origin xyz="${reflect*0.05397275/2.0} 0 ${0.038/2}" rpy="0 ${reflect*0.9599} 0" />
<axis xyz="0.573576436 0 ${reflect*0.819152044}" />
<geometry name="${prefix}lfmetacarpal_collision_geom">
<box size="0.018 0.024 0.040" />
</geometry>
Expand Down
22 changes: 14 additions & 8 deletions sr_description/hand/xacro/thumb/thmiddle.urdf.xacro
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
Software License Agreement (BSD License)
Copyright © 2022 belongs to Shadow Robot Company Ltd.
Copyright © 2022-2023 belongs to Shadow Robot Company Ltd.
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
Expand Down Expand Up @@ -61,27 +61,33 @@
</material>
</xacro:unless>
</visual>
<collision>
<xacro:if value="${mid_sensor == 'bt_2p'}">
<xacro:if value="${mid_sensor == 'bt_2p'}">
<collision>
<origin xyz="0 0 0.005" rpy="0 0 0" />
<geometry name="${prefix}thmiddle_collision_geom">
<box size="0.001 0.001 0.001" />
</geometry>
</xacro:if>
<xacro:unless value="${mid_sensor == 'bt_2p'}">
</collision>
</xacro:if>
<xacro:unless value="${mid_sensor == 'bt_2p'}">
<collision>
<origin xyz="0 0 0.012" rpy="0 0 0" />
<geometry name="${prefix}thmiddle_collision_geom">
<cylinder radius="0.011" length="0.018" />
</geometry>
</xacro:unless>
</collision>
<xacro:unless value="${mid_sensor == 'bt_2p'}">
</collision>
<collision>
<origin xyz="0 0 0.019" rpy="0 0 0" />
<geometry>
<sphere radius="0.011" />
</geometry>
</collision>
<collision>
<origin xyz="0 0 0.032" rpy="0 1.5708 0" />
<geometry>
<cylinder radius="0.010" length="0.014" />
</geometry>
</collision>
</xacro:unless>
</link>
<joint name="${prefix}THJ2" type="revolute">
Expand Down
133 changes: 133 additions & 0 deletions sr_description/meshes/components/f_knuckle/f_knuckle_E4.dae

Large diffs are not rendered by default.

130 changes: 130 additions & 0 deletions sr_description/meshes/components/f_middle/f_middle_E4.dae

Large diffs are not rendered by default.

139 changes: 139 additions & 0 deletions sr_description/meshes/components/f_proximal/f_proximal_E4.dae

Large diffs are not rendered by default.

304 changes: 304 additions & 0 deletions sr_description/meshes/components/forearm/forearm_E4.dae

Large diffs are not rendered by default.

83 changes: 83 additions & 0 deletions sr_description/meshes/components/forearm/forearm_collision_E4.dae

Large diffs are not rendered by default.

122 changes: 122 additions & 0 deletions sr_description/meshes/components/lf_metacarpal/lf_metacarpal_E4.dae

Large diffs are not rendered by default.

107 changes: 107 additions & 0 deletions sr_description/meshes/components/mounting_plate/mounting_plate_E4.dae

Large diffs are not rendered by default.

122 changes: 122 additions & 0 deletions sr_description/meshes/components/palm/palm_E4.dae

Large diffs are not rendered by default.

139 changes: 139 additions & 0 deletions sr_description/meshes/components/th_middle/th_middle_E4.dae

Large diffs are not rendered by default.

139 changes: 139 additions & 0 deletions sr_description/meshes/components/th_proximal/th_proximal_E4.dae

Large diffs are not rendered by default.

133 changes: 133 additions & 0 deletions sr_description/meshes/components/wrist/wrist_E4.dae

Large diffs are not rendered by default.

0 comments on commit 5ab01b2

Please sign in to comment.