Skip to content

Commit

Permalink
Update documentation structure
Browse files Browse the repository at this point in the history
  • Loading branch information
JeanElsner committed Nov 17, 2023
1 parent e1f70c8 commit f19b49c
Show file tree
Hide file tree
Showing 15 changed files with 119 additions and 80 deletions.
12 changes: 4 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ This package includes a model of the Panda robot for [dm_robotics](https://githu
<p>Haptic interaction mode allows you to physically interact with the simulation environment.</p>
</div>

To get started, checkout the [tutorials](https://jeanelsner.github.io/dm_robotics_panda/tutorial.html).

## Install
The recommended way of installing is using PyPI:
```
Expand All @@ -38,12 +40,6 @@ pip install .
```
in the repository's root directory.
## Requirements
Hardware-in-the-loop operation requires `panda-py` to control the robot. However, the version automatically installed from PyPI may not be compatible with your robot if you use an older firmware or use the new Franka Research 3. In that case refer to the panda-py [instructions](https://github.com/JeanElsner/panda-py#libfranka-version) on what version to install and where to find it.

The
For visualization, additional libraries are required, depending on whether hardware acceleration and/or headless mode is required. On Ubuntu 22.04 you can install the respective requirements by running
* Hardware accelerated rendering in windowed mode `sudo apt-get install libglfw3 libglew2.2`
* Headless hardware acceleration with recent NVIDIA driver `sudo apt-get install libglew2.2`
* Software rendering `sudo apt-get install libgl1-mesa-glx libosmesa6`
Hardware-in-the-loop operation requires `panda-py` to control the robot. However, the version automatically installed from PyPI may not be compatible with your robot if you use an older firmware or use the new Franka Research 3 robot. In that case refer to the panda-py [instructions](https://github.com/JeanElsner/panda-py#libfranka-version) on what version to install and where to find it.

Additionally you may need to install glib `sudo apt-get install libglib2.0-0`.
If you're having trouble running the included viewer or rendering scenes, please refer to the requirements of [dm_control](https://github.com/google-deepmind/dm_control#rendering).
3 changes: 2 additions & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

extensions = [
'sphinxcontrib.youtube',
'sphinx.ext.autodoc',
'sphinx.ext.napoleon',
'sphinx.ext.intersphinx',
Expand All @@ -37,5 +38,5 @@
# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output

html_theme = 'furo'
html_logo = '../logo.png'
html_logo = './img/logo.png'
html_static_path = ['_static']
7 changes: 7 additions & 0 deletions doc/dm_robotics.panda.arm.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
dm\_robotics.panda.arm module
=============================

.. automodule:: dm_robotics.panda.arm
:members:
:undoc-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions doc/dm_robotics.panda.arm_constants.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
dm\_robotics.panda.arm\_constants module
========================================

.. automodule:: dm_robotics.panda.arm_constants
:members:
:undoc-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions doc/dm_robotics.panda.environment.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
dm\_robotics.panda.environment module
=====================================

.. automodule:: dm_robotics.panda.environment
:members:
:undoc-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions doc/dm_robotics.panda.gripper.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
dm\_robotics.panda.gripper module
=================================

.. automodule:: dm_robotics.panda.gripper
:members:
:undoc-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions doc/dm_robotics.panda.gripper_constants.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
dm\_robotics.panda.gripper\_constants module
============================================

.. automodule:: dm_robotics.panda.gripper_constants
:members:
:undoc-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions doc/dm_robotics.panda.hardware.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
dm\_robotics.panda.hardware module
==================================

.. automodule:: dm_robotics.panda.hardware
:members:
:undoc-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions doc/dm_robotics.panda.parameters.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
dm\_robotics.panda.parameters module
====================================

.. automodule:: dm_robotics.panda.parameters
:members:
:undoc-members:
:show-inheritance:
83 changes: 12 additions & 71 deletions doc/dm_robotics.panda.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,74 +9,15 @@ dm\_robotics.panda package
Submodules
----------

dm\_robotics.panda.arm module
-----------------------------

.. automodule:: dm_robotics.panda.arm
:members:
:undoc-members:
:show-inheritance:

dm\_robotics.panda.arm\_constants module
----------------------------------------

.. automodule:: dm_robotics.panda.arm_constants
:members:
:undoc-members:
:show-inheritance:

dm\_robotics.panda.env\_builder module
--------------------------------------

.. automodule:: dm_robotics.panda.env_builder
:members:
:undoc-members:
:show-inheritance:

dm\_robotics.panda.gripper module
---------------------------------

.. automodule:: dm_robotics.panda.gripper
:members:
:undoc-members:
:show-inheritance:

dm\_robotics.panda.gripper\_constants module
--------------------------------------------

.. automodule:: dm_robotics.panda.gripper_constants
:members:
:undoc-members:
:show-inheritance:

dm\_robotics.panda.hardware module
----------------------------------

.. automodule:: dm_robotics.panda.hardware
:members:
:undoc-members:
:show-inheritance:

dm\_robotics.panda.parameters module
------------------------------------

.. automodule:: dm_robotics.panda.parameters
:members:
:undoc-members:
:show-inheritance:

dm\_robotics.panda.run\_loop module
-----------------------------------

.. automodule:: dm_robotics.panda.run_loop
:members:
:undoc-members:
:show-inheritance:

dm\_robotics.panda.utils module
-------------------------------

.. automodule:: dm_robotics.panda.utils
:members:
:undoc-members:
:show-inheritance:
.. toctree::
:maxdepth: 1

dm_robotics.panda.arm
dm_robotics.panda.arm_constants
dm_robotics.panda.environment
dm_robotics.panda.gripper
dm_robotics.panda.gripper_constants
dm_robotics.panda.hardware
dm_robotics.panda.parameters
dm_robotics.panda.run_loop
dm_robotics.panda.utils
7 changes: 7 additions & 0 deletions doc/dm_robotics.panda.run_loop.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
dm\_robotics.panda.run\_loop module
===================================

.. automodule:: dm_robotics.panda.run_loop
:members:
:undoc-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions doc/dm_robotics.panda.utils.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
dm\_robotics.panda.utils module
===============================

.. automodule:: dm_robotics.panda.utils
:members:
:undoc-members:
:show-inheritance:
Binary file added doc/img/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 37 additions & 0 deletions doc/tutorial.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,40 @@
Tutorial
========

Introduction
------------

Motion Control
--------------

Joint
^^^^^

.. youtube:: C14HlT1Scdo

Cartesian
^^^^^^^^^

.. youtube:: vYvdr7iGCv4


Gripper
^^^^^^^

.. youtube:: h3P0HBPF3NU


Haptic Interaction
------------------

.. youtube:: hn42udf0uKc


Multiple Robots
---------------

Rewards and Observations
------------------------

Domain Randomization
--------------------
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ doc = [
"sphinx",
"furo",
"sphinx_reredirects",
"sphinxcontrib.youtube",
]

[project.urls]
Expand Down

0 comments on commit f19b49c

Please sign in to comment.