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

robotpilot · web-flow · commit 9bf3178c920f · 2017-04-24T17:50:01.000+09:00
Merge for sync kinetic-devel and master branch
diff --git a/robotis_controller/CHANGELOG.rst b/robotis_controller/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package robotis_controller
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+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
diff --git a/robotis_controller/package.xml b/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.2</version>
   <description>
     The main package that controls THORMANG3.
   </description>
diff --git a/robotis_device/CHANGELOG.rst b/robotis_device/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package robotis_device
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+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 +32,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 +49,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
diff --git a/robotis_device/package.xml b/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.2</version>
   <description>
     The package that manages device information of ROBOTIS robots.
     This package is used when reading device information with the robot information file
diff --git a/robotis_framework/CHANGELOG.rst b/robotis_framework/CHANGELOG.rst
@@ -2,6 +2,13 @@
 Changelog for package robotis_framework
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+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
diff --git a/robotis_framework/package.xml b/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.2</version>
   <description>ROS packages for the robotis_framework (meta package)</description>
   <license>BSD</license>
   <author email="zerom@robotis.com">Zerom</author>
diff --git a/robotis_framework_common/CHANGELOG.rst b/robotis_framework_common/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package robotis_framework_common
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.2.2 (2017-04-24)
+-----------
+* updated for other packages
+* Contributors: Zerom, Kayman
+
 0.2.1 (2016-11-23)
 -----------
 * Merge the changes and update
diff --git a/robotis_framework_common/package.xml b/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.2</version>
   <description>
     The package contains commonly used Headers for the ROBOTIS Framework.
   </description>
