Skip to content

Commit 05dcc5c

Browse files
authored
Merge pull request ROBOTIS-GIT#276 from ROBOTIS-GIT/develop
updated the CHANGELOG and version to release binary packages
2 parents fa34af9 + bebda37 commit 05dcc5c

File tree

11 files changed

+75
-18
lines changed

11 files changed

+75
-18
lines changed

ReleaseNote.md

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,25 @@
11
# Dynamixel SDK Release Notes
22

3+
3.7.0 (2019-01-03)
4+
------------------
5+
* added clear instruction [#269](https://github.com/ROBOTIS-GIT/DynamixelSDK/issues/269)
6+
* removed busy waiting for rxPacket()
7+
* fixed addStuffing() function (reduced stack memory usage)
8+
* fixed memory issues [#268](https://github.com/ROBOTIS-GIT/DynamixelSDK/issues/268)
9+
* fixed the broadcast ping bug in dxl_monitor
10+
311
3.6.2 (2018-07-17)
412
------------------
513
* added python modules for ROS to ros folder
614
* moved cpp library files for ROS to ros folder
7-
* created an ROS package separately `#187 <https://github.com/ROBOTIS-GIT/DynamixelSDK/issues/187>`_
15+
* created an ROS package separately [#187](https://github.com/ROBOTIS-GIT/DynamixelSDK/issues/187)
816
* modified the e-Manual address to emanual.robotis.com
917

1018
3.6.1 (2018-06-14)
1119
------------------
12-
* removed printTxRxResult(), printRxPacketError() `#193 <https://github.com/ROBOTIS-GIT/DynamixelSDK/issues/193>`_
20+
* removed printTxRxResult(), printRxPacketError() [#193](https://github.com/ROBOTIS-GIT/DynamixelSDK/issues/193)
1321
* removed cache files
14-
* merge pull request `#195 <https://github.com/ROBOTIS-GIT/DynamixelSDK/issues/195>`_
22+
* merge pull request [#195](https://github.com/ROBOTIS-GIT/DynamixelSDK/issues/195)
1523

1624
3.6.0 (2018-03-16)
1725
------------------

c++/include/dynamixel_sdk/packet_handler.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@
2424

2525
#if defined(ARDUINO) || defined(__OPENCR__) || defined(__OPENCM904__)
2626
#include <Arduino.h>
27+
28+
#define ERROR_PRINT SerialBT2.print
29+
#else
30+
#define ERROR_PRINT printf
31+
2732
#endif
2833

2934
#include <stdio.h>

c++/src/dynamixel_sdk/port_handler_arduino.cpp

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#define DYNAMIXEL_SERIAL Serial3
2828
#endif
2929

30-
#define LATENCY_TIMER 16 // msec (USB latency timer)
30+
#define LATENCY_TIMER 4 // msec (USB latency timer)
3131

3232
using namespace dynamixel;
3333

@@ -91,10 +91,17 @@ void PortHandlerArduino::closePort()
9191

9292
void PortHandlerArduino::clearPort()
9393
{
94+
int temp __attribute__((unused));
9495
#if defined(__OPENCR__)
95-
DYNAMIXEL_SERIAL.flush();
96+
while (DYNAMIXEL_SERIAL.available())
97+
{
98+
temp = DYNAMIXEL_SERIAL.read();
99+
}
96100
#elif defined(__OPENCM904__)
97-
p_dxl_serial->flush();
101+
while (p_dxl_serial->available())
102+
{
103+
temp = p_dxl_serial->read();
104+
}
98105
#endif
99106
}
100107

@@ -205,7 +212,7 @@ bool PortHandlerArduino::isPacketTimeout()
205212

206213
double PortHandlerArduino::getCurrentTime()
207214
{
208-
return (double)millis();
215+
return (double)millis();
209216
}
210217

211218
double PortHandlerArduino::getTimeSinceStart()
@@ -285,8 +292,15 @@ void PortHandlerArduino::setTxEnable()
285292
void PortHandlerArduino::setTxDisable()
286293
{
287294
#if defined(__OPENCR__)
295+
#ifdef SERIAL_WRITES_NON_BLOCKING
296+
DYNAMIXEL_SERIAL.flush(); // make sure it completes before we disable...
297+
#endif
288298
drv_dxl_tx_enable(FALSE);
299+
289300
#elif defined(__OPENCM904__)
301+
#ifdef SERIAL_WRITES_NON_BLOCKING
302+
p_dxl_serial->flush();
303+
#endif
290304
drv_dxl_tx_enable(socket_fd_, FALSE);
291305
#endif
292306
}

ros/CHANGELOG.rst

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

5+
3.7.0 (2019-01-03)
6+
------------------
7+
* added clear instruction [#269](https://github.com/ROBOTIS-GIT/DynamixelSDK/issues/269)
8+
* removed busy waiting for rxPacket()
9+
* fixed addStuffing() function (reduced stack memory usage)
10+
* fixed memory issues [#268](https://github.com/ROBOTIS-GIT/DynamixelSDK/issues/268)
11+
* fixed the broadcast ping bug in dxl_monitor
12+
* Contributors: Gilbert, Zerom, Darby Lim, Kurt, Pyo
13+
514
3.6.2 (2018-07-17)
615
------------------
716
* added python modules for ROS to ros folder

ros/include/dynamixel_sdk/packet_handler.h

100755100644
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@
2424

2525
#if defined(ARDUINO) || defined(__OPENCR__) || defined(__OPENCM904__)
2626
#include <Arduino.h>
27+
28+
#define ERROR_PRINT SerialBT2.print
29+
#else
30+
#define ERROR_PRINT printf
31+
2732
#endif
2833

2934
#include <stdio.h>
@@ -587,4 +592,4 @@ class WINDECLSPEC PacketHandler
587592
}
588593

589594

590-
#endif /* DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_SDK_PACKETHANDLER_H_ */
595+
#endif /* DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_SDK_PACKETHANDLER_H_ */

ros/include/dynamixel_sdk/protocol1_packet_handler.h

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,4 +534,4 @@ class WINDECLSPEC Protocol1PacketHandler : public PacketHandler
534534
}
535535

536536

537-
#endif /* DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_SDK_PROTOCOL1PACKETHANDLER_H_ */
537+
#endif /* DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_SDK_PROTOCOL1PACKETHANDLER_H_ */

ros/include/dynamixel_sdk/protocol2_packet_handler.h

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,4 +551,4 @@ class WINDECLSPEC Protocol2PacketHandler : public PacketHandler
551551
}
552552

553553

554-
#endif /* DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_SDK_PROTOCOL2PACKETHANDLER_H_ */
554+
#endif /* DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_SDK_PROTOCOL2PACKETHANDLER_H_ */

ros/package.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>dynamixel_sdk</name>
4-
<version>3.6.2</version>
4+
<version>3.7.0</version>
55
<description>
66
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.
77
</description>
88
<license>Apache 2.0</license>
9-
<author email="pyo@robotis.com">Pyo</author>
9+
<author email="kkjong@robotis.com">Gilbert</author>
1010
<author email="[email protected]">Zerom</author>
11+
<author email="[email protected]">Darby Lim</author>
1112
<author>Leon</author>
1213
<maintainer email="[email protected]">Pyo</maintainer>
14+
<maintainer email="[email protected]">Gilbert</maintainer>
1315
<url type="website">http://wiki.ros.org/dynamixel_sdk</url>
1416
<url type="emanual">http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_sdk/overview/</url>
1517
<url type="repository">https://github.com/ROBOTIS-GIT/DynamixelSDK</url>

ros/src/dynamixel_sdk/port_handler_arduino.cpp

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#define DYNAMIXEL_SERIAL Serial3
2828
#endif
2929

30-
#define LATENCY_TIMER 16 // msec (USB latency timer)
30+
#define LATENCY_TIMER 4 // msec (USB latency timer)
3131

3232
using namespace dynamixel;
3333

@@ -91,10 +91,17 @@ void PortHandlerArduino::closePort()
9191

9292
void PortHandlerArduino::clearPort()
9393
{
94+
int temp __attribute__((unused));
9495
#if defined(__OPENCR__)
95-
DYNAMIXEL_SERIAL.flush();
96+
while (DYNAMIXEL_SERIAL.available())
97+
{
98+
temp = DYNAMIXEL_SERIAL.read();
99+
}
96100
#elif defined(__OPENCM904__)
97-
p_dxl_serial->flush();
101+
while (p_dxl_serial->available())
102+
{
103+
temp = p_dxl_serial->read();
104+
}
98105
#endif
99106
}
100107

@@ -205,7 +212,7 @@ bool PortHandlerArduino::isPacketTimeout()
205212

206213
double PortHandlerArduino::getCurrentTime()
207214
{
208-
return (double)millis();
215+
return (double)millis();
209216
}
210217

211218
double PortHandlerArduino::getTimeSinceStart()
@@ -285,8 +292,15 @@ void PortHandlerArduino::setTxEnable()
285292
void PortHandlerArduino::setTxDisable()
286293
{
287294
#if defined(__OPENCR__)
295+
#ifdef SERIAL_WRITES_NON_BLOCKING
296+
DYNAMIXEL_SERIAL.flush(); // make sure it completes before we disable...
297+
#endif
288298
drv_dxl_tx_enable(FALSE);
299+
289300
#elif defined(__OPENCM904__)
301+
#ifdef SERIAL_WRITES_NON_BLOCKING
302+
p_dxl_serial->flush();
303+
#endif
290304
drv_dxl_tx_enable(socket_fd_, FALSE);
291305
#endif
292306
}

ros/src/dynamixel_sdk/protocol1_packet_handler.cpp

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -725,4 +725,4 @@ int Protocol1PacketHandler::bulkReadTx(PortHandler *port, uint8_t *param, uint16
725725
int Protocol1PacketHandler::bulkWriteTxOnly(PortHandler *port, uint8_t *param, uint16_t param_length)
726726
{
727727
return COMM_NOT_AVAILABLE;
728-
}
728+
}

0 commit comments

Comments
 (0)