Skip to content

Commit

Permalink
Merge branch 'dev-humble-launch' of github.com:lbr-stack/lbr_fri_ros2…
Browse files Browse the repository at this point in the history
…_stack into dev-humble-launch
  • Loading branch information
mhubii committed Sep 10, 2024
2 parents 677e820 + 70a6f00 commit c361e6f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Humble v1.4.2 (2023-12-29)
Humble v1.4.1 (2023-12-15)
--------------------------
* Removes the ``base_frame`` parameter from ``lbr_bringup``, ``lbr_description``, ``lbr_fri_ros2``, ``lbr_ros2_control``
* Updates RViZ default config in ``lbr_moveit_config``
* Updates RViz default config in ``lbr_moveit_config``
* Refers to https://github.com/lbr-stack/lbr_fri_ros2_stack/pull/144

Humble v1.4.0 (2023-12-08)
Expand Down
4 changes: 2 additions & 2 deletions lbr_bringup/doc/lbr_bringup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ This launch file will spin up ``RViz`` for visualization. It will (see `rviz.lau
List all arguments for the launch file via ``ros2 launch lbr_bringup rviz.launch.py -s``.

.. note::
Requires the user to run `Mock Setup`_, `Gazebo Simulation`_ or `Launch Hardware`_ first.
Requires the user to run `Mock Setup`_, `Gazebo Simulation`_ or `Hardware`_ first.

MoveIt
~~~~~~
Expand All @@ -135,7 +135,7 @@ Please note that MoveIt configurations are specific and you as a user will need
rviz:=true
.. note::
Requires the user to run `Mock Setup`_, `Gazebo Simulation`_ or `Launch Hardware`_ first.
Requires the user to run `Mock Setup`_, `Gazebo Simulation`_ or `Hardware`_ first.

.. note::
Runs ``RViz`` with specific MoveIt configurations.
Expand Down
12 changes: 6 additions & 6 deletions lbr_demos/lbr_moveit_py/doc/lbr_moveit_py.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ lbr_demos_moveit_py
.. warning::
On hardware, do always execute in ``T1`` mode first.

MoveIt via RViZ
MoveIt via RViz
-----------------
.. image:: img/iiwa7_moveit_rviz.png
:align: center
:alt: MoveIt via RViZ
**IIWA 7 R800 in RViZ**
:alt: MoveIt via RViz
**IIWA 7 R800 in RViz**

To run MoveIt via RViZ, simply follow:
To run MoveIt via RViz, simply follow:

Simulation
~~~~~~~~~~
Expand All @@ -25,12 +25,12 @@ Simulation

.. code-block:: bash
ros2 launch lbr_moveit_py move_group.launch.py \
ros2 launch lbr_bringup move_group.launch.py \
mode:=mock \
rviz:=true \
model:=iiwa7 # [iiwa7, iiwa14, med7, med14]
#. You can now move the robot via MoveIt in RViZ!
#. You can now move the robot via MoveIt in RViz!

Hardware
~~~~~~~~
Expand Down

0 comments on commit c361e6f

Please sign in to comment.