Skip to content

Commit

Permalink
Merge pull request #73 from ROBOTIS-GIT/master
Browse files Browse the repository at this point in the history
Merge for sync kinetic-devel and master branch
  • Loading branch information
robotpilot authored Apr 24, 2017
2 parents 689d764 + c14be83 commit 89d7131
Show file tree
Hide file tree
Showing 69 changed files with 2,839 additions and 102 deletions.
23 changes: 23 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
Please fill out the questionaire to give you the best support service.

- Which DYNAMIXEL is it?

[ - ] ( ex: MX-64AT , XM430-350R , PRO H54-100-S500-R , ...)

- Which CONTROLLER is it?

[   ] ( ex: OpenCM , OpenCR , Arduino Uno , PC via USB2Dynamixel , ... )

- Which VERSION of DynamixelSDK is it?

([NOTE] DynamixelSDK Q&A is not available anymore if it is older than ver. 3.0.0, but feedback us)

[   ] ( ex: 3.4.2 , dxl_sdk_win32_v2_02.zip , ... )

- Any PICTURES or VIDEOS?

![]( Link the PICTURES or VIDEOS here, if necessary )

- Any SOURCE SAMPLES?

[]( Link the SOURCE SAMPLES here, if necessary )
11 changes: 9 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@

### Software Release
--------------------------------------------------------------------------
| Dynamixel SDK Version | 1.X | 2.X | 3.X ([Download](https://github.com/ROBOTIS-GIT/DynamixelSDK/archive/master.zip)) |
| Dynamixel SDK Version | 1.X | 2.X | 3.X ([Download](https://github.com/ROBOTIS-GIT/DynamixelSDK/releases)) |
| ------------- | ------------- | ------------- | ------------- |
| Release date| 2010.05.16 | 2015.02.10 | 2016.03.08 |
| Latest version released |||3.4.1|
| Latest version released |||3.4.3|
| OS | Linux | Windows | Linux + Windows |
||||+ MacOSX (coming soon)|
| Available Dynamixel models | All models | All models | All models |
|||||
| Multi Port Control <br> (Controls Dynamixels through <br> more than two ports)| X | X | O |
Expand All @@ -28,9 +29,15 @@
| | | | Java |
| (C++ ver. Library binded)¹| C++| | C++|
| | | | ROS |
| | | | Arduino (coming soon) |

#####¹ C++ ver. Library is not optimized in binding other languages. Please use C ver. Library instead.
---------------------------------------------------------------------------

* [Quick Start Video](https://github.com/ROBOTIS-GIT/DynamixelSDK/wiki/Quick-Start-Video) may make you run your Dynamixel in 20 minutes.

[![](https://github.com/ROBOTIS-GIT/ROBOTIS-Documents/blob/master/wiki-images/DynamixelSDK/Quick%20Start/Episode%201-Introduction%20to%20the%20Dynamixel%20SDK%2C%20the%20Dynamixel%20SDK%20Wiki%2C%20and%20the%20Issues%20Section.png)](https://github.com/ROBOTIS-GIT/DynamixelSDK/wiki/Quick-Start-Video)

* ####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)
Expand Down
23 changes: 23 additions & 0 deletions ReleaseNote.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
==============================================
Dynamixel SDK v3.4.3 (Protocol 1.0/2.0)
==============================================

- 02.17.2017

* DynamixelSDK C++ ver. and ROS ver. in Windows platform now can use the port number of over then 10 #45


==============================================
Dynamixel SDK v3.4.2 (Protocol 1.0/2.0)
==============================================

- 02.16.2017

* fprintf output in GrouBulkRead of C++ removed
* MATLAB library compiler error solving
* Makefile for build example sources in SBC added
* build files of windows c and c++ SDK rebuilt by using renewed SDK libraries
* example source of dxl_monitor - c and cpp ver modified #50

* Solved issue : #31, #34, #36, #50

==============================================
Dynamixel SDK v3.4.1 (Protocol 1.0/2.0)
==============================================
Expand Down
Binary file modified c++/build/win32/.vs/dxl_x86_cpp/v14/.suo
Binary file not shown.
Binary file modified c++/build/win32/output/dxl_x86_cpp.dll
Binary file not shown.
Binary file modified c++/build/win32/output/dxl_x86_cpp.lib
Binary file not shown.
Binary file modified c++/build/win64/.vs/dxl_x64_cpp/v14/.suo
Binary file not shown.
Binary file modified c++/build/win64/output/dxl_x64_cpp.dll
Binary file not shown.
Binary file modified c++/build/win64/output/dxl_x64_cpp.lib
Binary file not shown.
4 changes: 2 additions & 2 deletions c++/example/dxl_monitor/dxl_monitor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ int kbhit(void)
void usage(char *progname)
{
printf("-----------------------------------------------------------------------\n");
printf("Usage: %s\n");
printf("Usage: %s\n", progname);
printf(" [-h | --help]........: display this help\n");
printf("[-d | --device]......: port to open\n", progname);
printf(" [-d | --device]......: port to open\n");
printf("-----------------------------------------------------------------------\n");
}

Expand Down
79 changes: 79 additions & 0 deletions c++/example/dxl_monitor/linux_sbc/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
##################################################
# PROJECT: DXL Monitor tool Makefile
# AUTHOR : ROBOTIS Ltd.
##################################################

#---------------------------------------------------------------------
# Makefile template for projects using DXL SDK
#
# Please make sure to follow these instructions when setting up your
# own copy of this file:
#
# 1- Enter the name of the target (the TARGET variable)
# 2- Add additional source files to the SOURCES variable
# 3- Add additional static library objects to the OBJECTS variable
# if necessary
# 4- Ensure that compiler flags, INCLUDES, and LIBRARIES are
# appropriate to your needs
#
#
# This makefile will link against several libraries, not all of which
# are necessarily needed for your project. Please feel free to
# remove libaries you do not need.
#---------------------------------------------------------------------

# *** ENTER THE TARGET NAME HERE ***
TARGET = dxl_monitor

# important directories used by assorted rules and other variables
DIR_DXL = ../..
DIR_OBJS = .objects

# compiler options
CC = gcc
CX = g++
CCFLAGS = -O2 -O3 -DLINUX -D_GNU_SOURCE -Wall $(INCLUDES) -g
CXFLAGS = -O2 -O3 -DLINUX -D_GNU_SOURCE -Wall $(INCLUDES) -g
LNKCC = $(CX)
LNKFLAGS = $(CXFLAGS) #-Wl,-rpath,$(DIR_THOR)/lib

#---------------------------------------------------------------------
# Core components (all of these are likely going to be needed)
#---------------------------------------------------------------------
INCLUDES += -I$(DIR_DXL)/include
LIBRARIES += -ldxl_sbc_cpp
LIBRARIES += -lrt

#---------------------------------------------------------------------
# Files
#---------------------------------------------------------------------
SOURCES = dxl_monitor.cpp \
# *** OTHER SOURCES GO HERE ***

OBJECTS = $(addsuffix .o,$(addprefix $(DIR_OBJS)/,$(basename $(notdir $(SOURCES)))))
#OBJETCS += *** ADDITIONAL STATIC LIBRARIES GO HERE ***


#---------------------------------------------------------------------
# Compiling Rules
#---------------------------------------------------------------------
$(TARGET): make_directory $(OBJECTS)
$(LNKCC) $(LNKFLAGS) $(OBJECTS) -o $(TARGET) $(LIBRARIES)

all: $(TARGET)

clean:
rm -rf $(TARGET) $(DIR_OBJS) core *~ *.a *.so *.lo

make_directory:
mkdir -p $(DIR_OBJS)/

$(DIR_OBJS)/%.o: ../%.c
$(CC) $(CCFLAGS) -c $? -o $@

$(DIR_OBJS)/%.o: ../%.cpp
$(CX) $(CXFLAGS) -c $? -o $@

#---------------------------------------------------------------------
# End of Makefile
#---------------------------------------------------------------------
79 changes: 79 additions & 0 deletions c++/example/protocol1.0/bulk_read/linux_sbc/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
##################################################
# PROJECT: DXL Protocol 1.0 bulk_read Example Makefile
# AUTHOR : ROBOTIS Ltd.
##################################################

#---------------------------------------------------------------------
# Makefile template for projects using DXL SDK
#
# Please make sure to follow these instructions when setting up your
# own copy of this file:
#
# 1- Enter the name of the target (the TARGET variable)
# 2- Add additional source files to the SOURCES variable
# 3- Add additional static library objects to the OBJECTS variable
# if necessary
# 4- Ensure that compiler flags, INCLUDES, and LIBRARIES are
# appropriate to your needs
#
#
# This makefile will link against several libraries, not all of which
# are necessarily needed for your project. Please feel free to
# remove libaries you do not need.
#---------------------------------------------------------------------

# *** ENTER THE TARGET NAME HERE ***
TARGET = bulk_read

# important directories used by assorted rules and other variables
DIR_DXL = ../../..
DIR_OBJS = .objects

# compiler options
CC = gcc
CX = g++
CCFLAGS = -O2 -O3 -DLINUX -D_GNU_SOURCE -Wall $(INCLUDES) -g
CXFLAGS = -O2 -O3 -DLINUX -D_GNU_SOURCE -Wall $(INCLUDES) -g
LNKCC = $(CX)
LNKFLAGS = $(CXFLAGS) #-Wl,-rpath,$(DIR_THOR)/lib

#---------------------------------------------------------------------
# Core components (all of these are likely going to be needed)
#---------------------------------------------------------------------
INCLUDES += -I$(DIR_DXL)/include
LIBRARIES += -ldxl_sbc_cpp
LIBRARIES += -lrt

#---------------------------------------------------------------------
# Files
#---------------------------------------------------------------------
SOURCES = bulk_read.cpp \
# *** OTHER SOURCES GO HERE ***

OBJECTS = $(addsuffix .o,$(addprefix $(DIR_OBJS)/,$(basename $(notdir $(SOURCES)))))
#OBJETCS += *** ADDITIONAL STATIC LIBRARIES GO HERE ***


#---------------------------------------------------------------------
# Compiling Rules
#---------------------------------------------------------------------
$(TARGET): make_directory $(OBJECTS)
$(LNKCC) $(LNKFLAGS) $(OBJECTS) -o $(TARGET) $(LIBRARIES)

all: $(TARGET)

clean:
rm -rf $(TARGET) $(DIR_OBJS) core *~ *.a *.so *.lo

make_directory:
mkdir -p $(DIR_OBJS)/

$(DIR_OBJS)/%.o: ../%.c
$(CC) $(CCFLAGS) -c $? -o $@

$(DIR_OBJS)/%.o: ../%.cpp
$(CX) $(CXFLAGS) -c $? -o $@

#---------------------------------------------------------------------
# End of Makefile
#---------------------------------------------------------------------
79 changes: 79 additions & 0 deletions c++/example/protocol1.0/multi_port/linux_sbc/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
##################################################
# PROJECT: DXL Protocol 1.0 multi_port Example Makefile
# AUTHOR : ROBOTIS Ltd.
##################################################

#---------------------------------------------------------------------
# Makefile template for projects using DXL SDK
#
# Please make sure to follow these instructions when setting up your
# own copy of this file:
#
# 1- Enter the name of the target (the TARGET variable)
# 2- Add additional source files to the SOURCES variable
# 3- Add additional static library objects to the OBJECTS variable
# if necessary
# 4- Ensure that compiler flags, INCLUDES, and LIBRARIES are
# appropriate to your needs
#
#
# This makefile will link against several libraries, not all of which
# are necessarily needed for your project. Please feel free to
# remove libaries you do not need.
#---------------------------------------------------------------------

# *** ENTER THE TARGET NAME HERE ***
TARGET = multi_port

# important directories used by assorted rules and other variables
DIR_DXL = ../../..
DIR_OBJS = .objects

# compiler options
CC = gcc
CX = g++
CCFLAGS = -O2 -O3 -DLINUX -D_GNU_SOURCE -Wall $(INCLUDES) -g
CXFLAGS = -O2 -O3 -DLINUX -D_GNU_SOURCE -Wall $(INCLUDES) -g
LNKCC = $(CX)
LNKFLAGS = $(CXFLAGS) #-Wl,-rpath,$(DIR_THOR)/lib

#---------------------------------------------------------------------
# Core components (all of these are likely going to be needed)
#---------------------------------------------------------------------
INCLUDES += -I$(DIR_DXL)/include
LIBRARIES += -ldxl_sbc_cpp
LIBRARIES += -lrt

#---------------------------------------------------------------------
# Files
#---------------------------------------------------------------------
SOURCES = multi_port.cpp \
# *** OTHER SOURCES GO HERE ***

OBJECTS = $(addsuffix .o,$(addprefix $(DIR_OBJS)/,$(basename $(notdir $(SOURCES)))))
#OBJETCS += *** ADDITIONAL STATIC LIBRARIES GO HERE ***


#---------------------------------------------------------------------
# Compiling Rules
#---------------------------------------------------------------------
$(TARGET): make_directory $(OBJECTS)
$(LNKCC) $(LNKFLAGS) $(OBJECTS) -o $(TARGET) $(LIBRARIES)

all: $(TARGET)

clean:
rm -rf $(TARGET) $(DIR_OBJS) core *~ *.a *.so *.lo

make_directory:
mkdir -p $(DIR_OBJS)/

$(DIR_OBJS)/%.o: ../%.c
$(CC) $(CCFLAGS) -c $? -o $@

$(DIR_OBJS)/%.o: ../%.cpp
$(CX) $(CXFLAGS) -c $? -o $@

#---------------------------------------------------------------------
# End of Makefile
#---------------------------------------------------------------------
Loading

0 comments on commit 89d7131

Please sign in to comment.