Merge branch 'develop' of github.com:ROBOTIS-GIT/DynamixelSDK

ROBOTIS-GIT · Aug 19, 2019 · 80b06d5 · 80b06d5
2 parents 30d051b + 46912a9
commit 80b06d5
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 26 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -37,4 +37,3 @@ install:
   - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
 script:
   - source .ci_config/travis.sh
-
diff --git a/README.md b/README.md
@@ -12,11 +12,16 @@ DynamixelSDK supports various programming languages.
 - **Python**: Python module and examples
 (* Dynamic library (*.dll, *.so, and *.dylib files) / .dll: dynamic-link library on Windows / .so: shared object on Linux / .dylib: dynamic library on MacOS)
 
-## ROS Packages for Dynamixel SDK
+## ROS 1 Packages for Dynamixel SDK
 |Version|Indigo + Ubuntu Trusty|Kinetic + Ubuntu Xenial|Melodic + Ubuntu Bionic|
 |:---:|:---:|:---:|:---:|
 |[![GitHub version](https://badge.fury.io/gh/ROBOTIS-GIT%2FDynamixelSDK.svg)](https://badge.fury.io/gh/ROBOTIS-GIT%2FDynamixelSDK)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK.svg?branch=indigo-devel)](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK.svg?branch=kinetic-devel)](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK.svg?branch=melodic-devel)](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK)|
 
+## ROS 2 Packages for Dynamixel SDK
+|Version|Dashing + Ubuntu Bionic|
+|:---:|:---:|
+|[![GitHub version](https://badge.fury.io/gh/ROBOTIS-GIT%2FDynamixelSDK.svg)](https://badge.fury.io/gh/ROBOTIS-GIT%2FDynamixelSDK)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK.svg?branch=dashing-devel)](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK)|
+
 For more information on ROS Packages for Dynamixel SDK, please refer to the ROS wiki pages below.
 - http://wiki.ros.org/dynamixel_sdk
 - http://wiki.ros.org/dynamixel_workbench

diff --git a/ReleaseNote.md b/ReleaseNote.md
@@ -1,25 +1,35 @@
 # Dynamixel SDK Release Notes
 
+3.7.11 (2019-08-19)
+-------------------
+- Updated C lib and DLL file
+- Changed C# / win32 / protocol_combined output path
+- fixed "protocol_combined" example bug
+- fixed typo in bulk_read_write.py
+
+3.7.10 (2019-08-19)
+-------------------
+- Supported ROS 2 Dashing Diademata
+
 3.7.0 (2019-01-03)
 ------------------
-* added clear instruction [#269](https://github.com/ROBOTIS-GIT/DynamixelSDK/issues/269)
-* removed busy waiting for rxPacket()
-* fixed addStuffing() function (reduced stack memory usage)
-* fixed memory issues [#268](https://github.com/ROBOTIS-GIT/DynamixelSDK/issues/268)
-* fixed the broadcast ping bug in dxl_monitor
+* Added clear instruction [#269](https://github.com/ROBOTIS-GIT/DynamixelSDK/issues/269)
+* Removed busy waiting for rxPacket()
+* Fixed addStuffing() function (reduced stack memory usage)
+* Fixed memory issues [#268](https://github.com/ROBOTIS-GIT/DynamixelSDK/issues/268)
+* Fixed the broadcast ping bug in dxl_monitor
 
 3.6.2 (2018-07-17)
 ------------------
-* added python modules for ROS to ros folder
-* moved cpp library files for ROS to ros folder 
-* created an ROS package separately [#187](https://github.com/ROBOTIS-GIT/DynamixelSDK/issues/187)
-* modified the e-Manual address to emanual.robotis.com
+* Added python modules for ROS to ros folder
+* Moved cpp library files for ROS to ros folder
+* Created an ROS package separately `#187 <https://github.com/ROBOTIS-GIT/DynamixelSDK/issues/187>`_
+* Modified the e-Manual address to emanual.robotis.com
 
 3.6.1 (2018-06-14)
 ------------------
-* removed printTxRxResult(), printRxPacketError() [#193](https://github.com/ROBOTIS-GIT/DynamixelSDK/issues/193)
-* removed cache files
-* merge pull request [#195](https://github.com/ROBOTIS-GIT/DynamixelSDK/issues/195)
+* Removed printTxRxResult(), printRxPacketError() `#193 <https://github.com/ROBOTIS-GIT/DynamixelSDK/issues/193>`_
+* Removed cache files
 
 3.6.0 (2018-03-16)
 ------------------

diff --git a/ros/CHANGELOG.rst b/ros/CHANGELOG.rst
@@ -2,21 +2,34 @@
 Changelog for package dynamixel_sdk
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.7.11 (2019-08-19)
+-------------------
+- Updated C lib and DLL file
+- Changed C# / win32 / protocol_combined output path
+- fixed "protocol_combined" example bug
+- fixed typo in bulk_read_write.py
+* Contributors: Pyo, Zerom
+
+3.7.10 (2019-08-19)
+-------------------
+* Supported ROS 2 Dashing Diademata
+* Contributors: Darby, Pyo
+
 3.7.0 (2019-01-03)
 ------------------
-* added clear instruction [#269](https://github.com/ROBOTIS-GIT/DynamixelSDK/issues/269)
-* removed busy waiting for rxPacket()
-* fixed addStuffing() function (reduced stack memory usage)
-* fixed memory issues [#268](https://github.com/ROBOTIS-GIT/DynamixelSDK/issues/268)
-* fixed the broadcast ping bug in dxl_monitor
-* Contributors: Gilbert, Zerom, Darby Lim, Kurt, Pyo
+* Added clear instruction `#269 <https://github.com/ROBOTIS-GIT/DynamixelSDK/issues/269>`_
+* Removed busy waiting for rxPacket()
+* Fixed addStuffing() function (reduced stack memory usage)
+* Fixed memory issues `#268 <https://github.com/ROBOTIS-GIT/DynamixelSDK/issues/268>`_
+* Fixed the broadcast ping bug in dxl_monitor
+* Contributors: Gilbert, Pyo, Zerom
 
 3.6.2 (2018-07-17)
 ------------------
-* added python modules for ROS to ros folder
-* moved cpp library files for ROS to ros folder 
-* created an ROS package separately `#187 <https://github.com/ROBOTIS-GIT/DynamixelSDK/issues/187>`_
-* modified the e-Manual address to emanual.robotis.com
+* Added python modules for ROS to ros folder
+* Moved cpp library files for ROS to ros folder
+* Created an ROS package separately `#187 <https://github.com/ROBOTIS-GIT/DynamixelSDK/issues/187>`_
+* Modified the e-Manual address to emanual.robotis.com
 * Contributors: Pyo
 
 3.6.1 (2018-06-14)

diff --git a/ros/package.xml b/ros/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>dynamixel_sdk</name>
-  <version>3.7.0</version>
+  <version>3.7.11</version>
   <description>
     This package is wrapping version of ROBOTIS Dynamxel SDK for ROS. The ROBOTIS Dynamixel SDK, or SDK, is a software development library that provides Dynamixel control functions for packet communication. The API is designed for Dynamixel actuators and Dynamixel-based platforms.
   </description>
@@ -11,7 +11,6 @@
   <author email="thlim@robotis.com">Darby Lim</author>
   <author>Leon</author>
   <maintainer email="pyo@robotis.com">Pyo</maintainer>
-  <maintainer email="kkjong@robotis.com">Gilbert</maintainer>
   <url type="website">http://wiki.ros.org/dynamixel_sdk</url>
   <url type="emanual">http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_sdk/overview/</url>
   <url type="repository">https://github.com/ROBOTIS-GIT/DynamixelSDK</url>