Merge remote-tracking branch 'bp/master'

This commit is contained in:
YunfeiBai committed 2016-09-28 13:54:35 -07:00
commit dacca09614
8 files changed
+63 -21

No files matched your search

+1 -1
View File
@@ -174,7 +174,7 @@
<child link="lbr_iiwa_link_4"/>
<origin rpy="1.57079632679 0 0" xyz="0 0 0.2155"/>
<axis xyz="0 0 1"/>
<limit effort="300" lower="-2.09439510239" upper="2.09439510239" velocity="10"/>
<limit effort="300" lower=".29439510239" upper="2.09439510239" velocity="10"/>
<dynamics damping="0.5"/>
</joint>
<link name="lbr_iiwa_link_4">