Skip to content

Commit

Permalink
Merge pull request #25 from ROBOTIS-GIT/develop
Browse files Browse the repository at this point in the history
added package information for wrapping version for ROS
  • Loading branch information
robotpilot authored Aug 12, 2016
2 parents 39ae9fd + 2248614 commit 953e718
Show file tree
Hide file tree
Showing 5 changed files with 106 additions and 18 deletions.
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
| Dynamixel SDK Version | 1.X | 2.X | 3.X ([Download](https://github.com/ROBOTIS-GIT/DynamixelSDK/archive/master.zip)) |
| ------------- | ------------- | ------------- | ------------- |
| Release date| 2010.05.16 | 2015.02.10 | 2016.03.08 |
| Latest version released |||3.3.3|
| Latest version released |||3.4.0|
| OS | Linux | Windows | Linux + Windows |
| Available Dynamixel models | All models | All models | All models |
|||||
Expand All @@ -27,14 +27,15 @@
| | | | Python |
| | | | Java |
| (C++ ver. Library binded)¹| C++| | C++|
| | | | ROS |

#####¹ C++ ver. Library is not optimized in binding other languages. Please use C ver. Library instead.
---------------------------------------------------------------------------
* ####Here we opened [FAQ board](https://github.com/ROBOTIS-GIT/DynamixelSDK/wiki/FAQ). You may get your keys faster!
* ####Here we opened [FAQ board](https://github.com/ROBOTIS-GIT/DynamixelSDK/wiki/FAQ). You may get your keys faster!

* ####But any questions related with DynamixelSDK are always welcomed. Just let me know at: [ISSUES](https://github.com/ROBOTIS-GIT/DynamixelSDK/issues)

* ####For the other questions, including Hardware-wise problems on your Dynamixels, please contact to [email protected]
* ####For the other questions, including Hardware-wise problems on your Dynamixels, please contact to [email protected]

* ####See 'How to use' in [Dynamixel SDK Manual](https://github.com/ROBOTIS-GIT/DynamixelSDK/wiki)

Expand Down
8 changes: 8 additions & 0 deletions ReleaseNote.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
==============================================
Dynamixel SDK v3.4.0 (Protocol 1.0/2.0)
==============================================

- 08.12.2016

* Added a ROS package information for ROS users

==============================================
Dynamixel SDK v3.3.3 (Protocol 1.0/2.0)
==============================================
Expand Down
48 changes: 48 additions & 0 deletions c++/CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Changelog for package dynamixel_sdk
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

3.4.0 (2016-08-12)
-----------
* first public release for Kinetic
* added package information for wrapping version for ROS
* added ROS catkin package files.
* linux build file for SBC
* License marks for example codes
* Resource Files comments Korean -> English
* Update Makefile
* Update Makefile
* comments modified & aligned
* Release folders in c++ example removed & dxl_monitor.cpp Capital function name modified as ROS c++ code style & included file paths of packet/port handler in dynamixel_sdk.h removed and added parent header file
* Update dxl_monitor.cpp
* file opened
* folder name modification error solved
* License specified
* Code Style modified into ROS C++ coding style
Function & File Names changed into underscored
* Group Bulk/Sync class ClearParam() function changed.
* dll file name changed
* dll file name changed
* Comment modified
* [Protocol1PacketHandler]
RxPacket packet length re-calculate bug fixed.
* [Protocol2PacketHandler]
RxPacket packet length re-calculate bug fixed.
* Makefile updated
Source reorganization
* Windows version updated
Makefile modified
Source reorganization
* GroupBulkRead : GetData function bug fixed.
* [GroupBulkRead / GroupSyncRead]
added IsAvailable() function
modified GetData() function
* GetData() function changed.
* reducing the count of calling MakeParam function
* added rxpacket error check
* ReadTxRx function modified. (to use TxRxPacket function)
* DXL Monitor program arguments added.
* if the last bulk_read / sync_read result is failure -> GetData return false
* communication result & rx packet error print function modified.
* first release
* Contributors: Leon, ROBOTIS, ROBOTIS-zerom, leon, pyo, sadtale
43 changes: 36 additions & 7 deletions c++/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,24 +1,40 @@
################################################################################
# CMake
################################################################################
cmake_minimum_required(VERSION 2.8.3)
project(dynamixel_sdk)

################################################################################
# Packages
################################################################################
find_package(catkin REQUIRED COMPONENTS
roscpp
)

################################################################################
# Declare ROS messages, services and actions
################################################################################

################################################################################
# Declare ROS dynamic reconfigure parameters
################################################################################

################################################################################
# Catkin specific configuration
################################################################################
catkin_package(
INCLUDE_DIRS include
LIBRARIES dynamixel_sdk
# CATKIN_DEPENDS roscpp
# DEPENDS system_lib
)

# include_directories(include)
################################################################################
# Build
################################################################################
include_directories(
include
${catkin_INCLUDE_DIRS}
)

## Declare a C++ library
add_library(dynamixel_sdk
src/${PROJECT_NAME}/packet_handler.cpp
src/${PROJECT_NAME}/protocol1_packet_handler.cpp
Expand All @@ -30,9 +46,22 @@ add_library(dynamixel_sdk
src/${PROJECT_NAME}/port_handler.cpp
src/${PROJECT_NAME}_linux/port_handler_linux.cpp
)
add_dependencies(dynamixel_sdk ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
target_link_libraries(dynamixel_sdk ${catkin_LIBRARIES})

################################################################################
# Install
################################################################################
install(TARGETS dynamixel_sdk
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
)

## Specify libraries to link a library or executable target against
target_link_libraries(dynamixel_sdk
${catkin_LIBRARIES}
install(DIRECTORY include/${PROJECT_NAME}/
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
)

################################################################################
# Test
################################################################################
18 changes: 10 additions & 8 deletions c++/package.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
<?xml version="1.0"?>
<package>
<name>dynamixel_sdk</name>
<version>0.1.0</version>
<description>The dynamixel_sdk package</description>

<maintainer email="[email protected]">robotis</maintainer>
<version>3.4.0</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>
<license>BSD</license>
<!-- <url type="website">http://wiki.ros.org/dynamixel_sdk</url> -->
<author email="[email protected]">ROBOTIS</author>

<author email="[email protected]">zerom</author>
<author email="[email protected]">Leon</author>
<maintainer email="[email protected]">pyo</maintainer>
<url type="bugtracker">https://github.com/ROBOTIS-GIT/DynamixelSDK/issues</url>
<url type="repository">https://github.com/ROBOTIS-GIT/DynamixelSDK</url>
<url type="website">http://wiki.ros.org/dynamixel_sdk</url>
<buildtool_depend>catkin</buildtool_depend>
<build_depend>roscpp</build_depend>
<run_depend>roscpp</run_depend>
</package>
<export></export>
</package>

0 comments on commit 953e718

Please sign in to comment.