Merge pull request #119 from ROBOTIS-GIT/master

merge for sync kinetic-devel and master branch
ROBOTIS-GIT · Feb 27, 2018 · daa5a20 · daa5a20
2 parents 9ada73b + 4ea7f8c
commit daa5a20
Show file tree

Hide file tree

Showing 23 changed files with 43 additions and 36 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,13 @@
 # This config file for Travis CI utilizes ros-industrial/industrial_ci package.
 # For more info for the package, see https://github.com/ros-industrial/industrial_ci/blob/master/README.rst
-sudo: required 
-dist: xenial 
+
+dist: trusty
+sudo: required
 services:
   - docker
-language: generic 
+language: generic
+python:
+  - "2.7"
 compiler:
   - gcc
 notifications:
@@ -23,9 +26,9 @@ matrix:
 branches:
   only:
     - master
+    - develop
     - kinetic-devel
 install:
   - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
-script: 
-  - .ci_config/travis.sh
-
+script:
+  - source .ci_config/travis.sh
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # Dynamixel workbench packages
 
+[![Build Status](https://travis-ci.org/ROBOTIS-GIT/dynamixel-workbench.svg)](https://travis-ci.org/ROBOTIS-GIT/dynamixel-workbench)
+
 For more information, please check the document below.
 
 [ROS Wiki for Dynamixel workbench](http://wiki.ros.org/dynamixel_workbench)

diff --git a/dynamixel_workbench_controllers/CMakeLists.txt b/dynamixel_workbench_controllers/CMakeLists.txt
@@ -28,7 +28,7 @@ find_package(catkin REQUIRED COMPONENTS
 ################################################################################
 catkin_package(
  INCLUDE_DIRS include
- LIBRARIES dynamixel_workbench_controllers
+ LIBRARIES ${PROJECT_NAME}
  CATKIN_DEPENDS roscpp dynamixel_workbench_msgs dynamixel_workbench_toolbox
 )
 

diff --git a/dynamixel_workbench_controllers/include/dynamixel_workbench_controllers/multi_port.h b/dynamixel_workbench_controllers/include/dynamixel_workbench_controllers/multi_port.h
@@ -23,7 +23,7 @@
 
 #include "message_header.h"
 
-#include <dynamixel_workbench.h>
+#include <dynamixel_workbench_toolbox/dynamixel_workbench.h>
 #include <dynamixel_workbench_msgs/DynamixelStateList.h>
 #include <dynamixel_workbench_msgs/JointCommand.h>
 

diff --git a/dynamixel_workbench_controllers/include/dynamixel_workbench_controllers/position_control.h b/dynamixel_workbench_controllers/include/dynamixel_workbench_controllers/position_control.h
@@ -23,7 +23,7 @@
 
 #include "message_header.h"
 
-#include <dynamixel_workbench.h>
+#include <dynamixel_workbench_toolbox/dynamixel_workbench.h>
 #include <dynamixel_workbench_msgs/DynamixelStateList.h>
 #include <dynamixel_workbench_msgs/JointCommand.h>
 

diff --git a/dynamixel_workbench_controllers/include/dynamixel_workbench_controllers/torque_control.h b/dynamixel_workbench_controllers/include/dynamixel_workbench_controllers/torque_control.h
@@ -23,7 +23,7 @@
 
 #include "message_header.h"
 
-#include <dynamixel_workbench.h>
+#include <dynamixel_workbench_toolbox/dynamixel_workbench.h>
 #include <dynamixel_workbench_msgs/DynamixelStateList.h>
 #include <dynamixel_workbench_msgs/JointCommand.h>
 

diff --git a/dynamixel_workbench_controllers/include/dynamixel_workbench_controllers/velocity_control.h b/dynamixel_workbench_controllers/include/dynamixel_workbench_controllers/velocity_control.h
@@ -37,7 +37,7 @@
 
 #include "message_header.h"
 
-#include <dynamixel_workbench.h>
+#include <dynamixel_workbench_toolbox/dynamixel_workbench.h>
 #include <dynamixel_workbench_msgs/DynamixelStateList.h>
 #include <dynamixel_workbench_msgs/WheelCommand.h>
 

diff --git a/dynamixel_workbench_operators/CMakeLists.txt b/dynamixel_workbench_operators/CMakeLists.txt
@@ -26,8 +26,7 @@ find_package(catkin REQUIRED COMPONENTS
 # Catkin specific configuration
 ################################################################################
 catkin_package(
- INCLUDE_DIRS
- LIBRARIES dynamixel_workbench_operators
+ LIBRARIES ${PROJECT_NAME}
  CATKIN_DEPENDS roscpp dynamixel_workbench_msgs
 )
 

diff --git a/dynamixel_workbench_single_manager/CMakeLists.txt b/dynamixel_workbench_single_manager/CMakeLists.txt
@@ -28,7 +28,7 @@ find_package(catkin REQUIRED COMPONENTS
 ################################################################################
 catkin_package(
   INCLUDE_DIRS include
-  LIBRARIES dynamixel_workbench_single_manager
+  LIBRARIES ${PROJECT_NAME}
   CATKIN_DEPENDS roscpp dynamixel_workbench_msgs dynamixel_workbench_toolbox
 )
 

diff --git a/...ench_single_manager/include/dynamixel_workbench_single_manager/single_dynamixel_monitor.h b/...ench_single_manager/include/dynamixel_workbench_single_manager/single_dynamixel_monitor.h
@@ -21,8 +21,8 @@
 
 #include <ros/ros.h>
 
-#include "dynamixel_driver.h"
 #include "dynamixel_sdk/dynamixel_sdk.h"
+#include "dynamixel_workbench_toolbox/dynamixel_driver.h"
 
 #include "dynamixel_workbench_msgs/DynamixelCommand.h"
 #include "dynamixel_workbench_msgs/GetDynamixelInfo.h"

diff --git a/dynamixel_workbench_single_manager_gui/CMakeLists.txt b/dynamixel_workbench_single_manager_gui/CMakeLists.txt
@@ -27,20 +27,19 @@ find_package(catkin REQUIRED COMPONENTS
 ################################################################################
 # Catkin specific configuration
 ################################################################################
+catkin_package(
+  INCLUDE_DIRS include
+  CATKIN_DEPENDS qt_build roscpp dynamixel_workbench_msgs dynamixel_workbench_toolbox
+)
 
 ################################################################################
 # Build
 ################################################################################
-include_directories(${catkin_INCLUDE_DIRS})
-
-catkin_package(
-    INCLUDE_DIRS include
-    CATKIN_DEPENDS qt_build roscpp dynamixel_workbench_msgs dynamixel_workbench_toolbox
+include_directories(
+  ${catkin_INCLUDE_DIRS}
+  include
 )
 
-################################################################################
-# Qt Environment
-################################################################################
 rosbuild_prepare_qt4(QtCore QtGui)
 
 file(GLOB_RECURSE QT_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} FOLLOW_SYMLINKS src/*.cpp)
@@ -57,7 +56,7 @@ target_link_libraries(dynamixel_workbench_single_manager_gui ${QT_LIBRARIES} ${c
 install(TARGETS dynamixel_workbench_single_manager_gui RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
 
 #################################################################################
-## Build
+## Install
 #################################################################################
 install(TARGETS dynamixel_workbench_single_manager_gui
   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
@@ -68,3 +67,7 @@ install(TARGETS dynamixel_workbench_single_manager_gui
 install(DIRECTORY include/${PROJECT_NAME}/
   DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
 )
+
+################################################################################
+# Test
+################################################################################
diff --git a/...rkbench_single_manager_gui/include/dynamixel_workbench_single_manager_gui/main_window.hpp b/...rkbench_single_manager_gui/include/dynamixel_workbench_single_manager_gui/main_window.hpp
@@ -26,7 +26,7 @@
 #include "qnode.hpp"
 
 #include "dynamixel_workbench_msgs/DynamixelCommand.h"
-#include "dynamixel_driver.h"
+#include "dynamixel_workbench_toolbox/dynamixel_driver.h"
 
 #endif
 

diff --git a/dynamixel_workbench_toolbox/CMakeLists.txt b/dynamixel_workbench_toolbox/CMakeLists.txt
@@ -26,7 +26,7 @@ find_package(catkin REQUIRED COMPONENTS
 # Catkin specific configuration
 ################################################################################
 catkin_package(
- INCLUDE_DIRS include/dynamixel_workbench
+ INCLUDE_DIRS include
  LIBRARIES dynamixel_workbench_toolbox
  CATKIN_DEPENDS roscpp dynamixel_sdk
 )
@@ -36,13 +36,14 @@ catkin_package(
 ################################################################################
 include_directories(
   ${catkin_INCLUDE_DIRS}
+  include
 )
 
 add_library(dynamixel_workbench_toolbox
-  src/dynamixel_workbench/dynamixel_item.cpp
-  src/dynamixel_workbench/dynamixel_driver.cpp
-  src/dynamixel_workbench/dynamixel_tool.cpp
-  src/dynamixel_workbench/dynamixel_workbench.cpp
+  src/dynamixel_workbench_toolbox/dynamixel_item.cpp
+  src/dynamixel_workbench_toolbox/dynamixel_driver.cpp
+  src/dynamixel_workbench_toolbox/dynamixel_tool.cpp
+  src/dynamixel_workbench_toolbox/dynamixel_workbench.cpp
 )
 
 add_dependencies(dynamixel_workbench_toolbox ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
@@ -61,7 +62,6 @@ install(DIRECTORY include/${PROJECT_NAME}/
   DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
 )
 
-
 ################################################################################
 # Test
 ################################################################################
diff --git a/.../dynamixel_workbench/control_table_item.h → ...el_workbench_toolbox/control_table_item.h b/.../dynamixel_workbench/control_table_item.h → ...el_workbench_toolbox/control_table_item.h
diff --git a/...de/dynamixel_workbench/dynamixel_driver.h → ...ixel_workbench_toolbox/dynamixel_driver.h b/...de/dynamixel_workbench/dynamixel_driver.h → ...ixel_workbench_toolbox/dynamixel_driver.h
diff --git a/...lude/dynamixel_workbench/dynamixel_item.h → ...amixel_workbench_toolbox/dynamixel_item.h b/...lude/dynamixel_workbench/dynamixel_item.h → ...amixel_workbench_toolbox/dynamixel_item.h
diff --git a/...lude/dynamixel_workbench/dynamixel_tool.h → ...amixel_workbench_toolbox/dynamixel_tool.h b/...lude/dynamixel_workbench/dynamixel_tool.h → ...amixel_workbench_toolbox/dynamixel_tool.h
diff --git a/...dynamixel_workbench/dynamixel_workbench.h → ...l_workbench_toolbox/dynamixel_workbench.h b/...dynamixel_workbench/dynamixel_workbench.h → ...l_workbench_toolbox/dynamixel_workbench.h
diff --git a/dynamixel_workbench_toolbox/src/DynamixelWorkbench.h b/dynamixel_workbench_toolbox/src/DynamixelWorkbench.h
@@ -1,2 +1,2 @@
-#include "../include/dynamixel_workbench/dynamixel_workbench.h"
+#include "../include/dynamixel_workbench_toolbox/dynamixel_workbench.h"
 
diff --git a/.../dynamixel_workbench/dynamixel_driver.cpp → ...el_workbench_toolbox/dynamixel_driver.cpp b/.../dynamixel_workbench/dynamixel_driver.cpp → ...el_workbench_toolbox/dynamixel_driver.cpp
@@ -16,7 +16,7 @@
 
 /* Authors: Taehun Lim (Darby) */
 
-#include "../../include/dynamixel_workbench/dynamixel_driver.h"
+#include "../../include/dynamixel_workbench_toolbox/dynamixel_driver.h"
 
 DynamixelDriver::DynamixelDriver() : tools_cnt_(0), sync_write_handler_cnt_(0), sync_read_handler_cnt_(0) {}
 

diff --git a/...rc/dynamixel_workbench/dynamixel_item.cpp → ...ixel_workbench_toolbox/dynamixel_item.cpp b/...rc/dynamixel_workbench/dynamixel_item.cpp → ...ixel_workbench_toolbox/dynamixel_item.cpp
@@ -16,7 +16,7 @@
 
 /* Authors: Taehun Lim (Darby) */
 
-#include "../../include/dynamixel_workbench/dynamixel_item.h"
+#include "../../include/dynamixel_workbench_toolbox/dynamixel_item.h"
 
 static uint8_t the_number_of_item = 0;
 

diff --git a/...rc/dynamixel_workbench/dynamixel_tool.cpp → ...ixel_workbench_toolbox/dynamixel_tool.cpp b/...rc/dynamixel_workbench/dynamixel_tool.cpp → ...ixel_workbench_toolbox/dynamixel_tool.cpp
@@ -16,7 +16,7 @@
 
 /* Authors: Taehun Lim (Darby) */
 
-#include "../../include/dynamixel_workbench/dynamixel_tool.h"
+#include "../../include/dynamixel_workbench_toolbox/dynamixel_tool.h"
 
 DynamixelTool::DynamixelTool() : dxl_info_cnt_(0), the_number_of_item_(0){}
 

diff --git a/...namixel_workbench/dynamixel_workbench.cpp → ...workbench_toolbox/dynamixel_workbench.cpp b/...namixel_workbench/dynamixel_workbench.cpp → ...workbench_toolbox/dynamixel_workbench.cpp
@@ -16,7 +16,7 @@
 
 /* Authors: Taehun Lim (Darby) */
 
-#include "../../include/dynamixel_workbench/dynamixel_workbench.h"
+#include "../../include/dynamixel_workbench_toolbox/dynamixel_workbench.h"
 
 DynamixelWorkbench::DynamixelWorkbench()
 {
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		#include "../include/dynamixel_workbench/dynamixel_workbench.h"
		#include "../include/dynamixel_workbench_toolbox/dynamixel_workbench.h"