Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/humble' into mergify/bp/humble/p…
Browse files Browse the repository at this point in the history
…r-727
  • Loading branch information
sea-bass committed Aug 8, 2023
2 parents f0d3e9f + 705571e commit c8d89c2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
"display_github": True,
"github_user": "ros-planning",
"github_repo": "moveit2_tutorials",
"github_version": "main/",
"github_version": "humble/",
"conf_py_path": "",
"source_suffix": ".rst",
}
Expand Down
4 changes: 2 additions & 2 deletions doc/examples/realtime_servo/realtime_servo_tutorial.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Launching a Servo Node
----------------------
MoveIt Servo can be launched as a "node component" or a standalone node. The launch file, moveit_servo/servo_example.launch.py, launches a standalone node by default but also contains a commented component node. Commands are sent via ROS topics. The commands can come from anywhere, such as a joystick, keyboard, or other controller.

This demo was written for an Xbox 1 controller, but can be easily modified to use any controller compatible with the `Joy package <https://index.ros.org/p/joy/#{DISTRO}>`_ by modifying the `joystick_servo_example.cpp file <https://github.com/ros-planning/moveit2/blob/main/moveit_ros/moveit_servo/src/teleop_demo/joystick_servo_example.cpp>`_
This demo was written for an Xbox 1 controller, but can be easily modified to use any controller compatible with the `Joy package <https://index.ros.org/p/joy/#{DISTRO}>`_ by modifying the :moveit_codedir:`joystick_servo_example.cpp file <moveit_ros/moveit_servo/src/teleop_demo/joystick_servo_example.cpp>`.

To run the demo, make sure your controller is plugged in and can be detected by :code:`ros2 run joy joy_node`. Usually this happens automatically after plugging the controller in. Then launch with ::

Expand Down Expand Up @@ -129,7 +129,7 @@ Requirements for incoming command messages, regardless of input device are:
Servo Configs
^^^^^^^^^^^^^

The `demo config file <https://github.com/ros-planning/moveit2/blob/main/moveit_ros/moveit_servo/config/panda_simulated_config.yaml>`_ shows the parameters needed for MoveIt Servo and is well documented.
The :moveit_codedir:`demo config file <moveit_ros/moveit_servo/config/panda_simulated_config.yaml>` shows the parameters needed for MoveIt Servo and is well documented.

Start with the parameters from the demo file, but some must be changed for your specific setup:
1. :code:`robot_link_command_frame`: Update this to be a valid frame in your robot, recommended as the planning frame or EEF frame
Expand Down

0 comments on commit c8d89c2

Please sign in to comment.