Skip to content

Commit

Permalink
Merge pull request #14 from ROBOTIS-GIT/release-0.1.5
Browse files Browse the repository at this point in the history
Release 0.1.5
  • Loading branch information
Kei committed Dec 20, 2019
2 parents 7712fd3 + 7aaa004 commit efd367a
Show file tree
Hide file tree
Showing 18 changed files with 36 additions and 5 deletions.
2 changes: 2 additions & 0 deletions examples/advanced/bulk_read_write_raw/bulk_read_write_raw.ino
Expand Up @@ -20,6 +20,8 @@
#include <SoftwareSerial.h>
SoftwareSerial soft_serial(7, 8); // DYNAMIXELShield UART RX/TX
#define DEBUG_SERIAL soft_serial
#elif defined(ARDUINO_SAM_DUE) || defined(ARDUINO_SAM_ZERO)
#define DEBUG_SERIAL SerialUSB
#else
#define DEBUG_SERIAL Serial
#endif
Expand Down
Expand Up @@ -20,6 +20,8 @@
#include <SoftwareSerial.h>
SoftwareSerial soft_serial(7, 8); // DYNAMIXELShield UART RX/TX
#define DEBUG_SERIAL soft_serial
#elif defined(ARDUINO_SAM_DUE) || defined(ARDUINO_SAM_ZERO)
#define DEBUG_SERIAL SerialUSB
#else
#define DEBUG_SERIAL Serial
#endif
Expand Down
Expand Up @@ -115,12 +115,12 @@
EXTERNAL_PORT_DATA_4,
*/

