From 2f00271c51588a9718ba0cb3041763455739d70e Mon Sep 17 00:00:00 2001 From: Will Son Date: Thu, 6 Oct 2022 16:58:07 +0900 Subject: [PATCH] prepare for ROS2 release Signed-off-by: Will Son --- .github/workflows/dynamixel_workbench.repos | 5 +++ .github/workflows/ros-ci.yml | 36 ++++++++++--------- README.md | 2 ++ dynamixel_workbench/CHANGELOG.rst | 4 +++ dynamixel_workbench/package.xml | 2 +- dynamixel_workbench_toolbox/CHANGELOG.rst | 4 +++ dynamixel_workbench_toolbox/CMakeLists.txt | 8 ++++- .../library.properties | 4 +-- dynamixel_workbench_toolbox/package.xml | 2 +- 9 files changed, 46 insertions(+), 21 deletions(-) create mode 100644 .github/workflows/dynamixel_workbench.repos diff --git a/.github/workflows/dynamixel_workbench.repos b/.github/workflows/dynamixel_workbench.repos new file mode 100644 index 00000000..ded330cf --- /dev/null +++ b/.github/workflows/dynamixel_workbench.repos @@ -0,0 +1,5 @@ +repositories: + dynamixel_workbench/dynamixel_workbench_msgs: + type: git + url: https://github.com/ROBOTIS-GIT/dynamixel-workbench-msgs.git + version: ros2 diff --git a/.github/workflows/ros-ci.yml b/.github/workflows/ros-ci.yml index 8a173897..d76fa66d 100644 --- a/.github/workflows/ros-ci.yml +++ b/.github/workflows/ros-ci.yml @@ -1,4 +1,4 @@ -name: ros2-ci +name: ros2 # Controls when the action will run. Triggers the workflow on push or pull request on: @@ -15,17 +15,25 @@ jobs: fail-fast: false matrix: ros_distribution: - # - foxy - # - galactic + - foxy + - galactic + - humble - rolling include: - # - docker_image: ubuntu:focal - # ros_distribution: foxy - # ros_version: 2 - # - docker_image: ubuntu:focal - # ros_distribution: galactic - # ros_version: 2 - - docker_image: ubuntu:focal + # Foxy Fitzroy (June 2020 - May 2023) + - docker_image: rostooling/setup-ros-docker:ubuntu-focal-ros-foxy-ros-base-latest + ros_distribution: foxy + ros_version: 2 + # Galactic Geochelone (May 2021) + - docker_image: rostooling/setup-ros-docker:ubuntu-focal-ros-galactic-ros-base-latest + ros_distribution: galactic + ros_version: 2 + # Humble Hawksbill (May 2027) + - docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-humble-ros-base-latest + ros_distribution: humble + ros_version: 2 + # Rolling + - docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-rolling-ros-base-latest ros_distribution: rolling ros_version: 2 container: @@ -37,13 +45,9 @@ jobs: uses: actions/checkout@v2 with: path: ros_ws/src - - name: Setup ROS2 environment - uses: ros-tooling/setup-ros@0.2.1 - with: - required-ros-distributions: ${{ matrix.ros_distribution }} - name: Build and Test - uses: ros-tooling/action-ros-ci@v0.2 + uses: ros-tooling/action-ros-ci@0.2.6 with: package-name: dynamixel_workbench target-ros2-distro: ${{ matrix.ros_distribution }} - vcs-repo-file-url: "" + vcs-repo-file-url: "https://raw.githubusercontent.com/ROBOTIS-GIT/dynamixel-workbench/ros2-devel/.github/workflows/dynamixel_workbench.repos" diff --git a/README.md b/README.md index 17b2cc60..5d79dd38 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,10 @@ [![kinetic-devel Status](https://github.com/ROBOTIS-GIT/dynamixel-workbench/workflows/kinetic-devel/badge.svg)](https://github.com/ROBOTIS-GIT/dynamixel-workbench/tree/kinetic-devel) [![melodic-devel Status](https://github.com/ROBOTIS-GIT/dynamixel-workbench/workflows/melodic-devel/badge.svg)](https://github.com/ROBOTIS-GIT/dynamixel-workbench/tree/melodic-devel) [![noetic-devel Status](https://github.com/ROBOTIS-GIT/dynamixel-workbench/workflows/noetic-devel/badge.svg)](https://github.com/ROBOTIS-GIT/dynamixel-workbench/tree/noetic-devel) + [![foxy-devel Status](https://github.com/ROBOTIS-GIT/dynamixel-workbench/workflows/foxy-devel/badge.svg)](https://github.com/ROBOTIS-GIT/dynamixel-workbench/tree/foxy-devel) [![galactic-devel Status](https://github.com/ROBOTIS-GIT/dynamixel-workbench/workflows/galactic-devel/badge.svg)](https://github.com/ROBOTIS-GIT/dynamixel-workbench/tree/galactic-devel) +[![humble-devel Status](https://github.com/ROBOTIS-GIT/dynamixel-workbench/workflows/humble-devel/badge.svg)](https://github.com/ROBOTIS-GIT/dynamixel-workbench/tree/humble-devel) [![ROS2 Rolling Status](https://github.com/ROBOTIS-GIT/dynamixel-workbench/workflows/ros2-ci/badge.svg)](https://github.com/ROBOTIS-GIT/dynamixel-workbench/tree/ros2) # Dynamixel Workbench diff --git a/dynamixel_workbench/CHANGELOG.rst b/dynamixel_workbench/CHANGELOG.rst index 71fbab71..d2df1cb8 100644 --- a/dynamixel_workbench/CHANGELOG.rst +++ b/dynamixel_workbench/CHANGELOG.rst @@ -2,6 +2,10 @@ Changelog for package dynamixel_workbench ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.3 (2022-10-06) +------------------ +* ROS2 release (Foxy, Galactic, Humble) + 2.2.2 (2022-01-25) ------------------ * ROS2 package update only diff --git a/dynamixel_workbench/package.xml b/dynamixel_workbench/package.xml index 67b986bf..79288711 100644 --- a/dynamixel_workbench/package.xml +++ b/dynamixel_workbench/package.xml @@ -2,7 +2,7 @@ dynamixel_workbench - 2.2.2 + 2.2.3 Dynamixel-Workbench is dynamixel solution for ROS. This metapackage allows you to easily change the ID, baudrate and operating mode of the Dynamixel. diff --git a/dynamixel_workbench_toolbox/CHANGELOG.rst b/dynamixel_workbench_toolbox/CHANGELOG.rst index f3d478ae..74289fc1 100644 --- a/dynamixel_workbench_toolbox/CHANGELOG.rst +++ b/dynamixel_workbench_toolbox/CHANGELOG.rst @@ -2,6 +2,10 @@ Changelog for package dynamixel_workbench_toolbox ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.3 (2022-10-06) +------------------ +* ROS2 release (Foxy, Galactic, Humble) + 2.2.2 (2022-01-25) ------------------ * ROS2 package update only diff --git a/dynamixel_workbench_toolbox/CMakeLists.txt b/dynamixel_workbench_toolbox/CMakeLists.txt index b8992d4a..ff6e7f1e 100644 --- a/dynamixel_workbench_toolbox/CMakeLists.txt +++ b/dynamixel_workbench_toolbox/CMakeLists.txt @@ -9,7 +9,13 @@ if(NOT CMAKE_CXX_STANDARD) endif() if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - add_compile_options(-Wall -Wextra -Wpedantic) +add_compile_options(-Wall -Wextra -Wpedantic) +endif() + +if(MSVC) + add_compile_definitions( + _USE_MATH_DEFINES + ) endif() ################################################################################ diff --git a/dynamixel_workbench_toolbox/library.properties b/dynamixel_workbench_toolbox/library.properties index cbdee9ab..7576429e 100644 --- a/dynamixel_workbench_toolbox/library.properties +++ b/dynamixel_workbench_toolbox/library.properties @@ -1,7 +1,7 @@ name=DynamixelWorkbench -version=0.1.0 +version=2.2.3 author=Darby Lim (thlim@robotis.com) -maintainer=Pyo (pyo@robotis.com) +maintainer=Will Son (willson@robotis.com) sentence=DynamixelWorkbench using DynamixelSDK paragraph=Tools for Dynamixel category=Other diff --git a/dynamixel_workbench_toolbox/package.xml b/dynamixel_workbench_toolbox/package.xml index e8044afe..14f69437 100644 --- a/dynamixel_workbench_toolbox/package.xml +++ b/dynamixel_workbench_toolbox/package.xml @@ -2,7 +2,7 @@ dynamixel_workbench_toolbox - 2.2.2 + 2.2.3 This package is composed of 'dynamixel_item', 'dynamixel_tool', 'dynamixel_driver' and 'dynamixel_workbench' class. The 'dynamixel_item' is saved as control table item and information of DYNAMIXEL.