Skip to content

Commit

Permalink
Update website [ci skip]
Browse files Browse the repository at this point in the history
  • Loading branch information
costashatz committed May 1, 2024
1 parent 2a6c265 commit 5e970e7
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 20 deletions.
2 changes: 1 addition & 1 deletion docs/assets/.doxy/api/hashChanges.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f8e606bc6ca3420be65749a9d5a301c84e837fe4
1af0eb9a53351f1d4c1c783e31a8619360d3b64d
29 changes: 20 additions & 9 deletions docs/robots/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -1269,12 +1269,12 @@ <h2 id="talos-pal-robotics">Talos (PAL Robotics)<a class="headerlink" href="#tal
</ul>
<p>We have two URDF files:</p>
<ul>
<li><code>robots/talos/talos.urdf</code> :<ul>
<li><code>utheque/talos/talos.urdf</code> :<ul>
<li>accurate (simplified but made of polygons) collision meshes</li>
<li>mimic joints for the gripper</li>
<li>Not compatible the DART collision detector (you need to use FCL collision detector - shipped with DART)</li>
<li>URDF: [<a href="https://github.com/resibots/robot_dart/blob/master/utheque/talos/talos.urdf">talos.urdf</a>]</li>
<li>Example: [<a href="https://github.com/resibots/robot_dart/blob/master/src/examples/talos.cpp">talos.cpp</a>]</li>
<li>Example: [<a href="https://github.com/resibots/robot_dart/blob/master/src/examples/talos.cpp">talos.cpp</a>] [<a href="https://github.com/resibots/robot_dart/blob/master/src/examples/python/talos.py">talos.py</a>]</li>
</ul>
</li>
</ul>
Expand All @@ -1296,7 +1296,7 @@ <h2 id="talos-pal-robotics">Talos (PAL Robotics)<a class="headerlink" href="#tal
</code></pre></div>
</div>
<ul>
<li><code>robot/talos/talos_fast.urdf</code>:<ul>
<li><code>utheque/talos/talos_fast.urdf</code>:<ul>
<li>no collision except for the feet, which are approximated by boxes</li>
<li>grippers are fixed (no movement is allowed)</li>
<li>compatible with the DART collision detector</li>
Expand All @@ -1306,6 +1306,17 @@ <h2 id="talos-pal-robotics">Talos (PAL Robotics)<a class="headerlink" href="#tal
</li>
</ul>
<p><code>talos_fast.urdf</code> is faster because it makes it possible to use the DART collision detector (and has much collision shapes). You should prefer it except if you want to use the grippers (e.g., for manipulation) or are working on self-collisions.</p>
<ul>
<li><code>utheque/talos/talos_fast_collision.urdf</code>:<ul>
<li>all bodies are approximated by boxes</li>
<li>grippers are fixed (no movement is allowed)</li>
<li>compatible with the DART collision detector</li>
<li>URDF: [<a href="https://github.com/resibots/robot_dart/blob/master/utheque/talos/talos_fast.urdf">talos_fast_collision.urdf</a>]</li>
<li>Example: [<a href="https://github.com/resibots/robot_dart/blob/master/src/examples/talos_fast_collision.cpp">talos_fast_collision.cpp</a>] [<a href="https://github.com/resibots/robot_dart/blob/master/src/examples/python/talos_fast_collision.py">talos_fast_collision.py</a>]</li>
</ul>
</li>
</ul>
<p><code>talos_fast_collision.urdf</code> is faster than <code>talos.urdf</code> but slower than <code>talos_fast.urdf</code>. You should use it when you need more detail collisions but faster simulation times.</p>
<div class="admonition note">
<p class="admonition-title">Load Talos Fast</p>
<div class="tabbed-set tabbed-alternate" data-tabs="3:1"><input checked="checked" id="__tabbed_3_1" name="__tabbed_3" type="radio" /><div class="tabbed-labels"><label for="__tabbed_3_1">C++</label></div>
Expand Down Expand Up @@ -1335,7 +1346,7 @@ <h2 id="panda-franka-emika">Panda (Franka Emika)<a class="headerlink" href="#pan
<li>18 kg</li>
<li>workspace: 855 mm (horizontal), 1190 mm (vertical)</li>
<li>URDF: [<a href="https://github.com/resibots/robot_dart/blob/master/utheque/franka/franka.urdf">franka.urdf</a>]</li>
<li>Example: [<a href="https://github.com/resibots/robot_dart/blob/master/src/examples/franka.cpp">franka.cpp</a>]
<li>Example: [<a href="https://github.com/resibots/robot_dart/blob/master/src/examples/franka.cpp">franka.cpp</a>] [<a href="https://github.com/resibots/robot_dart/blob/master/src/examples/python/franka.py">franka.py</a>]
The URDF includes the gripper.</li>
</ul>
<div class="admonition note">
Expand Down Expand Up @@ -1364,7 +1375,7 @@ <h2 id="lbr-iiwa-kuka">LBR iiwa (KUKA)<a class="headerlink" href="#lbr-iiwa-kuka
<li>29.5 kg</li>
<li>7 degrees of freedom</li>
<li>URDF: [<a href="https://github.com/resibots/robot_dart/blob/master/utheque/iiwa/iiwa.urdf">iiwa.urdf</a>]</li>
<li>Example: [<a href="https://github.com/resibots/robot_dart/blob/master/src/examples/iiwa.cpp">iiwa.cpp</a>]</li>
<li>Example: [<a href="https://github.com/resibots/robot_dart/blob/master/src/examples/iiwa.cpp">iiwa.cpp</a>] [<a href="https://github.com/resibots/robot_dart/blob/master/src/examples/python/iiwa.py">iiwa.py</a>]</li>
</ul>
<div class="admonition note">
<p class="admonition-title">Load Iiwa</p>
Expand Down Expand Up @@ -1394,7 +1405,7 @@ <h2 id="icub-iit">iCub (IIT)<a class="headerlink" href="#icub-iit" title="Perman
<li>We do not simulate the hands</li>
<li>Our model is close to the <a href="https://members.loria.fr/JBMouret/robots.html">Inria's iCub</a>, but it has not been checked in detail.</li>
<li>URDF: [<a href="https://github.com/resibots/robot_dart/blob/master/utheque/iiwa/icub.urdf">icub.urdf</a>]</li>
<li>Example [<a href="https://github.com/resibots/robot_dart/blob/master/src/examples/icub.cpp">icub.cpp</a>]</li>
<li>Example [<a href="https://github.com/resibots/robot_dart/blob/master/src/examples/icub.cpp">icub.cpp</a>] [<a href="https://github.com/resibots/robot_dart/blob/master/src/examples/python/icub.py">icub.py</a>]</li>
</ul>
<p><em>Please note that the mesh files (.glb) require assimp 5.x (and not assimp4.x usually shipped with ROS). If you cannot load the URDF, please check your assimp version.</em></p>
<div class="admonition note">
Expand Down Expand Up @@ -1476,7 +1487,7 @@ <h2 id="unitree-a1">Unitree A1<a class="headerlink" href="#unitree-a1" title="Pe
<li>We do not simulate the foot pressure sensors (yet)</li>
<li>One can easily add a depth camera on the head</li>
<li>URDF: [<a href="https://github.com/resibots/robot_dart/blob/master/utheque/unitree_a1/a1.urdf">a1.urdf</a>]</li>
<li>Example [<a href="https://github.com/resibots/robot_dart/blob/master/src/examples/a1.cpp">a1.cpp</a>]</li>
<li>Example [<a href="https://github.com/resibots/robot_dart/blob/master/src/examples/a1.cpp">a1.cpp</a>] [<a href="https://github.com/resibots/robot_dart/blob/master/src/examples/python/a1.py">a1.py</a>]</li>
</ul>
<div class="admonition note">
<p class="admonition-title">Load A1</p>
Expand Down Expand Up @@ -1530,7 +1541,7 @@ <h2 id="dynamixel-based-hexapod-robot-inria-and-others">Dynamixel-based hexapod
<li>6 legs, 3 degrees of freedom for each leg (18 degrees of freedom)</li>
<li>simple URDF (no meshes)</li>
<li>URDF: [<a href="https://github.com/resibots/robot_dart/blob/master/utheque/pexod.urdf">pexod.urdf</a>]</li>
<li>Example: [<a href="https://github.com/resibots/robot_dart/blob/master/src/examples/hexapod.cpp">hexapod.cpp</a>]</li>
<li>Example: [<a href="https://github.com/resibots/robot_dart/blob/master/src/examples/hexapod.cpp">hexapod.cpp</a>] [<a href="https://github.com/resibots/robot_dart/blob/master/src/examples/python/hexapod.py">hexapod.py</a>]</li>
</ul>
<div class="admonition note">
<p class="admonition-title">Load Hexapod</p>
Expand Down Expand Up @@ -1573,7 +1584,7 @@ <h2 id="simple-arm">Simple arm<a class="headerlink" href="#simple-arm" title="Pe
<li>5 degrees of freedom</li>
<li>simple URDF (no meshes)</li>
<li>URDF: [<a href="https://github.com/resibots/robot_dart/blob/master/utheque/arm.urdf">arm.urdf</a>]</li>
<li>Example: [<a href="https://github.com/resibots/robot_dart/blob/master/src/examples/arm.cpp">arm.cpp</a>]</li>
<li>Example: [<a href="https://github.com/resibots/robot_dart/blob/master/src/examples/arm.cpp">arm.cpp</a>] [<a href="https://github.com/resibots/robot_dart/blob/master/src/examples/python/arm.py">arm.py</a>]</li>
</ul>
<div class="admonition note">
<p class="admonition-title">Load Simple Arm</p>
Expand Down
2 changes: 1 addition & 1 deletion docs/search/search_index.json

