Merge pull request #49 from ROBOTIS-GIT/master

merge (master -> develop)

robotis_controller/CHANGELOG.rst

@@ -2,6 +2,27 @@
 Changelog for package robotis_controller
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.2.5 (2017-06-09)
+-----------
+* updated for yaml-cpp dependencies
+* Contributors: SCH
+
+0.2.4 (2017-06-07)
+-----------
+* added cmake_modules in package.xml
+* Contributors: SCH
+
+0.2.3 (2017-05-23)
+-----------
+* updated the cmake file for ros install
+* Contributors: SCH
+
+0.2.2 (2017-04-24)
+-----------
+* updated robotis_controller.cpp
+* changed to read control cycle from .robot file
+* Contributors: Zerom
+
 0.2.1 (2016-11-23)
 -----------
 * Merge the changes and update

robotis_controller/CMakeLists.txt

@@ -19,6 +19,10 @@ find_package(catkin REQUIRED COMPONENTS
   cmake_modules
 )
 
+set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CATKIN_DEVEL_PREFIX}/lib/pkgconfig")
+find_package(PkgConfig)
+pkg_check_modules(yaml_cpp yaml-cpp REQUIRED)
+
 ################################################################################
 # Declare ROS messages, services and actions
 ################################################################################
@@ -42,11 +46,12 @@ catkin_package(
 include_directories(
   include
   ${catkin_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 ${catkin_LIBRARIES})
+target_link_libraries(robotis_controller ${yaml_cpp_LIBRARIES} ${catkin_LIBRARIES})
 
 ################################################################################
 # Install

robotis_controller/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>robotis_controller</name>
-  <version>0.2.1</version>
+  <version>0.2.5</version>
   <description>
     The main package that controls THORMANG3.
   </description>
@@ -20,6 +20,8 @@
   <build_depend>robotis_device</build_depend>
   <build_depend>robotis_controller_msgs</build_depend>
   <build_depend>robotis_framework_common</build_depend>
+  <build_depend>cmake_modules</build_depend>
+  <build_depend>yaml-cpp</build_depend>
   <run_depend>roscpp</run_depend>
   <run_depend>roslib</run_depend>
   <run_depend>std_msgs</run_depend>
@@ -28,5 +30,7 @@
   <run_depend>robotis_device</run_depend>
   <run_depend>robotis_controller_msgs</run_depend>
   <run_depend>robotis_framework_common</run_depend>
+  <run_depend>cmake_modules</run_depend>
+  <run_depend>yaml-cpp</run_depend>
   <export></export>
 </package>

robotis_device/CHANGELOG.rst

@@ -2,6 +2,25 @@
 Changelog for package robotis_device
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.2.5 (2017-06-09)
+-----------
+* none
+
+0.2.4 (2017-06-07)
+-----------
+* none
+
+0.2.3 (2017-05-23)
+-----------
+* updated the cmake file for ros install
+* Contributors: SCH
+
+0.2.2 (2017-04-24)
+-----------
+* added a deivce: OpenCR
+* changed to read control cycle from .robot file
+* Contributors: Zerom, Kayman
+
 0.2.1 (2016-11-23)
 -----------
 * Merge the changes and update
@@ -26,6 +45,7 @@ Changelog for package robotis_device
 0.1.1 (2016-08-18)
 -----------
 * updated the package information
+* Contributors: Zerom
 
 0.1.0 (2016-08-12)
 -----------
@@ -42,4 +62,4 @@ Changelog for package robotis_device
   ConvertRadian2Value / ConvertValue2Radian function bug fixed.
 * added code to support the gazebo simulator
 * renewal
-* Contributors: ROBOTIS, ROBOTIS-zerom, pyo
+* Contributors: Zerom

robotis_device/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>robotis_device</name>
-  <version>0.2.1</version>
+  <version>0.2.5</version>
   <description>
     The package that manages device information of ROBOTIS robots.
     This package is used when reading device information with the robot information file

robotis_framework/CHANGELOG.rst

@@ -2,6 +2,28 @@
 Changelog for package robotis_framework
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.2.5 (2017-06-09)
+-----------
+* updated for yaml-cpp dependencies (robotis_controller)
+* Contributors: SCH
+
+0.2.4 (2017-06-07)
+-----------
+* added cmake_modules in package.xml
+* Contributors: SCH
+
+0.2.3 (2017-05-23)
+-----------
+* updated the cmake file for ros install
+* Contributors: SCH
+
+0.2.2 (2017-04-24)
+-----------
+* added a deivce: OpenCR
+* updated robotis_controller.cpp
+* changed to read control cycle from .robot file
+* Contributors: Zerom, Kayman
+
 0.2.1 (2016-11-23)
 -----------
 * Merge the changes and update

robotis_framework/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>robotis_framework</name>
-  <version>0.2.1</version>
+  <version>0.2.5</version>
   <description>ROS packages for the robotis_framework (meta package)</description>
   <license>BSD</license>
   <author email="zerom@robotis.com">Zerom</author>

robotis_framework_common/CHANGELOG.rst

@@ -2,6 +2,24 @@
 Changelog for package robotis_framework_common
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.2.5 (2017-06-09)
+-----------
+* none
+
+0.2.4 (2017-06-07)
+-----------
+* none
+
+0.2.3 (2017-05-23)
+-----------
+* updated the cmake file for ros install
+* Contributors: SCH
+
+0.2.2 (2017-04-24)
+-----------
+* updated for other packages
+* Contributors: Zerom, Kayman
+
 0.2.1 (2016-11-23)
 -----------
 * Merge the changes and update

robotis_framework_common/CMakeLists.txt

@@ -46,6 +46,12 @@ set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
 ################################################################################
 # Install
 ################################################################################
+install(TARGETS robotis_framework_common
+  ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+  LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+  RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
+
 install(DIRECTORY include/${PROJECT_NAME}/
   DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
 )

robotis_framework_common/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>robotis_framework_common</name>
-  <version>0.2.1</version>
+  <version>0.2.5</version>
   <description>
     The package contains commonly used Headers for the ROBOTIS Framework.
   </description>