#ifdef ARDUINO_AVR_UNO
#if defined(ARDUINO_AVR_UNO) || defined(ARDUINO_AVR_MEGA2560)
#include <SoftwareSerial.h>
SoftwareSerial soft_serial(7, 8); // DYNAMIXELShield UART RX/TX
#define DEBUG_SERIAL soft_serial
#elif ARDUINO_AVR_MEGA2560
#define DEBUG_SERIAL Serial1
#elif defined(ARDUINO_SAM_DUE) || defined(ARDUINO_SAM_ZERO)
#define DEBUG_SERIAL SerialUSB
#else
#define DEBUG_SERIAL Serial
#endif
Expand Down
2 changes: 2 additions & 0 deletions examples/advanced/sync_bulk_raw/sync_bulk_raw.ino
Expand Up @@ -20,6 +20,8 @@
#include <SoftwareSerial.h>
SoftwareSerial soft_serial(7, 8); // DYNAMIXELShield UART RX/TX
#define DEBUG_SERIAL soft_serial
#elif defined(ARDUINO_SAM_DUE) || defined(ARDUINO_SAM_ZERO)
#define DEBUG_SERIAL SerialUSB
#else
#define DEBUG_SERIAL Serial
#endif
Expand Down
2 changes: 2 additions & 0 deletions examples/advanced/sync_read_write_raw/sync_read_write_raw.ino
Expand Up @@ -20,6 +20,8 @@
#include <SoftwareSerial.h>
SoftwareSerial soft_serial(7, 8); // DYNAMIXELShield UART RX/TX
#define DEBUG_SERIAL soft_serial
#elif defined(ARDUINO_SAM_DUE) || defined(ARDUINO_SAM_ZERO)
#define DEBUG_SERIAL SerialUSB
#else
#define DEBUG_SERIAL Serial
#endif
Expand Down
2 changes: 2 additions & 0 deletions examples/basic/baudrate/baudrate.ino
Expand Up @@ -20,6 +20,8 @@
#include <SoftwareSerial.h>
SoftwareSerial soft_serial(7, 8); // DYNAMIXELShield UART RX/TX
#define DEBUG_SERIAL soft_serial
#elif defined(ARDUINO_SAM_DUE) || defined(ARDUINO_SAM_ZERO)
#define DEBUG_SERIAL SerialUSB
#else
#define DEBUG_SERIAL Serial
#endif
Expand Down
2 changes: 2 additions & 0 deletions examples/basic/current_mode/current_mode.ino
Expand Up @@ -20,6 +20,8 @@
#include <SoftwareSerial.h>
SoftwareSerial soft_serial(7, 8); // DYNAMIXELShield UART RX/TX
#define DEBUG_SERIAL soft_serial
#elif defined(ARDUINO_SAM_DUE) || defined(ARDUINO_SAM_ZERO)
#define DEBUG_SERIAL SerialUSB
#else
#define DEBUG_SERIAL Serial
#endif
Expand Down
Expand Up @@ -24,6 +24,8 @@
#include <SoftwareSerial.h>
SoftwareSerial soft_serial(7, 8); // DYNAMIXELShield UART RX/TX
#define DEBUG_SERIAL soft_serial
#elif defined(ARDUINO_SAM_DUE) || defined(ARDUINO_SAM_ZERO)
#define DEBUG_SERIAL SerialUSB
#else
#define DEBUG_SERIAL Serial
#endif
Expand Down
2 changes: 2 additions & 0 deletions examples/basic/id/id.ino
Expand Up @@ -20,6 +20,8 @@
#include <SoftwareSerial.h>
SoftwareSerial soft_serial(7, 8); // DYNAMIXELShield UART RX/TX
#define DEBUG_SERIAL soft_serial
#elif defined(ARDUINO_SAM_DUE) || defined(ARDUINO_SAM_ZERO)
#define DEBUG_SERIAL SerialUSB
#else
#define DEBUG_SERIAL Serial
#endif
Expand Down
2 changes: 2 additions & 0 deletions examples/basic/operating_mode/operating_mode.ino
Expand Up @@ -30,6 +30,8 @@
#include <SoftwareSerial.h>
SoftwareSerial soft_serial(7, 8); // DYNAMIXELShield UART RX/TX
#define DEBUG_SERIAL soft_serial
#elif defined(ARDUINO_SAM_DUE) || defined(ARDUINO_SAM_ZERO)
#define DEBUG_SERIAL SerialUSB
#else
#define DEBUG_SERIAL Serial
#endif
Expand Down
2 changes: 2 additions & 0 deletions examples/basic/ping/ping.ino
Expand Up @@ -20,6 +20,8 @@
#include <SoftwareSerial.h>
SoftwareSerial soft_serial(7, 8); // DYNAMIXELShield UART RX/TX
#define DEBUG_SERIAL soft_serial
#elif defined(ARDUINO_SAM_DUE) || defined(ARDUINO_SAM_ZERO)
#define DEBUG_SERIAL SerialUSB
#else
#define DEBUG_SERIAL Serial
#endif
Expand Down
2 changes: 2 additions & 0 deletions examples/basic/position_mode/position_mode.ino
Expand Up @@ -20,6 +20,8 @@
#include <SoftwareSerial.h>
SoftwareSerial soft_serial(7, 8); // DYNAMIXELShield UART RX/TX
#define DEBUG_SERIAL soft_serial
#elif defined(ARDUINO_SAM_DUE) || defined(ARDUINO_SAM_ZERO)
#define DEBUG_SERIAL SerialUSB
#else
#define DEBUG_SERIAL Serial
#endif
Expand Down
Expand Up @@ -25,6 +25,8 @@
#include <SoftwareSerial.h>
SoftwareSerial soft_serial(7, 8); // DYNAMIXELShield UART RX/TX
#define DEBUG_SERIAL soft_serial
#elif defined(ARDUINO_SAM_DUE) || defined(ARDUINO_SAM_ZERO)
#define DEBUG_SERIAL SerialUSB
#else
#define DEBUG_SERIAL Serial
#endif
Expand Down
2 changes: 2 additions & 0 deletions examples/basic/pwm_mode/pwm_mode.ino
Expand Up @@ -20,6 +20,8 @@
#include <SoftwareSerial.h>
SoftwareSerial soft_serial(7, 8); // DYNAMIXELShield UART RX/TX
#define DEBUG_SERIAL soft_serial
#elif defined(ARDUINO_SAM_DUE) || defined(ARDUINO_SAM_ZERO)
#define DEBUG_SERIAL SerialUSB
#else
#define DEBUG_SERIAL Serial
#endif
Expand Down
2 changes: 2 additions & 0 deletions examples/basic/scan_dynamixel/scan_dynamixel.ino
Expand Up @@ -20,6 +20,8 @@
#include <SoftwareSerial.h>
SoftwareSerial soft_serial(7, 8); // DYNAMIXELShield UART RX/TX
#define DEBUG_SERIAL soft_serial
#elif defined(ARDUINO_SAM_DUE) || defined(ARDUINO_SAM_ZERO)
#define DEBUG_SERIAL SerialUSB
#else
#define DEBUG_SERIAL Serial
#endif
Expand Down
2 changes: 2 additions & 0 deletions examples/basic/velocity_mode/velocity_mode.ino
Expand Up @@ -20,6 +20,8 @@
#include <SoftwareSerial.h>
SoftwareSerial soft_serial(7, 8); // DYNAMIXELShield UART RX/TX
#define DEBUG_SERIAL soft_serial
#elif defined(ARDUINO_SAM_DUE) || defined(ARDUINO_SAM_ZERO)
#define DEBUG_SERIAL SerialUSB
#else
#define DEBUG_SERIAL Serial
#endif
Expand Down
2 changes: 1 addition & 1 deletion library.properties
@@ -1,5 +1,5 @@
name=DynamixelShield
version=0.1.4
version=0.1.5
author=ROBOTIS
license=Apache-2.0
maintainer=Kei(kkw@robotis.com)
Expand Down
3 changes: 2 additions & 1 deletion src/DynamixelShield.h
Expand Up @@ -28,7 +28,8 @@
#endif


#if defined(ARDUINO_AVR_UNO) || defined(ARDUINO_AVR_MEGA2560)
// https://www.arduino.cc/reference/en/language/functions/communication/serial/
#if defined(ARDUINO_AVR_UNO) || defined(ARDUINO_AVR_MEGA2560) || defined(ARDUINO_SAM_DUE)
#define DXL_SERIAL Serial
#else
#define DXL_SERIAL Serial1
Expand Down

0 comments on commit efd367a

Please sign in to comment.