Skip to content

Commit 9868916

Browse files
ROBOTIS-WillROBOTIS-Will
authored
Merge pull request ROBOTIS-GIT#400 from ROBOTIS-GIT/develop
Develop
2 parents c6b74a1 + 6b7124f commit 9868916

File tree

11 files changed

+27
-52
lines changed

11 files changed

+27
-52
lines changed

‎.travis.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ notifications:
1515
on_success: change
1616
on_failure: always
1717
recipients:
18-
- pyo@robotis.com
18+
- willson@robotis.com
1919
env:
2020
matrix:
2121
- ROS_DISTRO=indigo ROS_REPO=ros UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=trusty
2222
- ROS_DISTRO=kinetic ROS_REPO=ros UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=xenial
2323
- ROS_DISTRO=melodic ROS_REPO=ros UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=bionic
2424
- ROS_DISTRO=melodic ROS_REPO=ros UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=stretch
25+
- ROS_DISTRO=noetic ROS_REPO=ros UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=focal
2526
matrix:
2627
allow_failures:
27-
- env: ROS_DISTRO=melodic ROS_REPO=ros UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=bionic
2828
- env: ROS_DISTRO=melodic ROS_REPO=ros UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=stretch
2929
branches:
3030
only:
@@ -33,6 +33,7 @@ branches:
3333
- indigo-devel
3434
- kinetic-devel
3535
- melodic-devel
36+
- noetic-devel
3637
install:
3738
- git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
3839
script:

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ DynamixelSDK supports various programming languages.
1313
(* Dynamic library (*.dll, *.so, and *.dylib files) / .dll: dynamic-link library on Windows / .so: shared object on Linux / .dylib: dynamic library on MacOS)
1414

1515
## ROS 1 Packages for Dynamixel SDK
16-
|develop|master|Indigo + Ubuntu Trusty|Kinetic + Ubuntu Xenial|Melodic + Ubuntu Bionic|
17-
|:---:|:---:|:---:|:---:|:---:|
18-
|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK.svg?branch=develop)](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK.svg?branch=master)](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK)|[![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)|
16+
|develop|master|Indigo + Ubuntu Trusty|Kinetic + Ubuntu Xenial|Melodic + Ubuntu Bionic|Noetic + Ubuntu Focal|
17+
|:---:|:---:|:---:|:---:|:---:|:---:|
18+
|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK.svg?branch=develop)](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK.svg?branch=master)](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK)|[![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)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK.svg?branch=noetic-devel)](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK)|
1919

2020
## ROS 2 Packages for Dynamixel SDK
21-
|ros2-devel|ros2|Dashing + Ubuntu Bionic|
22-
|:---:|:---:|:---:|
23-
|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK.svg?branch=ros2-devel)](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK.svg?branch=ros2)](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK.svg?branch=dashing-devel)](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK)|
21+
|ros2-devel|ros2|Dashing + Ubuntu Bionic|Eloquent + Ubuntu Bionic|Foxy + Ubuntu Foxy|
22+
|:---:|:---:|:---:|:---:|:---:|
23+
|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK.svg?branch=ros2-devel)](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK.svg?branch=ros2)](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK.svg?branch=dashing-devel)](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK.svg?branch=eloquent-devel)](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK.svg?branch=foxy-devel)](https://travis-ci.org/ROBOTIS-GIT/DynamixelSDK)|
2424

2525
For more information on ROS Packages for Dynamixel SDK, please refer to the ROS wiki pages below.
2626
- http://wiki.ros.org/dynamixel_sdk

‎ReleaseNote.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Dynamixel SDK Release Notes
22

3+
3.7.3 (2020-07-13)
4+
-------------------
5+
* ROS 1 Noetic Ninjemys support
6+
37
3.7.21 (2019-09-06)
48
-------------------
59
* Fixed buffer overflow bug (rxpacket size)

‎c++/src/dynamixel_sdk/group_bulk_read.cpp‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -232,14 +232,5 @@ bool GroupBulkRead::getError(uint8_t id, uint8_t* error)
232232
// TODO : check protocol version, last_result_, data_list
233233
// if (last_result_ == false || error_list_.find(id) == error_list_.end())
234234

235-
error[0] = error_list_[id][0];
236-
237-
if (error[0] != 0)
238-
{
239-
return true;
240-
}
241-
else
242-
{
243-
return false;
244-
}
235+
return error[0] = error_list_[id][0];
245236
}

‎c++/src/dynamixel_sdk/group_sync_read.cpp‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -201,14 +201,5 @@ bool GroupSyncRead::getError(uint8_t id, uint8_t* error)
201201
// TODO : check protocol version, last_result_, data_list
202202
// if (ph_->getProtocolVersion() == 1.0 || last_result_ == false || error_list_.find(id) == error_list_.end())
203203

204-
error[0] = error_list_[id][0];
205-
206-
if (error[0] != 0)
207-
{
208-
return true;
209-
}
210-
else
211-
{
212-
return false;
213-
}
204+
return error[0] = error_list_[id][0];
214205
}

‎java/dynamixel_functions_java/x86/Dynamixel.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ interface LibFunction extends Library
167167

168168
public class Dynamixel
169169
{
170-
LibFunction libFunction = (LibFunction)Native.loadLibrary("dxl_x64_c", LibFunction.class);
170+
LibFunction libFunction = (LibFunction)Native.loadLibrary("dxl_x86_c", LibFunction.class);
171171

172172
// PortHandler functions
173173
public int portHandler(String str)

‎python/setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
setup(
66
name='dynamixel_sdk',
7-
version='3.6.0',
7+
version='3.7.3',
88
packages=['dynamixel_sdk'],
99
package_dir={'': 'src'},
1010
license='Apache 2.0',

‎ros/CHANGELOG.rst‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
Changelog for package dynamixel_sdk
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
3.7.3 (2020-07-13)
6+
-------------------
7+
* ROS 1 Noetic Ninjemys support
8+
* 3x faster getError member function of GroupSyncRead Class
9+
* Contributors: developer0hye, Zerom, Will Son
10+
511
3.7.21 (2019-09-06)
612
-------------------
713
* Fixed buffer overflow bug (rxpacket size)

‎ros/package.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>dynamixel_sdk</name>
4-
<version>3.7.21</version>
4+
<version>3.7.3</version>
55
<description>
66
This package is wrapping version of ROBOTIS Dynamixel 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.
77
</description>
@@ -10,7 +10,7 @@
1010
<author email="[email protected]">Zerom</author>
1111
<author email="[email protected]">Darby Lim</author>
1212
<author>Leon</author>
13-
<maintainer email="pyo@robotis.com">Pyo</maintainer>
13+
<maintainer email="willson@robotis.com">Will Son</maintainer>
1414
<url type="website">http://wiki.ros.org/dynamixel_sdk</url>
1515
<url type="emanual">http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_sdk/overview/</url>
1616
<url type="repository">https://github.com/ROBOTIS-GIT/DynamixelSDK</url>

‎ros/src/dynamixel_sdk/group_bulk_read.cpp‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -232,14 +232,5 @@ bool GroupBulkRead::getError(uint8_t id, uint8_t* error)
232232
// TODO : check protocol version, last_result_, data_list
233233
// if (last_result_ == false || error_list_.find(id) == error_list_.end())
234234

235-
error[0] = error_list_[id][0];
236-
237-
if (error[0] != 0)
238-
{
239-
return true;
240-
}
241-
else
242-
{
243-
return false;
244-
}
235+
return error[0] = error_list_[id][0];
245236
}

0 commit comments

Comments
 (0)