From b2fed0972dedfdd140d20a83e4794a8cfaeb3b13 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 12 Jun 2023 08:47:14 +0200 Subject: [PATCH] Add gazebo/gz_ros2_control (#110) (#111) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add gazebo/gz_ros2_control (cherry picked from commit f0ae92425757e7f5d2bedb665b717ae44c519d53) Co-authored-by: Christoph Fröhlich --- .gitignore | 2 ++ doc/simulators/simulators.rst | 23 ++++++++++++++++------- make_help_scripts/deploy_defines | 2 +- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 91183dc54bd..c993f6a1fdb 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ _build/* doc/ros2_control doc/ros2_control_demos doc/ros2_controllers +doc/gazebo_ros2_control +doc/gz_ros2_control diff --git a/doc/simulators/simulators.rst b/doc/simulators/simulators.rst index cdbf27abd81..bbd74da7c39 100644 --- a/doc/simulators/simulators.rst +++ b/doc/simulators/simulators.rst @@ -1,14 +1,23 @@ .. _simulators: -################# -Simulators -################# +###################### +Simulator Integrations +###################### -This page hosts a list of supported simulators with ros2_control implementations. -To add your ros2_control integration, submit a PR to this page on Github! +Hosted by ros-controls +--------------------------------------------- + +.. toctree:: + :titlesonly: + + Gazebo <../gz_ros2_control/doc/index.rst> + Gazebo Classic <../gazebo_ros2_control/doc/index.rst> + +Community +--------------------------------------------- +This page hosts a list of supported simulators with *ros2_control* integration. +To add your *ros2_control* integration, submit a PR to this page on Github! -* `Gazebo `__ -* `Gazebo Classic `__ * `Isaac Sim `__ * `Webots `__ * Custom interfaces to simulators with a `Topic Based System `__ diff --git a/make_help_scripts/deploy_defines b/make_help_scripts/deploy_defines index 87826cf76e5..cfccbb18c8b 100755 --- a/make_help_scripts/deploy_defines +++ b/make_help_scripts/deploy_defines @@ -19,4 +19,4 @@ api_branch="master" # ["branch checked out for mutliversion"]="branch checked out for all subrepos" declare -A branch_version=( ["foxy"]="foxy" ["galactic"]="galactic" ["master"]="master") # master is rolling # the subrepos which are cloned into the branches and their corresponding url -declare -A subrepo_url=( ["ros2_control"]="https://github.com/ros-controls/ros2_control" ["ros2_controllers"]="https://github.com/ros-controls/ros2_controllers" ["ros2_control_demos"]="https://github.com/ros-controls/ros2_control_demos") +declare -A subrepo_url=( ["ros2_control"]="https://github.com/ros-controls/ros2_control" ["ros2_controllers"]="https://github.com/ros-controls/ros2_controllers" ["ros2_control_demos"]="https://github.com/ros-controls/ros2_control_demos" ["gazebo_ros2_control"]="https://github.com/ros-controls/gazebo_ros2_control" ["gz_ros2_control"]="https://github.com/ros-controls/gz_ros2_control")