Large diffs are not rendered by default.

Binary file modified docs/sitemap.xml.gz
Binary file not shown.
28 changes: 19 additions & 9 deletions src/docs/docs/robots.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,27 +37,37 @@ Talos is a humanoid robot made by [PAL Robotics](https://pal-robotics.com/robots

We have two URDF files:

- `robots/talos/talos.urdf` :
- `utheque/talos/talos.urdf` :
* accurate (simplified but made of polygons) collision meshes
* mimic joints for the gripper
* Not compatible the DART collision detector (you need to use FCL collision detector - shipped with DART)
* URDF: [[talos.urdf](https://github.com/resibots/robot_dart/blob/master/utheque/talos/talos.urdf)]
* Example: [[talos.cpp](https://github.com/resibots/robot_dart/blob/master/src/examples/talos.cpp)] [[talos.cpp](https://github.com/resibots/robot_dart/blob/master/src/examples/python/talos.py)]
* Example: [[talos.cpp](https://github.com/resibots/robot_dart/blob/master/src/examples/talos.cpp)] [[talos.py](https://github.com/resibots/robot_dart/blob/master/src/examples/python/talos.py)]

!!! note "Load Talos"
=== "C++"
{{TALOS}}
=== "Python"
{{TALOS_PYTHON}}

- `robot/talos/talos_fast.urdf`:
- `utheque/talos/talos_fast.urdf`:
* no collision except for the feet, which are approximated by boxes
* grippers are fixed (no movement is allowed)
* compatible with the DART collision detector
* URDF: [[talos_fast.urdf](https://github.com/resibots/robot_dart/blob/master/utheque/talos/talos_fast.urdf)]
* Example: [[talos_fast.cpp](https://github.com/resibots/robot_dart/blob/master/src/examples/talos_fast.cpp)]

`talos_fast.urdf` is faster because it makes it possible to use the DART collision detector (and has much collision shapes). You should prefer it except if you want to use the grippers (e.g., for manipulation) or are working on self-collisions.

- `utheque/talos/talos_fast_collision.urdf`:
* all bodies are approximated by boxes
* grippers are fixed (no movement is allowed)
* compatible with the DART collision detector
* URDF: [[talos_fast_collision.urdf](https://github.com/resibots/robot_dart/blob/master/utheque/talos/talos_fast.urdf)]
* Example: [[talos_fast_collision.cpp](https://github.com/resibots/robot_dart/blob/master/src/examples/talos_fast_collision.cpp)] [[talos_fast_collision.py](https://github.com/resibots/robot_dart/blob/master/src/examples/python/talos_fast_collision.py)]

`talos_fast_collision.urdf` is faster than `talos.urdf` but slower than `talos_fast.urdf`. You should use it when you need more detail collisions but faster simulation times.

!!! note "Load Talos Fast"
=== "C++"
{{TALOS_FAST}}
Expand All @@ -77,7 +87,7 @@ The Franka is a modern manipulator made by [Franka Emika Panda](https://www.fran
- 18 kg
- workspace: 855 mm (horizontal), 1190 mm (vertical)
- URDF: [[franka.urdf](https://github.com/resibots/robot_dart/blob/master/utheque/franka/franka.urdf)]
- Example: [[franka.cpp](https://github.com/resibots/robot_dart/blob/master/src/examples/franka.cpp)]
- Example: [[franka.cpp](https://github.com/resibots/robot_dart/blob/master/src/examples/franka.cpp)] [[franka.py](https://github.com/resibots/robot_dart/blob/master/src/examples/python/franka.py)]
The URDF includes the gripper.
!!! note "Load Franka"
=== "C++"
Expand All @@ -95,7 +105,7 @@ The LBR iiwa is manufactured by [KUKA](https://www.kuka.com/en-de/products/robot
- 29.5 kg
- 7 degrees of freedom
- URDF: [[iiwa.urdf](https://github.com/resibots/robot_dart/blob/master/utheque/iiwa/iiwa.urdf)]
- Example: [[iiwa.cpp](https://github.com/resibots/robot_dart/blob/master/src/examples/iiwa.cpp)]
- Example: [[iiwa.cpp](https://github.com/resibots/robot_dart/blob/master/src/examples/iiwa.cpp)] [[iiwa.py](https://github.com/resibots/robot_dart/blob/master/src/examples/python/iiwa.py)]

!!! note "Load Iiwa"
=== "C++"
Expand All @@ -115,7 +125,7 @@ The iCub is a open source humanoid robot made by the [Instituto Italiano di Tecn
- We do not simulate the hands
- Our model is close to the [Inria's iCub](https://members.loria.fr/JBMouret/robots.html), but it has not been checked in detail.
- URDF: [[icub.urdf](https://github.com/resibots/robot_dart/blob/master/utheque/iiwa/icub.urdf)]
- Example [[icub.cpp](https://github.com/resibots/robot_dart/blob/master/src/examples/icub.cpp)]
- Example [[icub.cpp](https://github.com/resibots/robot_dart/blob/master/src/examples/icub.cpp)] [[icub.py](https://github.com/resibots/robot_dart/blob/master/src/examples/python/icub.py)]

*Please note that the mesh files (.glb) require assimp 5.x (and not assimp4.x usually shipped with ROS). If you cannot load the URDF, please check your assimp version.*
!!! note "Load iCub"
Expand Down Expand Up @@ -145,7 +155,7 @@ A1 is a quadruped robot made by the [Unitree Robotics](https://www.unitree.com/p
- We do not simulate the foot pressure sensors (yet)
- One can easily add a depth camera on the head
- URDF: [[a1.urdf](https://github.com/resibots/robot_dart/blob/master/utheque/unitree_a1/a1.urdf)]
- Example [[a1.cpp](https://github.com/resibots/robot_dart/blob/master/src/examples/a1.cpp)]
- Example [[a1.cpp](https://github.com/resibots/robot_dart/blob/master/src/examples/a1.cpp)] [[a1.py](https://github.com/resibots/robot_dart/blob/master/src/examples/python/a1.py)]
!!! note "Load A1"
=== "C++"
{{A1}}
Expand All @@ -172,7 +182,7 @@ This hexapod is a simple 6-legged robot based on dynamixel actuators. It is simi
- 6 legs, 3 degrees of freedom for each leg (18 degrees of freedom)
- simple URDF (no meshes)
- URDF: [[pexod.urdf](https://github.com/resibots/robot_dart/blob/master/utheque/pexod.urdf)]
- Example: [[hexapod.cpp](https://github.com/resibots/robot_dart/blob/master/src/examples/hexapod.cpp)]
- Example: [[hexapod.cpp](https://github.com/resibots/robot_dart/blob/master/src/examples/hexapod.cpp)] [[hexapod.py](https://github.com/resibots/robot_dart/blob/master/src/examples/python/hexapod.py)]

!!! note "Load Hexapod"
=== "C++"
Expand All @@ -194,7 +204,7 @@ This hexapod is a simple 6-legged robot based on dynamixel actuators. It is simi
- 5 degrees of freedom
- simple URDF (no meshes)
- URDF: [[arm.urdf](https://github.com/resibots/robot_dart/blob/master/utheque/arm.urdf)]
- Example: [[arm.cpp](https://github.com/resibots/robot_dart/blob/master/src/examples/arm.cpp)]
- Example: [[arm.cpp](https://github.com/resibots/robot_dart/blob/master/src/examples/arm.cpp)] [[arm.py](https://github.com/resibots/robot_dart/blob/master/src/examples/python/arm.py)]

!!! note "Load Simple Arm"
=== "C++"
Expand Down

0 comments on commit 5e970e7

Please sign in to comment.