Merge pull request #57 from ROBOTIS-GIT/kinetic-devel

merge for sync kinetic-devel and master branch
2018-03-20 17:11:17 +09:00
parent d7161f1033 f44c58a101
commit 317012f1c9
13 changed files with 102 additions and 37 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -12,7 +12,7 @@ compiler:
  - gcc
 notifications:
  email:
-    on_success: always
+    on_success: change
    on_failure: always
    recipients:
      - pyo@robotis.com
--- a/README.md
+++ b/README.md
@ -1,9 +1,18 @@
-# robotis_framework
-
+# ROBOTIS Framework Metapackage
 [![GitHub version](https://badge.fury.io/gh/ROBOTIS-GIT%2FROBOTIS-Framework.svg)](https://badge.fury.io/gh/ROBOTIS-GIT%2FROBOTIS-Framework) [![Build Status](https://travis-ci.org/ROBOTIS-GIT/ROBOTIS-Framework.svg?branch=master)](https://travis-ci.org/ROBOTIS-GIT/ROBOTIS-Framework)

-ROS packages for the robotis_framework (meta package)
+# Documents for robotis_framework packages
+- [ROBOTIS e-Manual](http://emanual.robotis.com/docs/en/software/robotis_framework_packages/#robotis-framework)
+- http://wiki.ros.org/robotis_framework
+- http://wiki.ros.org/robotis_controller
+- http://wiki.ros.org/robotis_device
+- http://wiki.ros.org/robotis_framework_common

-# Documents
- ROS Wiki: http://wiki.ros.org/robotis_framework
- ROBOTIS e-Manual: http://emanual.robotis.com/docs/en/software/robotis_framework_packages/
+# ROS packages related to ROBOTIS Framework
+- [dynamixel_sdk](https://github.com/ROBOTIS-GIT/DynamixelSDK)
+- [robotis_framework](https://github.com/ROBOTIS-GIT/ROBOTIS-Framework)
+- [robotis_controller_msgs](https://github.com/ROBOTIS-GIT/ROBOTIS-Framework-msgs)
+
+# Documents and Videos for ROBOTIS Framework
+- [ROBOTIS e-Manual for Dynamixel SDK](http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_sdk/overview/)
+- [ROBOTIS e-Manual for ROBOTIS Framework](http://emanual.robotis.com/docs/en/software/robotis_framework_packages/)
--- a/robotis_controller/CHANGELOG.rst
+++ b/robotis_controller/CHANGELOG.rst
@ -2,6 +2,11 @@
 Changelog for package robotis_controller
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

+0.2.8 (2018-03-20)
+------------------
+* modified CMakeLists.txt for system dependencies (yaml-cpp)
+* Contributors: Zerom, Pyo
+
 0.2.7 (2018-03-15)
 ------------------
 * changed the License and package format to version 2
--- a/robotis_controller/CMakeLists.txt
+++ b/robotis_controller/CMakeLists.txt
@ -1,13 +1,14 @@
 ################################################################################
-# CMake
+# Set minimum required version of cmake, project name and compile options
 ################################################################################
 cmake_minimum_required(VERSION 2.8.3)
 project(robotis_controller)

-set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
+## Compile as C++11, supported in ROS Kinetic and newer
+add_compile_options(-std=c++11)

 ################################################################################
-# Packages
+# Find catkin packages and libraries for catkin and system dependencies
 ################################################################################
 find_package(catkin REQUIRED COMPONENTS
  roscpp
@ -21,8 +22,27 @@ find_package(catkin REQUIRED COMPONENTS
  cmake_modules
 )

+# Resolve system dependency on yaml-cpp, which apparently does not
+# provide a CMake find_package() module.
 find_package(PkgConfig REQUIRED)
-pkg_check_modules(yaml_cpp yaml-cpp REQUIRED)
+pkg_check_modules(YAML_CPP REQUIRED yaml-cpp)
+find_path(YAML_CPP_INCLUDE_DIR
+  NAMES yaml_cpp.h
+  PATHS ${YAML_CPP_INCLUDE_DIRS}
+)
+find_library(YAML_CPP_LIBRARY
+  NAMES YAML_CPP
+  PATHS ${YAML_CPP_LIBRARY_DIRS}
+)
+link_directories(${YAML_CPP_LIBRARY_DIRS})
+
+if(NOT ${YAML_CPP_VERSION} VERSION_LESS "0.5")
+add_definitions(-DHAVE_NEW_YAMLCPP)
+endif(NOT ${YAML_CPP_VERSION} VERSION_LESS "0.5")
+
+################################################################################
+# Setup for python modules and scripts
+################################################################################

 ################################################################################
 # Declare ROS messages, services and actions
@ -33,7 +53,7 @@ pkg_check_modules(yaml_cpp yaml-cpp REQUIRED)
 ################################################################################

 ################################################################################
-# Catkin specific configuration
+# Declare catkin specific configuration to be passed to dependent projects
 ################################################################################
 catkin_package(
  INCLUDE_DIRS include
@ -47,12 +67,12 @@ catkin_package(
 include_directories(
  include
  ${catkin_INCLUDE_DIRS}
-  ${yaml_cpp_INCLUDE_DIRS}
+  ${YAML_CPP_INCLUDE_DIRS}
 )

 add_library(robotis_controller src/robotis_controller/robotis_controller.cpp)
 add_dependencies(robotis_controller ${catkin_EXPORTED_TARGETS})
-target_link_libraries(robotis_controller ${yaml_cpp_LIBRARIES} ${catkin_LIBRARIES})
+target_link_libraries(robotis_controller ${catkin_LIBRARIES} ${YAML_CPP_LIBRARIES})

 ################################################################################
 # Install
--- a/robotis_controller/package.xml
+++ b/robotis_controller/package.xml
@ -1,17 +1,19 @@
 <?xml version="1.0"?>
 <package format="2">
  <name>robotis_controller</name>
-  <version>0.2.7</version>
+  <version>0.2.8</version>
  <description>
    robotis_controller package for ROBOTIS's platform like Manipulator-H, THORMANG and OP series
  </description>
  <license>Apache 2.0</license>
  <author email="zerom@robotis.com">Zerom</author>
+  <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-Framework/issues</url>
-  <url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework</url>
  <url type="website">http://wiki.ros.org/robotis_controller</url>
+  <url type="emanual">http://emanual.robotis.com/docs/en/software/robotis_framework_packages/</url>
+  <url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework</url>
+  <url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework/issues</url>
  <buildtool_depend>catkin</buildtool_depend>
  <depend>roscpp</depend>
  <depend>roslib</depend>
--- a/robotis_device/CHANGELOG.rst
+++ b/robotis_device/CHANGELOG.rst
@ -2,8 +2,13 @@
 Changelog for package robotis_device
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

+0.2.8 (2018-03-20)
+------------------
+* added RH-P12-RN.device file
+* Contributors: Zerom, Pyo
+
 0.2.7 (2018-03-15)
-------------------------
+------------------
 * fixed a bug that occur when handling bulk read item that does not exist
 * changed the License and package format to version 2
 * Contributors: SCH, Pyo 
--- a/robotis_device/CMakeLists.txt
+++ b/robotis_device/CMakeLists.txt
@ -1,17 +1,21 @@
 ################################################################################
-# CMake
+# Set minimum required version of cmake, project name and compile options
 ################################################################################
 cmake_minimum_required(VERSION 2.8.3)
 project(robotis_device)

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

+################################################################################
+# Setup for python modules and scripts
+################################################################################
+
 ################################################################################
 # Declare ROS messages, services and actions
 ################################################################################
@ -21,7 +25,7 @@ find_package(catkin REQUIRED COMPONENTS
 ################################################################################

 ################################################################################
-# Catkin specific configuration
+# Declare catkin specific configuration to be passed to dependent projects
 ################################################################################
 catkin_package(
  INCLUDE_DIRS include
--- a/robotis_device/package.xml
+++ b/robotis_device/package.xml
@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
  <name>robotis_device</name>
-  <version>0.2.7</version>
+  <version>0.2.8</version>
  <description>
    The package that manages device information of ROBOTIS robots.
    This package is used when reading device information with the robot information file
@ -9,11 +9,13 @@
  </description>
  <license>Apache 2.0</license>
  <author email="zerom@robotis.com">Zerom</author>
+  <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-Framework/issues</url>
-  <url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework</url>
  <url type="website">http://wiki.ros.org/robotis_device</url>
+  <url type="emanual">http://emanual.robotis.com/docs/en/software/robotis_framework_packages/</url>
+  <url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework</url>
+  <url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework/issues</url>
  <buildtool_depend>catkin</buildtool_depend>
  <depend>roscpp</depend>
  <depend>dynamixel_sdk</depend>
--- a/robotis_framework/CHANGELOG.rst
+++ b/robotis_framework/CHANGELOG.rst
@ -2,6 +2,12 @@
 Changelog for package robotis_framework
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

+0.2.8 (2018-03-20)
+------------------
+* added RH-P12-RN.device file
+* modified CMakeLists.txt for system dependencies (yaml-cpp)
+* Contributors: Zerom, Pyo
+
 0.2.7 (2018-03-15)
 ------------------
 * changed all values read by bulk read are saved to dxl_state\_->bulk_read_table\_.
--- a/robotis_framework/package.xml
+++ b/robotis_framework/package.xml
@ -1,20 +1,22 @@
 <?xml version="1.0"?>
 <package format="2">
  <name>robotis_framework</name>
-  <version>0.2.7</version>
+  <version>0.2.8</version>
  <description>
    ROS packages for the robotis_framework (meta package)
  </description>
  <license>Apache 2.0</license>
  <author email="zerom@robotis.com">Zerom</author>
+  <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-Framework/issues</url>
-  <url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework</url>
  <url type="website">http://wiki.ros.org/robotis_framework</url>
+  <url type="emanual">http://emanual.robotis.com/docs/en/software/robotis_framework_packages/</url>
+  <url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework</url>
+  <url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework/issues</url>
  <buildtool_depend>catkin</buildtool_depend>
-  <exec_depend>robotis_framework_common</exec_depend>
-  <exec_depend>robotis_device</exec_depend>
  <exec_depend>robotis_controller</exec_depend>
+  <exec_depend>robotis_device</exec_depend>
+  <exec_depend>robotis_framework_common</exec_depend>
  <export><metapackage/></export>
 </package>
--- a/robotis_framework_common/CHANGELOG.rst
+++ b/robotis_framework_common/CHANGELOG.rst
@ -2,6 +2,11 @@
 Changelog for package robotis_framework_common
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

+0.2.8 (2018-03-20)
+------------------
+* tested for system dependencies
+* Contributors: Pyo
+
 0.2.7 (2018-03-15)
 ------------------
 * change the License and package format to version 2
--- a/robotis_framework_common/CMakeLists.txt
+++ b/robotis_framework_common/CMakeLists.txt
@ -1,17 +1,21 @@
 ################################################################################
-# CMake
+# Set minimum required version of cmake, project name and compile options
 ################################################################################
 cmake_minimum_required(VERSION 2.8.3)
 project(robotis_framework_common)

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

+################################################################################
+# Setup for python modules and scripts
+################################################################################
+
 ################################################################################
 # Declare ROS messages, services and actions
 ################################################################################
@ -21,11 +25,11 @@ find_package(catkin REQUIRED COMPONENTS
 ################################################################################

 ################################################################################
-# Catkin specific configuration
+# Declare catkin specific configuration to be passed to dependent projects
 ################################################################################
 catkin_package(
  INCLUDE_DIRS include
-  LIBRARIES robotis_framework_common
+  LIBRARIES ${PROJECT_NAME}
  CATKIN_DEPENDS roscpp robotis_device
 )

@ -42,7 +46,6 @@ add_library(${PROJECT_NAME}
  include/${PROJECT_NAME}/sensor_module.h
  include/${PROJECT_NAME}/singleton.h
 )
-
 set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)

 ################################################################################
--- a/robotis_framework_common/package.xml
+++ b/robotis_framework_common/package.xml
@ -1,17 +1,19 @@
 <?xml version="1.0"?>
 <package format="2">
  <name>robotis_framework_common</name>
-  <version>0.2.7</version>
+  <version>0.2.8</version>
  <description>
    The package contains commonly used Headers for the ROBOTIS Framework.
  </description>
  <license>Apache 2.0</license>
  <author email="zerom@robotis.com">Zerom</author>
+  <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-Framework/issues</url>
-  <url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework</url>
  <url type="website">http://wiki.ros.org/robotis_framework_common</url>
+  <url type="emanual">http://emanual.robotis.com/docs/en/software/robotis_framework_packages/</url>
+  <url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework</url>
+  <url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework/issues</url>
  <buildtool_depend>catkin</buildtool_depend>
  <depend>roscpp</depend>
  <depend>robotis_device</depend>