Merge branch 'develop'

ROBOTIS-GIT · Jun 29, 2021 · 5013826 · 5013826
2 parents c70cf3b + fbcf1b3
commit 5013826
Show file tree

Hide file tree

Showing 17 changed files with 89 additions and 47 deletions.
diff --git a/.github/workflows/ros-ci.yml b/.github/workflows/ros-ci.yml
@@ -0,0 +1,52 @@
+name: ros-ci
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+on:
+ push:
+ branches: [ master, develop, kinetic-devel, melodic-devel, noetic-devel ]
+ pull_request:
+ branches: [ master, develop, kinetic-devel, melodic-devel, noetic-devel ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+ ros-ci:
+ runs-on: ubuntu-latest
+ strategy:
+ fail-fast: false
+ matrix:
+ ros_distribution:
+ - kinetic
+ - melodic
+ - noetic
+ include:
+ # Kinetic Kame (May 2016 - May 2021)
+ - docker_image: ubuntu:xenial
+ ros_distribution: kinetic
+ ros_version: 1
+ # Melodic Morenia (May 2018 - May 2023)
+ - docker_image: ubuntu:bionic
+ ros_distribution: melodic
+ ros_version: 1
+ # Noetic Ninjemys (May 2020 - May 2025)
+ - docker_image: ubuntu:focal
+ ros_distribution: noetic
+ ros_version: 1
+ container:
+ image: ${{ matrix.docker_image }}
+ steps:
+ - name: Setup directories
+ run: mkdir -p ros_ws/src
+ - name: checkout
+ uses: actions/checkout@v2
+ with:
+ path: ros_ws/src
+ - name: Setup ROS 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
+ with:
+ package-name: dynamixel_workbench
+ target-ros1-distro: ${{ matrix.ros_distribution }}
+ vcs-repo-file-url: "https://raw.githubusercontent.com/ROBOTIS-GIT/dynamixel-workbench/develop/workbench_ci.repos"
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,10 +1,9 @@
 # Dynamixel Workbench
 ![](https://github.com/ROBOTIS-GIT/emanual/blob/master/assets/images/sw/dynamixel/dynamixel_workbench/DYNAMIXEL_WORKBENCH_LOGO.png)
 
-## ROS Packages for Dynamixel Workbench
-|Version|Kinetic + Ubuntu Xenial|Melodic + Ubuntu Bionic|
-|:---:|:---:|:---:|
-|[![GitHub version](https://badge.fury.io/gh/ROBOTIS-GIT%2Fdynamixel-workbench.svg)](https://badge.fury.io/gh/ROBOTIS-GIT%2Fdynamixel-workbench)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/dynamixel-workbench.svg?branch=kinetic-devel)](https://travis-ci.org/ROBOTIS-GIT/dynamixel-workbench)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/dynamixel-workbench.svg?branch=melodic-devel)](https://travis-ci.org/ROBOTIS-GIT/dynamixel-workbench)|
+[![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)
 
 ## ROBOTIS e-Manual for Dynamixel Workbench
 - [ROBOTIS e-Manual for Dynamixel Workbench](http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_workbench/)

diff --git a/dynamixel_workbench/CHANGELOG.rst b/dynamixel_workbench/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package dynamixel_workbench
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.2.1 (2021-06-29)
+------------------
+* Added 2XC430-W250, XL330 series
+* Contributors: Will Son, t-kitajima, Hye-jong KIM
+
 2.2.0 (2020-09-25)
 ------------------
 * Added XW540

diff --git a/dynamixel_workbench/CMakeLists.txt b/dynamixel_workbench/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.0.2)
 project(dynamixel_workbench)
 find_package(catkin REQUIRED)
 catkin_metapackage()
diff --git a/dynamixel_workbench/package.xml b/dynamixel_workbench/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
  <name>dynamixel_workbench</name>
- <version>2.2.0</version>
+ <version>2.2.1</version>
  <description>
  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_controllers/CHANGELOG.rst b/dynamixel_workbench_controllers/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package dynamixel_workbench_controllers
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.2.1 (2021-06-29)
+------------------
+* Added 2XC430-W250, XL330 series
+* Contributors: Will Son, t-kitajima, Hye-jong KIM
+
 2.2.0 (2020-09-25)
 ------------------
 * Added XW540

diff --git a/dynamixel_workbench_controllers/CMakeLists.txt b/dynamixel_workbench_controllers/CMakeLists.txt
@@ -1,7 +1,7 @@
 ################################################################################
 # Set minimum required version of cmake, project name and compile options
 ################################################################################
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.0.2)
 project(dynamixel_workbench_controllers)
 
 ## Compile as C++11, supported in ROS Kinetic and newer

diff --git a/dynamixel_workbench_controllers/package.xml b/dynamixel_workbench_controllers/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
  <name>dynamixel_workbench_controllers</name>
- <version>2.2.0</version>
+ <version>2.2.1</version>
  <description>
  This package contains examples of applying the 'dynamixel_workbench_toolbox' library developed on the basis of dynamixel_sdk to various operating modes of Dynamixel.
  </description>

diff --git a/dynamixel_workbench_operators/CHANGELOG.rst b/dynamixel_workbench_operators/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package dynamixel_workbench_tutorials
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.2.1 (2021-06-29)
+------------------
+* Added 2XC430-W250, XL330 series
+* Contributors: Will Son, t-kitajima, Hye-jong KIM
+
 2.2.0 (2020-09-25)
 ------------------
 * Added XW540

diff --git a/dynamixel_workbench_operators/CMakeLists.txt b/dynamixel_workbench_operators/CMakeLists.txt
@@ -1,7 +1,7 @@
 ################################################################################
 # Set minimum required version of cmake, project name and compile options
 ################################################################################
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.0.2)
 project(dynamixel_workbench_operators)
 
 ## Compile as C++11, supported in ROS Kinetic and newer

diff --git a/dynamixel_workbench_operators/package.xml b/dynamixel_workbench_operators/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
  <name>dynamixel_workbench_operators</name>
- <version>2.2.0</version>
+ <version>2.2.1</version>
  <description>
  This package contains nodes that control the Dynamixel by communicating with the server registered in the 'dynamixel_workbench_controllers' package
  </description>

diff --git a/dynamixel_workbench_toolbox/CHANGELOG.rst b/dynamixel_workbench_toolbox/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package dynamixel_workbench_toolbox
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.2.1 (2021-06-29)
+------------------
+* Added 2XC430-W250, XL330 series
+* Contributors: Will Son, t-kitajima, Hye-jong KIM
+
 2.2.0 (2020-09-25)
 ------------------
 * Added XW540

diff --git a/dynamixel_workbench_toolbox/CMakeLists.txt b/dynamixel_workbench_toolbox/CMakeLists.txt
@@ -1,7 +1,7 @@
 ################################################################################
 # Set minimum required version of cmake, project name and compile options
 ################################################################################
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.0.2)
 project(dynamixel_workbench_toolbox)
 
 ## Compile as C++11, supported in ROS Kinetic and newer

diff --git a/dynamixel_workbench_toolbox/examples/CMakeLists.txt b/dynamixel_workbench_toolbox/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.0.2)
 project(dynamixel_workbench)
 
 add_compile_options(-std=c++11)

diff --git a/dynamixel_workbench_toolbox/package.xml b/dynamixel_workbench_toolbox/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
  <name>dynamixel_workbench_toolbox</name>
- <version>2.2.0</version>
+ <version>2.2.1</version>
  <description>
  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 Dynamixels.

diff --git a/workbench_ci.repos b/workbench_ci.repos
@@ -0,0 +1,5 @@
+repositories:
+ util/dynamixel_workbench_msgs:
+ type: git
+ url: https://github.com/ROBOTIS-GIT/dynamixel-workbench-msgs.git
+ version: develop