Skip to content
Snippets Groups Projects
Commit 751fd749 authored by Sebastian Ebert's avatar Sebastian Ebert
Browse files

merged conflict

parents 7ee10770 9a8da68d
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
meshes/collision/finger.stl
+ 0
− 0
View file @ 751fd749
No preview for this file type
meshes/collision/finger_detailed.stl 0 → 100644
+ 0
− 0
View file @ 751fd749
File added
meshes/collision/finger_horizontal.stl 0 → 100644
+ 0
− 0
View file @ 751fd749
File added
meshes/visual/finger.dae
+ 121
− 72
View file @ 751fd749
Source diff could not be displayed: it is too large. Options to address this: view the blob.
meshes/visual/finger_horizontal.dae 0 → 100644
+ 127
− 0
View file @ 751fd749
Source diff could not be displayed: it is too large. Options to address this: view the blob.
robots/panda_arm_hand.urdf.xacro
+ 3
− 3
View file @ 751fd749
......@@ -26,10 +26,10 @@
<gripper_link> panda_leftfinger </gripper_link>
</arm>
<forces_angle_tolerance>100</forces_angle_tolerance>
<update_rate>4</update_rate>
<grip_count_threshold>4</grip_count_threshold>
<update_rate>5</update_rate>
<grip_count_threshold>1</grip_count_threshold>
<max_grip_count>8</max_grip_count>
<release_tolerance>0.005</release_tolerance>
<release_tolerance>0.006</release_tolerance>
<disable_collisions_on_attach>false</disable_collisions_on_attach>
<contact_topic>__default_topic__</contact_topic>
</plugin>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment