Merge pull request #214 from ROBOTIS-GIT/develop

Develop
ROBOTIS-GIT · Jul 9, 2021 · db34bde · db34bde
2 parents 3e308f8 + 0e9011d
commit db34bde
Show file tree

Hide file tree

Showing 25 changed files with 134 additions and 76 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, melodic-devel, noetic-devel ]
+  pull_request:
+    branches: [ master, develop, 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: open_manipulator
+          target-ros1-distro: ${{ matrix.ros_distribution }}
+          vcs-repo-file-url: "https://raw.githubusercontent.com/ROBOTIS-GIT/open_manipulator/develop/openmanipulator.repos"
diff --git a/.open_manipulator.rosinstall b/.open_manipulator.rosinstall
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -2,10 +2,11 @@
 <img src="https://github.com/ROBOTIS-GIT/emanual/blob/master/assets/images/platform/openmanipulator_x/OpenManipulator.png">
 <img src="https://github.com/ROBOTIS-GIT/emanual/blob/master/assets/images/platform/openmanipulator_x/OpenManipulator_Chain_Capture.png" width="500">
 
-## ROS Packages for OpenManipulator
-|Version|Kinetic + Ubuntu Xenial|Melodic + Ubuntu Bionic|
-|:---:|:---:|:---:|
-|[![GitHub version](https://badge.fury.io/gh/ROBOTIS-GIT%2Fopen_manipulator.svg)](https://badge.fury.io/gh/ROBOTIS-GIT%2Fopen_manipulator)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/open_manipulator.svg?branch=kinetic-devel)](https://travis-ci.org/ROBOTIS-GIT/open_manipulator)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/open_manipulator.svg?branch=melodic-devel)](https://travis-ci.org/ROBOTIS-GIT/open_manipulator)|
+[![kinetic-devel Status](https://github.com/ROBOTIS-GIT/open_manipulator/workflows/kinetic-devel/badge.svg)](https://github.com/ROBOTIS-GIT/open_manipulator/tree/kinetic-devel)
+
+[![melodic-devel Status](https://github.com/ROBOTIS-GIT/open_manipulator/workflows/melodic-devel/badge.svg)](https://github.com/ROBOTIS-GIT/open_manipulator/tree/melodic-devel)
+
+[![noetic-devel Status](https://github.com/ROBOTIS-GIT/open_manipulator/workflows/noetic-devel/badge.svg)](https://github.com/ROBOTIS-GIT/open_manipulator/tree/noetic-devel)
 
 ## ROBOTIS e-Manual for OpenManipulator
 - [ROBOTIS e-Manual for OpenManipulator](http://emanual.robotis.com/docs/en/platform/openmanipulator/)

diff --git a/open_manipulator/CHANGELOG.rst b/open_manipulator/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package open_manipulator
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.0.2 (2021-06-21)
+------------------
+* Noetic support
+* Remove use_gui param from joint_state_publisher package
+* Contributors: Will Son
+
 2.0.1 (2019-02-18)
 ------------------
 * added dependency option for open_manipulator_control_gui package

diff --git a/open_manipulator/CMakeLists.txt b/open_manipulator/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.0.2)
 project(open_manipulator)
 find_package(catkin REQUIRED)
 catkin_metapackage()
diff --git a/open_manipulator/package.xml b/open_manipulator/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>open_manipulator</name>
-  <version>2.0.1</version>
+  <version>2.0.2</version>
   <description>
     ROS-enabled OpenManipulator is a full open robot platform consisting of OpenSoftware, OpenHardware and OpenCR(Embedded board).
     The OpenManipulator is allowed users to control it more easily by linking with the MoveIt! package. Moreover it has full hardware compatibility with TurtleBot3. 
@@ -12,7 +12,7 @@
   <author email="hjkim@robotis.com">Hye-Jong KIM</author>
   <author email="jhshim@robotis.com">Ryan Shim</author>
   <author email="yhna@robotis.com">Yong-Ho Na</author>
-  <maintainer email="pyo@robotis.com">Pyo</maintainer>
+  <maintainer email="willson@robotis.com">Will Son</maintainer>
   <url type="website">http://wiki.ros.org/open_manipulator</url>
   <url type="emanual">http://emanual.robotis.com/docs/en/platform/openmanipulator</url>
   <url type="repository">https://github.com/ROBOTIS-GIT/open_manipulator</url>

diff --git a/open_manipulator_control_gui/CHANGELOG.rst b/open_manipulator_control_gui/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package open_manipulator_control_gui
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.0.2 (2021-06-21)
+------------------
+* Noetic support
+* Contributors: Will Son
+
 2.0.1 (2019-02-18)
 ------------------
 * added dependency option for open_manipulator_control_gui package

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

diff --git a/open_manipulator_control_gui/package.xml b/open_manipulator_control_gui/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>open_manipulator_control_gui</name>
-  <version>2.0.1</version>
+  <version>2.0.2</version>
   <description>
     OpenManipulator GUI control package based on QT
   </description>
@@ -10,8 +10,7 @@
   <author email="hjkim@robotis.com">Hye-Jong KIM</author>
   <author email="jhshim@robotis.com">Ryan Shim</author>
   <author email="yhna@robotis.com">Yong-Ho Na</author>
-  <maintainer email="pyo@robotis.com">Pyo</maintainer>
-  <maintainer email="hjkim@robotis.com">Hye-Jong KIM</maintainer>
+  <maintainer email="willson@robotis.com">Will Son</maintainer>
   <url type="website">http://wiki.ros.org/open_manipulator_control_gui</url>
   <url type="emanual">http://emanual.robotis.com/docs/en/platform/openmanipulator</url>
   <url type="repository">https://github.com/ROBOTIS-GIT/open_manipulator</url>

diff --git a/open_manipulator_controller/CHANGELOG.rst b/open_manipulator_controller/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package open_manipulator_controller
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.0.2 (2021-06-21)
+------------------
+* Noetic support
+* Contributors: Will Son
+
 2.0.1 (2019-02-18)
 ------------------
 * none

diff --git a/open_manipulator_controller/CMakeLists.txt b/open_manipulator_controller/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(open_manipulator_controller)
 
 add_compile_options(-std=c++11)

diff --git a/open_manipulator_controller/package.xml b/open_manipulator_controller/package.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>open_manipulator_controller</name>
-  <version>2.0.1</version>
+  <version>2.0.2</version>
   <description>OpenManipulator controller package</description>
 
   <license>Apache 2.0</license>
   <author email="thlim@robotis.com">Darby Lim</author>
   <author email="hjkim@robotis.com">Hye-Jong KIM</author>
   <author email="jhshim@robotis.com">Ryan Shim</author>
   <author email="yhna@robotis.com">Yong-Ho Na</author>
-  <maintainer email="pyo@robotis.com">Pyo</maintainer>
-  <maintainer email="hjkim@robotis.com">Hye-Jong KIM</maintainer>
+  <maintainer email="willson@robotis.com">Will Son</maintainer>
   <url type="website">http://wiki.ros.org/open_manipulator_controller</url>
   <url type="emanual">http://emanual.robotis.com/docs/en/platform/openmanipulator</url>
   <url type="repository">https://github.com/ROBOTIS-GIT/open_manipulator</url>

diff --git a/open_manipulator_description/CHANGELOG.rst b/open_manipulator_description/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package open_manipulator_description
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.0.2 (2021-06-21)
+------------------
+* Noetic support
+* Remove use_gui param from joint_state_publisher package
+* Contributors: Will Son
+
 2.0.1 (2019-02-18)
 ------------------
 * none

diff --git a/open_manipulator_description/CMakeLists.txt b/open_manipulator_description/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(open_manipulator_description)
 
 ################################################################################

diff --git a/open_manipulator_description/launch/open_manipulator_rviz.launch b/open_manipulator_description/launch/open_manipulator_rviz.launch
@@ -1,11 +1,8 @@
 <launch>
-  <arg name="use_gui"        default="false" />
-
   <include file="$(find open_manipulator_description)/launch/open_manipulator_upload.launch"/>
 
   <!-- Send joint values -->
   <node pkg="joint_state_publisher" type="joint_state_publisher" name="joint_state_publisher">
-    <param name="/use_gui" value="$(arg use_gui)"/>
     <rosparam param="source_list" subst_value="true">["joint_states"]</rosparam>
   </node>
 

diff --git a/open_manipulator_description/package.xml b/open_manipulator_description/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>open_manipulator_description</name>
-  <version>2.0.1</version>
+  <version>2.0.2</version>
   <description>
     OpenManipulator 3D model description for visualization and simulation 
   </description>
@@ -10,8 +10,7 @@
   <author email="hjkim@robotis.com">Hye-Jong KIM</author>
   <author email="jhshim@robotis.com">Ryan Shim</author>
   <author email="yhna@robotis.com">Yong-Ho Na</author>
-  <maintainer email="pyo@robotis.com">Pyo</maintainer>
-  <maintainer email="hjkim@robotis.com">Hye-Jong KIM</maintainer>
+  <maintainer email="willson@robotis.com">Will Son</maintainer>
   <url type="website">http://wiki.ros.org/open_manipulator_description</url>
   <url type="emanual">http://emanual.robotis.com/docs/en/platform/openmanipulator</url>
   <url type="repository">https://github.com/ROBOTIS-GIT/open_manipulator</url>

diff --git a/open_manipulator_description/urdf/open_manipulator.urdf.xacro b/open_manipulator_description/urdf/open_manipulator.urdf.xacro
@@ -266,13 +266,13 @@
   </link>
 
   <!-- Realsense Camera Joint Position -->
-  <joint name="camera_joint" type="fixed">
+<!--   <joint name="camera_joint" type="fixed">
     <axis xyz="0 1 0" />
     <origin xyz="0.070 0.032 0.052" rpy="0 0 0"/> 
     <parent link="link5"/>
     <child link="camera_link"/>
   </joint>
 
-  <link name="camera_link"/>
+  <link name="camera_link"/> -->
 
 </robot>
diff --git a/open_manipulator_libs/CHANGELOG.rst b/open_manipulator_libs/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package open_manipulator_libs
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.0.2 (2021-06-21)
+------------------
+* Noetic support
+* Contributors: Will Son
+
 2.0.1 (2019-02-18)
 ------------------
 * none

diff --git a/open_manipulator_libs/CMakeLists.txt b/open_manipulator_libs/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(open_manipulator_libs)
 
 add_compile_options(-std=c++11)

diff --git a/open_manipulator_libs/package.xml b/open_manipulator_libs/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>open_manipulator_libs</name>
-  <version>2.0.1</version>
+  <version>2.0.2</version>
   <description>
     OpenManipulator library (Kinematics lib., Dynamixel lib., Drawing path lib.)
   </description>
@@ -10,16 +10,16 @@
   <author email="hjkim@robotis.com">Hye-Jong KIM</author>
   <author email="jhshim@robotis.com">Ryan Shim</author>
   <author email="yhna@robotis.com">Yong-Ho Na</author>
-  <maintainer email="pyo@robotis.com">Pyo</maintainer>
-  <maintainer email="hjkim@robotis.com">Hye-Jong KIM</maintainer>
+  <maintainer email="willson@robotis.com">Will Son</maintainer>
   <url type="website">http://wiki.ros.org/open_manipulator_libs</url>
   <url type="emanual">http://emanual.robotis.com/docs/en/platform/openmanipulator</url>
   <url type="repository">https://github.com/ROBOTIS-GIT/open_manipulator</url>
   <url type="bugtracker">https://github.com/ROBOTIS-GIT/open_manipulator/issues</url>
   <buildtool_depend>catkin</buildtool_depend>
-  <depend>roscpp</depend>
-  <depend>robotis_manipulator</depend>
-  <depend>dynamixel_workbench_toolbox</depend>
+  <buildtool_depend>robotis_manipulator</buildtool_depend>
   <depend>cmake_modules</depend>
+  <depend>dynamixel_workbench_toolbox</depend>
   <depend>eigen</depend>
+  <depend>robotis_manipulator</depend>
+  <depend>roscpp</depend>
 </package>
diff --git a/open_manipulator_teleop/CHANGELOG.rst b/open_manipulator_teleop/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package open_manipulator_teleop
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.0.2 (2021-06-21)
+------------------
+* Noetic support
+* Contributors: Will Son
+
 2.0.1 (2019-02-18)
 ------------------
 * none

diff --git a/open_manipulator_teleop/CMakeLists.txt b/open_manipulator_teleop/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(open_manipulator_teleop)
 
 add_compile_options(-std=c++11)

diff --git a/open_manipulator_teleop/package.xml b/open_manipulator_teleop/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>open_manipulator_teleop</name>
-  <version>2.0.1</version>
+  <version>2.0.2</version>
   <description>
     Provides teleoperation using keyboard for OpenManipulator.
   </description>
@@ -10,8 +10,7 @@
   <author email="hjkim@robotis.com">Hye-Jong KIM</author>
   <author email="jhshim@robotis.com">Ryan Shim</author>
   <author email="yhna@robotis.com">Yong-Ho Na</author>
-  <maintainer email="pyo@robotis.com">Pyo</maintainer>
-  <maintainer email="hjkim@robotis.com">Hye-Jong KIM</maintainer>
+  <maintainer email="willson@robotis.com">Will Son</maintainer>
   <url type="website">http://wiki.ros.org/open_manipulator_teleop</url>
   <url type="emanual">http://emanual.robotis.com/docs/en/platform/openmanipulator</url>
   <url type="repository">https://github.com/ROBOTIS-GIT/open_manipulator</url>