Skip to content

Commit 7c29354

Browse files
authored
Merge branch 'moveit:main' into main
2 parents 8d9fb54 + b0ba2a9 commit 7c29354

2 files changed

Lines changed: 11 additions & 10 deletions

File tree

doc/how_to_guides/isaac_panda/isaac_panda_tutorial.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ How To Command Simulated Isaac Robot
22
====================================
33

44
This tutorial requires a machine with ``Isaac Sim 4.5`` (recommended) or ``Isaac Sim 4.2`` installed.
5-
For Isaac Sim requirements and installation please see the `Omniverse documentation <https://docs.omniverse.nvidia.com/isaacsim/latest/index.html>`_.
6-
To configure Isaac Sim to work with ROS 2 please see `this guide <https://docs.omniverse.nvidia.com/isaacsim/latest/installation/install_ros.html#running-native-ros>`_.
5+
For Isaac Sim requirements and installation please see the `Omniverse documentation <https://docs.isaacsim.omniverse.nvidia.com/latest/index.html>`_.
6+
To configure Isaac Sim to work with ROS 2 please see `this guide <https://docs.isaacsim.omniverse.nvidia.com/latest/installation/install_ros.html#running-native-ros>`_.
77

88
This tutorial has the following assumptions on system configuration:
99

@@ -57,19 +57,19 @@ updated to load the ``TopicBasedSystem`` plugin when the flag ``ros2_control_har
5757
</xacro:if>
5858
5959
In this tutorial we have included a Python script that loads a Panda robot
60-
and builds an `OmniGraph <https://docs.omniverse.nvidia.com/isaacsim/latest/gui_tutorials/tutorial_gui_omnigraph.html>`_
60+
and builds an `OmniGraph <https://docs.omniverse.nvidia.com/extensions/latest/ext_omnigraph/tutorials/gentle_intro.html>`_
6161
to publish and subscribe to the ROS topics used to control the robot.
6262
The OmniGraph also contains nodes to publish RGB and Depth images from the camera mounted on the hand of the Panda.
6363
The RGB image is published to the topic ``/rgb``, the camera info to ``/camera_info``, and the depth image to ``/depth``.
6464
The frame ID of the camera frame is ``/sim_camera``.
6565
To learn about configuring your Isaac Sim robot to communicate with ROS 2 please see the
66-
`Joint Control tutorial <https://docs.omniverse.nvidia.com/isaacsim/latest/ros2_tutorials/tutorial_ros2_manipulation.html>`_
66+
`Joint Control tutorial <https://docs.isaacsim.omniverse.nvidia.com/latest/ros2_tutorials/tutorial_ros2_manipulation.html>`_
6767
on Omniverse.
6868

6969
Computer Setup
7070
--------------
7171

72-
1. Install `Isaac Sim <https://docs.omniverse.nvidia.com/isaacsim/latest/installation/install_workstation.html>`_.
72+
1. Install `Isaac Sim <https://docs.isaacsim.omniverse.nvidia.com/latest/installation/install_workstation.html>`_.
7373

7474
2. Perform a shallow clone of the MoveIt 2 Tutorials repo.
7575

doc/how_to_guides/trac_ik/trac_ik_tutorial.rst

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,18 @@ From their documentation:
1212
By default, the IK search returns immediately when either of these algorithms converges to an answer.
1313
Secondary constraints of distance and manipulability are also provided in order to receive back the "best" IK solution.
1414

15-
The package `trac_ik_kinematics_plugin <https://bitbucket.org/traclabs/trac_ik/src/rolling-devel/trac_ik_kinematics_plugin/>`_ provides a ``KinematicsBase`` MoveIt interface that can replace the default KDL solver.
15+
The package `trac_ik_kinematics_plugin <https://bitbucket.org/traclabs/trac_ik/src/rolling/trac_ik_kinematics_plugin/>`_ provides a ``KinematicsBase`` MoveIt interface that can replace the default KDL solver.
1616
Currently, mimic joints are *not* supported.
1717

1818
Install
1919
-------
2020

21-
The ``rolling-devel`` branch of the TRAC-IK repository has the latest ROS 2 implementation.
22-
For now, the repository must be built from source in your ROS 2 workspace, for example ``~/moveit2_ws``. ::
21+
The ``rolling`` branch of the TRAC-IK repository has the latest ROS 2 implementation, but it is also available as binaries.
22+
23+
If you instead want to build from source, go to your ROS 2 workspace, for example ``~/moveit2_ws``. ::
2324

2425
cd ~/moveit2_ws/src
25-
git clone -b rolling-devel https://bitbucket.org/traclabs/trac_ik.git
26+
git clone -b rolling https://bitbucket.org/traclabs/trac_ik.git
2627

2728
Usage
2829
-----
@@ -38,7 +39,7 @@ Usage
3839
- **kinematics\_solver\_attempts** parameter is unneeded: unlike KDL, TRAC-IK solver already restarts when it gets stuck.
3940
- **kinematics\_solver\_search\_resolution** is not applicable here.
4041

41-
From the `trac_ik_lib <https://bitbucket.org/traclabs/trac_ik/src/rolling-devel/trac_ik_lib/>`_ package documentation (slightly modified), here is some information about the solve type parameter:
42+
From the `trac_ik_lib <https://bitbucket.org/traclabs/trac_ik/src/rolling/trac_ik_lib/>`_ package documentation (slightly modified), here is some information about the solve type parameter:
4243

4344
- ``Speed``: returns very quickly the first solution found.
4445
- ``Distance``: runs for the full timeout, then returns the solution that minimizes sum of squares error (SSE) from the seed.

0 commit comments

Comments
 (0)