Merge remote-tracking branch 'remotes/origin/master' into develop

2018-04-06 10:32:21 +09:00 · 2018-04-06 10:32:21 +09:00 · 108f29e62b
commit 108f29e62b
parent e91a796b12 188ea87e9f
17 changed files with 260 additions and 92 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,32 @@
+# This config file for Travis CI utilizes ros-industrial/industrial_ci package.
+# For more info for the package, see https://github.com/ros-industrial/industrial_ci/blob/master/README.rst
+
+sudo: required
+dist: trusty
+services:
+  - docker
+language: generic
+python:
+  - "2.7"
+compiler:
+  - gcc
+notifications:
+  email:
+    on_success: change
+    on_failure: always
+    recipients:
+      - pyo@robotis.com
+env:
+  matrix:
+    - ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian
+#   - ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=jessie
+branches:
+  only:
+    - master
+    - develop
+    - kinetic-devel
+install:
+  - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
+script:
+  - source .ci_config/travis.sh
+  
--- a/README.md
+++ b/README.md
@ -0,0 +1,36 @@
+# ROBOTIS OP3
+<img src="https://github.com/ROBOTIS-GIT/emanual/blob/master/assets/images/platform/op3/default_op3.jpg" width="40%" />  
+
+## ROS Packages for ROBOTIS OP3 Messages
+|Version|Kinetic + Ubuntu Xenial|Melodic + Ubuntu Bionic|
+|:---:|:---:|:---:|
+|[![GitHub version](https://badge.fury.io/gh/ROBOTIS-GIT%2FROBOTIS-OP3-msgs.svg)](https://badge.fury.io/gh/ROBOTIS-GIT%2FROBOTIS-OP3-msgs)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/ROBOTIS-OP3-msgs.svg?branch=kinetic-devel)](https://travis-ci.org/ROBOTIS-GIT/ROBOTIS-OP3-msgs)|-|
+
+## ROBOTIS e-Manual for ROBOTIS OP3
+- [ROBOTIS e-Manual for ROBOTIS OP3](http://emanual.robotis.com/docs/en/platform/op3/introduction/)
+
+## Wiki for robotis_op3_common Packages
+- http://wiki.ros.org/robotis_op3_msgs (metapackage)
+- http://wiki.ros.org/op3_action_module_msgs
+- http://wiki.ros.org/op3_offset_tuner_msgs
+- http://wiki.ros.org/op3_online_walking_module_msgs
+- http://wiki.ros.org/op3_walking_module_msgs
+
+## Open Source related to ROBOTIS OP3
+- [robotis_op3](https://github.com/ROBOTIS-GIT/ROBOTIS-OP3)
+- [robotis_op3_msgs](https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-msgs)
+- [robotis_op3_common](https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Common)
+- [robotis_op3_tools](https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Tools)
+- [robotis_op3_demo](https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Demo)
+- [robotis_framework](https://github.com/ROBOTIS-GIT/ROBOTIS-Framework)
+- [robotis_controller_msgs](https://github.com/ROBOTIS-GIT/ROBOTIS-Framework-msgs)
+- [robotis_utility](https://github.com/ROBOTIS-GIT/ROBOTIS-Utility)
+- [robotis_math](https://github.com/ROBOTIS-GIT/ROBOTIS-Math)
+- [dynamixel_sdk](https://github.com/ROBOTIS-GIT/DynamixelSDK)
+- [OpenCR-Hardware](https://github.com/ROBOTIS-GIT/OpenCR-Hardware)
+- [OpenCR](https://github.com/ROBOTIS-GIT/OpenCR)
+
+## Documents and Videos related to ROBOTIS OP3
+- [ROBOTIS e-Manual for ROBOTIS OP3](http://emanual.robotis.com/docs/en/platform/op3/introduction/)
+- [ROBOTIS e-Manual for ROBOTIS Framework](http://emanual.robotis.com/docs/en/software/robotis_framework_packages/)
+- [ROBOTIS e-Manual for Dynamixel SDK](http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_sdk/overview/)
--- a/op3_action_module_msgs/CHANGELOG.rst
+++ b/op3_action_module_msgs/CHANGELOG.rst
@ -0,0 +1,13 @@
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Changelog for package op3_action_module_msgs
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+0.1.1 (2018-03-21)
+------------------
+* changed package.xml format to v2
+* Contributors: Pyo
+
+0.1.0 (2017-10-27)
+------------------
+* added msg package for ROBOTIS OP3
+* Contributors: Kayman
--- a/op3_action_module_msgs/CMakeLists.txt
+++ b/op3_action_module_msgs/CMakeLists.txt
@ -1,18 +1,21 @@
 ################################################################################
-# CMake
+# Set minimum required version of cmake, project name and compile options
 ################################################################################
 cmake_minimum_required(VERSION 2.8.3)
 project(op3_action_module_msgs)

-
 ################################################################################
-# Packages
+# Find catkin packages and libraries for catkin and system dependencies
 ################################################################################
 find_package(catkin REQUIRED COMPONENTS
  std_msgs
  message_generation
 )

+################################################################################
+# Setup for python modules and scripts
+################################################################################
+
 ################################################################################
 # Declare ROS messages, services and actions
 ################################################################################
@ -36,10 +39,10 @@ generate_messages(
 ################################################################################

 ################################################################################
-# Catkin specific configuration
+# Declare catkin specific configuration to be passed to dependent projects
 ################################################################################
 catkin_package(
-  CATKIN_DEPENDS message_runtime std_msgs
+  CATKIN_DEPENDS std_msgs message_runtime
 )

 ################################################################################
--- a/op3_action_module_msgs/package.xml
+++ b/op3_action_module_msgs/package.xml
@ -1,14 +1,20 @@
 <?xml version="1.0"?>
-<package>
+<package format="2">
  <name>op3_action_module_msgs</name>
-  <version>0.1.0</version>
-  <description>The op3_action_module_msgs package</description>
-  <license>Apache License 2.0</license>
+  <version>0.1.1</version>
+  <description>
+    This package includes ROS messages and services for the ROBOTIS OP3 packages
+  </description>
+  <license>Apache 2.0</license>
+  <author email="kmjung@robotis.com">Kayman</author>
  <maintainer email="pyo@robotis.com">Pyo</maintainer>
-  <author email="hjsong@robotis.com">ROBOTIS</author>
+  <url type="website">http://wiki.ros.org/op3_action_module_msgs</url>
+  <url type="emanual">http://emanual.robotis.com/docs/en/platform/op3/robotis_ros_packages/</url>
+  <url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Msgs</url>
+  <url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Msgs/issues</url>
  <buildtool_depend>catkin</buildtool_depend>
+  <depend>std_msgs</depend>
  <build_depend>message_generation</build_depend>
-  <build_depend>std_msgs</build_depend>  
-  <run_depend>std_msgs</run_depend>
-  <run_depend>message_runtime</run_depend>  
+  <build_export_depend>message_runtime</build_export_depend>
+  <exec_depend>message_runtime</exec_depend>
 </package>
--- a/op3_offset_tuner_msgs/CHANGELOG.rst
+++ b/op3_offset_tuner_msgs/CHANGELOG.rst
@ -0,0 +1,13 @@
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Changelog for package op3_offset_tuner_msgs
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+0.1.1 (2018-03-21)
+------------------
+* changed package.xml format to v2
+* Contributors: Pyo
+
+0.1.0 (2017-10-27)
+------------------
+* added msg package for ROBOTIS OP3
+* Contributors: Kayman
--- a/op3_offset_tuner_msgs/CMakeLists.txt
+++ b/op3_offset_tuner_msgs/CMakeLists.txt
@ -1,38 +1,40 @@
 ################################################################################
-# CMake
+# Set minimum required version of cmake, project name and compile options
 ################################################################################
 cmake_minimum_required(VERSION 2.8.3)
 project(op3_offset_tuner_msgs)

 ################################################################################
-# Packages
+# Find catkin packages and libraries for catkin and system dependencies
 ################################################################################
 find_package(catkin REQUIRED COMPONENTS
-  roscpp
-  rospy
  std_msgs
  message_generation
 )

+################################################################################
+# Setup for python modules and scripts
+################################################################################
+
 ################################################################################
 # Declare ROS messages, services and actions
 ################################################################################
 add_message_files(
-   FILES
-   JointOffsetData.msg
-   JointOffsetPositionData.msg
-   JointTorqueOnOff.msg
-   JointTorqueOnOffArray.msg
+  FILES
+  JointOffsetData.msg
+  JointOffsetPositionData.msg
+  JointTorqueOnOff.msg
+  JointTorqueOnOffArray.msg
 )

 add_service_files(
-   FILES
-   GetPresentJointOffsetData.srv
+  FILES
+  GetPresentJointOffsetData.srv
 )

 generate_messages(
-   DEPENDENCIES
-   std_msgs
+  DEPENDENCIES
+  std_msgs
 )

 ################################################################################
@ -40,9 +42,10 @@ generate_messages(
 ################################################################################

 ################################################################################
-# Catkin specific configuration
+# Declare catkin specific configuration to be passed to dependent projects
 ################################################################################
 catkin_package(
+  CATKIN_DEPENDS std_msgs message_runtime
 )

 ################################################################################
--- a/op3_offset_tuner_msgs/package.xml
+++ b/op3_offset_tuner_msgs/package.xml
@ -1,18 +1,21 @@
 <?xml version="1.0"?>
-<package>
+<package format="2">
  <name>op3_offset_tuner_msgs</name>
-  <version>0.1.0</version>
-  <description>The offset_tuner_msgs package</description>
-  <license>Apache License 2.0</license>
-  <author email="hjsong@robotis.com">Jay</author>
+  <version>0.1.1</version>
+  <description>
+    This package includes ROS messages and services for the ROBOTIS OP3 packages
+  </description>
+  <license>Apache 2.0</license>
+  <author email="kmjung@robotis.com">Kayman</author>
  <maintainer email="pyo@robotis.com">Pyo</maintainer>
-  <buildtool_depend>catkin</buildtool_depend>  
+  <url type="website">http://wiki.ros.org/op3_offset_tuner_msgs</url>
+  <url type="emanual">http://emanual.robotis.com/docs/en/platform/op3/robotis_ros_packages/</url>
+  <url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Msgs</url>
+  <url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Msgs/issues</url>
+  <buildtool_depend>catkin</buildtool_depend>
+  <depend>std_msgs</depend>
  <build_depend>message_generation</build_depend>
-  <build_depend>roscpp</build_depend>
-  <build_depend>rospy</build_depend>
-  <build_depend>std_msgs</build_depend>  
-  <run_depend>roscpp</run_depend>
-  <run_depend>rospy</run_depend>
-  <run_depend>std_msgs</run_depend>
-  <run_depend>message_runtime</run_depend>
+  <build_export_depend>message_runtime</build_export_depend>
+  <exec_depend>message_runtime</exec_depend>
 </package>
+
--- a/op3_online_walking_module_msgs/CHANGELOG.rst
+++ b/op3_online_walking_module_msgs/CHANGELOG.rst
@ -0,0 +1,14 @@
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Changelog for package op3_online_walking_module_msgs
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+0.1.1 (2018-03-21)
+------------------
+* added online walking module msgs
+* changed package.xml format to v2
+* Contributors: SCH, Pyo
+
+0.1.0 (2017-10-27)
+------------------
+* added msg package for ROBOTIS OP3
+* Contributors: Kayman
--- a/op3_online_walking_module_msgs/CMakeLists.txt
+++ b/op3_online_walking_module_msgs/CMakeLists.txt
@ -1,16 +1,23 @@
+################################################################################
+# Set minimum required version of cmake, project name and compile options
+################################################################################
 cmake_minimum_required(VERSION 2.8.3)
 project(op3_online_walking_module_msgs)

 ################################################################################
-# Packages
+# Find catkin packages and libraries for catkin and system dependencies
 ################################################################################
 find_package(catkin REQUIRED COMPONENTS
-  sensor_msgs
  std_msgs
+  sensor_msgs
  geometry_msgs
  message_generation
 )

+################################################################################
+# Setup for python modules and scripts
+################################################################################
+
 ################################################################################
 # Declare ROS messages, services and actions
 ################################################################################
@ -42,10 +49,14 @@ generate_messages(
 )

 ################################################################################
-# Catkin specific configuration
+# Declare ROS dynamic reconfigure parameters
+################################################################################
+
+################################################################################
+# Declare catkin specific configuration to be passed to dependent projects
 ################################################################################
 catkin_package(
-  CATKIN_DEPENDS std_msgs sensor_msgs geometry_msgs
+  CATKIN_DEPENDS std_msgs sensor_msgs geometry_msgs message_runtime
 )

 ################################################################################
--- a/op3_online_walking_module_msgs/package.xml
+++ b/op3_online_walking_module_msgs/package.xml
@ -1,19 +1,23 @@
 <?xml version="1.0"?>
-<package>
+<package format="2">
  <name>op3_online_walking_module_msgs</name>
-  <version>0.0.0</version>
-  <description>The op3_online_walking_module_msgs package</description>
-  <license>Apache License 2.0</license>
-  <license>BSD</license>
+  <version>0.1.1</version>
+  <description>
+    This package includes ROS messages and services for the ROBOTIS OP3 packages
+  </description>
+  <license>Apache 2.0</license>
+  <author email="kmjung@robotis.com">Kayman</author>
  <author email="sch@robotis.com">SCH</author>
  <maintainer email="pyo@robotis.com">Pyo</maintainer>
+  <url type="website">http://wiki.ros.org/op3_online_walking_module_msgs</url>
+  <url type="emanual">http://emanual.robotis.com/docs/en/platform/op3/robotis_ros_packages/</url>
+  <url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Msgs</url>
+  <url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Msgs/issues</url>
  <buildtool_depend>catkin</buildtool_depend>
-  <build_depend>std_msgs</build_depend>
-  <build_depend>sensor_msgs</build_depend>
-  <build_depend>geometry_msgs</build_depend>
+  <depend>std_msgs</depend>
+  <depend>sensor_msgs</depend>
+  <depend>geometry_msgs</depend>
  <build_depend>message_generation</build_depend>
-  <run_depend>std_msgs</run_depend>
-  <run_depend>sensor_msgs</run_depend>
-  <run_depend>geometry_msgs</run_depend>
-  <run_depend>message_runtime</run_depend>
+  <build_export_depend>message_runtime</build_export_depend>
+  <exec_depend>message_runtime</exec_depend>
 </package>
--- a/op3_walking_module_msgs/CHANGELOG.rst
+++ b/op3_walking_module_msgs/CHANGELOG.rst
@ -0,0 +1,13 @@
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Changelog for package op3_walking_module_msgs
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+0.1.1 (2018-03-21)
+------------------
+* changed package.xml format to v2
+* Contributors: Pyo
+
+0.1.0 (2017-10-27)
+------------------
+* added msg package for ROBOTIS OP3
+* Contributors: Kayman, Yoshimaru Tanaka
--- a/op3_walking_module_msgs/CMakeLists.txt
+++ b/op3_walking_module_msgs/CMakeLists.txt
@ -1,19 +1,21 @@
 ################################################################################
-# CMake
+# Set minimum required version of cmake, project name and compile options
 ################################################################################
 cmake_minimum_required(VERSION 2.8.3)
 project(op3_walking_module_msgs)

 ################################################################################
-# Packages
+# Find catkin packages and libraries for catkin and system dependencies
 ################################################################################
 find_package(catkin REQUIRED COMPONENTS
-  message_generation
-  roscpp
-  rospy
  std_msgs
+  message_generation
 )

+################################################################################
+# Setup for python modules and scripts
+################################################################################
+
 ################################################################################
 # Declare ROS messages, services and actions
 ################################################################################
@ -38,9 +40,11 @@ generate_messages(
 ################################################################################

 ################################################################################
-# Catkin specific configuration
+# Declare catkin specific configuration to be passed to dependent projects
 ################################################################################
-catkin_package()
+catkin_package(
+  CATKIN_DEPENDS std_msgs message_runtime
+)

 ################################################################################
 # Build
--- a/op3_walking_module_msgs/package.xml
+++ b/op3_walking_module_msgs/package.xml
@ -1,17 +1,20 @@
 <?xml version="1.0"?>
-<package>
+<package format="2">
  <name>op3_walking_module_msgs</name>
-  <version>0.1.0</version>
-  <description>The op3_walking_module_msgs package</description>
-  <license>Apache License 2.0</license>
+  <version>0.1.1</version>
+  <description>
+    This package includes ROS messages and services for the ROBOTIS OP3 packages
+  </description>
+  <license>Apache 2.0</license>
  <author email="kmjung@robotis.com">Kayman</author>
  <maintainer email="pyo@robotis.com">Pyo</maintainer>
+  <url type="website">http://wiki.ros.org/op3_walking_module_msgs</url>
+  <url type="emanual">http://emanual.robotis.com/docs/en/platform/op3/robotis_ros_packages/</url>
+  <url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Msgs</url>
+  <url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Msgs/issues</url>
  <buildtool_depend>catkin</buildtool_depend>
+  <depend>std_msgs</depend>
  <build_depend>message_generation</build_depend>
-  <build_depend>roscpp</build_depend>
-  <build_depend>rospy</build_depend>
-  <build_depend>std_msgs</build_depend>
-  <run_depend>roscpp</run_depend>
-  <run_depend>rospy</run_depend>
-  <run_depend>std_msgs</run_depend>
+  <build_export_depend>message_runtime</build_export_depend>
+  <exec_depend>message_runtime</exec_depend>
 </package>
--- a/robotis_op3_msgs/CHANGELOG.rst
+++ b/robotis_op3_msgs/CHANGELOG.rst
@ -0,0 +1,14 @@
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Changelog for package robotis_op3_msgs
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+0.1.1 (2018-03-21)
+------------------
+* added online walking module msgs
+* changed package.xml format to v2
+* Contributors: Pyo
+
+0.1.0 (2017-10-27)
+------------------
+* added msg package for ROBOTIS OP3
+* Contributors: Kayman
--- a/robotis_op3_msgs/CMakeLists.txt
+++ b/robotis_op3_msgs/CMakeLists.txt
@ -1,4 +1,4 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(robotis_op3_msgs)
 find_package(catkin REQUIRED)
-catkin_metapackage()
+catkin_metapackage()
--- a/robotis_op3_msgs/package.xml
+++ b/robotis_op3_msgs/package.xml
@ -1,26 +1,22 @@
 <?xml version="1.0"?>
-<package>
+<package format="2">
  <name>robotis_op3_msgs</name>
-  <version>0.1.0</version>
+  <version>0.1.1</version>
  <description>
-    ROS packages for the robotis_op3_msgs (meta package)
+    ROS messages packages for the ROBOTIS OP3 (meta package)
  </description>
-
-  <license>Apache License 2.0</license>
+  <license>Apache 2.0</license>
  <author email="kmjung@robotis.com">Kayman</author>
+  <author email="sch@robotis.com">SCH</author>
  <maintainer email="pyo@robotis.com">Pyo</maintainer>
-
-  <!-- <url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Msgs/issues</url> -->
-  <!-- <url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Msgs</url> -->
-  <!-- <url type="website">http://wiki.ros.org/robotis_op3_msgs</url> -->
-  
+  <url type="website">http://wiki.ros.org/robotis_op3_msgs</url>
+  <url type="emanual">http://emanual.robotis.com/docs/en/platform/op3/robotis_ros_packages/</url>
+  <url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Msgs</url>
+  <url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Msgs/issues</url>
  <buildtool_depend>catkin</buildtool_depend>
-    
-  <run_depend>op3_action_module_msgs</run_depend>
-  <run_depend>op3_offset_tuner_msgs</run_depend>
-  <run_depend>op3_walking_module_msgs</run_depend>
-
-  <export>
-    <metapackage/>
-  </export>
+  <exec_depend>op3_action_module_msgs</exec_depend>
+  <exec_depend>op3_offset_tuner_msgs</exec_depend>
+  <exec_depend>op3_online_walking_module_msgs</exec_depend>
+  <exec_depend>op3_walking_module_msgs</exec_depend>
+  <export><metapackage/></export>
 </package>