Skip to content
Snippets Groups Projects
Commit 9088d7eb authored by Simon Ottenhaus's avatar Simon Ottenhaus
Browse files

Merge branch 'master' of gitlab.com:ArmarX/RobotAPI

parents d1b0848c f67974a1
No related branches found
No related tags found
No related merge requests found
......@@ -99,7 +99,7 @@
<Joint type="revolute">
<!--DH a="0" d="-7.5" theta="90" alpha="-90" units="degree"/-->
<axis x="0" y="0" z="1"/>
<Limits unit="degree" lo="-120" hi="19"/>
<Limits unit="degree" lo="-90" hi="27"/>
<MaxVelocity unit="radian" value="1"/>
<MaxAcceleration value="10"/>
<MaxTorque value="3000"/>
......
......@@ -95,7 +95,7 @@
</Transform>
<Joint type="revolute">
<!--DH a="0" d="7.5" theta="90" alpha="-90" units="degree"/-->
<Limits unit="degree" lo="-120" hi="40"/>
<Limits unit="degree" lo="-90" hi="30"/>
<MaxVelocity unit="radian" value="1"/>
<MaxAcceleration value="10"/>
<MaxTorque value="3000"/>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment