Merge pull request #90 from ROBOTIS-GIT/develop

added dependency option for open_manipulator_control_gui package
ROBOTIS-GIT · Feb 17, 2019 · 3e1ddd3 · 3e1ddd3
2 parents c390e7f + 897e579
commit 3e1ddd3
Show file tree

Hide file tree

Showing 16 changed files with 47 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,12 +18,9 @@ notifications:
       - [email protected]
 env:
   matrix:
-    - ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=file $ROSINSTALL_FILENAME=".open_manipulator.rosinstall"
-    - ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=file $ROSINSTALL_FILENAME=".open_manipulator.rosinstall"
-    - ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=stretch
-    #- ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=xenial
-    #- ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=bionic
-    #- ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=stretch    
+    - ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=xenial
+    - ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=bionic
+    - ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=stretch    
 matrix:
   allow_failures:
     - env: ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=stretch

diff --git a/open_manipulator/CHANGELOG.rst b/open_manipulator/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package open_manipulator
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.0.1 (2019-02-18)
+------------------
+* added dependency option for open_manipulator_control_gui package
+* Contributors: Pyo
+
 2.0.0 (2019-02-08)
 ------------------
 * updated the CHANGELOG and version to release binary packages

diff --git a/open_manipulator/package.xml b/open_manipulator/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>open_manipulator</name>
-  <version>2.0.0</version>
+  <version>2.0.1</version>
   <description>
     ROS-enabled OpenManipulator is a full open robot platform consisting of OpenSoftware, OpenHardware and OpenCR(Embedded board).
     The OpenManipulator is allowed users to control it more easily by linking with the MoveIt! package. Moreover it has full hardware compatibility with TurtleBot3. 

diff --git a/open_manipulator_control_gui/CHANGELOG.rst b/open_manipulator_control_gui/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package open_manipulator_control_gui
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.0.1 (2019-02-18)
+------------------
+* added dependency option for open_manipulator_control_gui package
+* Contributors: Pyo
+
 2.0.0 (2019-02-08)
 ------------------
 * updated the CHANGELOG and version to release binary packages (first relese)

diff --git a/open_manipulator_control_gui/CMakeLists.txt b/open_manipulator_control_gui/CMakeLists.txt
@@ -15,7 +15,9 @@ find_package(catkin REQUIRED COMPONENTS
   std_msgs
   sensor_msgs
   open_manipulator_msgs
+  cmake_modules
 )
+find_package(Eigen3 REQUIRED)
 find_package(Qt5Widgets REQUIRED)
 
 set(${PROJECT_NAME}_SRCS
@@ -65,6 +67,7 @@ endif()
 catkin_package(
   INCLUDE_DIRS include
   CATKIN_DEPENDS roscpp std_msgs sensor_msgs open_manipulator_msgs
+  DEPENDS EIGEN3
 )
 
 qt5_wrap_cpp(${PROJECT_NAME}_MOCS     ${${PROJECT_NAME}_HDRS})
@@ -86,11 +89,12 @@ include_directories(
   include
   ${open_manipulator_control_gui_INCLUDE_DIRECTORIES}
   ${catkin_INCLUDE_DIRS}
+  ${EIGEN3_INCLUDE_DIRS}
 )
 
 add_executable(open_manipulator_control_gui ${open_manipulator_control_gui_SRCS} ${open_manipulator_control_gui_MOCS} ${open_manipulator_control_gui_UIS_H} ${open_manipulator_control_gui_RCC})
 add_dependencies(open_manipulator_control_gui ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
-target_link_libraries(open_manipulator_control_gui Qt5::Widgets ${catkin_LIBRARIES})
+target_link_libraries(open_manipulator_control_gui Qt5::Widgets ${catkin_LIBRARIES} ${Eigen3_LIBRARIES})
 
 #################################################################################
 ## Install

diff --git a/open_manipulator_control_gui/package.xml b/open_manipulator_control_gui/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>open_manipulator_control_gui</name>
-  <version>2.0.0</version>
+  <version>2.0.1</version>
   <description>
     OpenManipulator GUI control package based on QT
   </description>
@@ -25,4 +25,6 @@
   <depend>qt5-qmake</depend>
   <depend>libqt5-core</depend>
   <depend>libqt5-gui</depend>
+  <depend>cmake_modules</depend>
+  <depend>eigen</depend>
 </package>
diff --git a/open_manipulator_controller/CHANGELOG.rst b/open_manipulator_controller/CHANGELOG.rst
@@ -2,6 +2,10 @@
 Changelog for package open_manipulator_controller
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.0.1 (2019-02-18)
+------------------
+* none
+
 2.0.0 (2019-02-08)
 ------------------
 * added jointspace path serv, moveit params

diff --git a/open_manipulator_controller/package.xml b/open_manipulator_controller/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>open_manipulator_controller</name>
-  <version>2.0.0</version>
+  <version>2.0.1</version>
   <description>
     OpenManipulator controller package
   </description>

diff --git a/open_manipulator_description/CHANGELOG.rst b/open_manipulator_description/CHANGELOG.rst
@@ -2,6 +2,10 @@
 Changelog for package open_manipulator_description
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.0.1 (2019-02-18)
+------------------
+* none
+
 2.0.0 (2019-02-08)
 ------------------
 * deleted model.launch

diff --git a/open_manipulator_description/package.xml b/open_manipulator_description/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>open_manipulator_description</name>
-  <version>2.0.0</version>
+  <version>2.0.1</version>
   <description>
     OpenManipulator 3D model description for visualization and simulation 
   </description>

diff --git a/open_manipulator_libs/CHANGELOG.rst b/open_manipulator_libs/CHANGELOG.rst
@@ -2,6 +2,10 @@
 Changelog for package open_manipulator_libs
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.0.1 (2019-02-18)
+------------------
+* none
+
 2.0.0 (2019-02-08)
 ------------------
 * changed open_manipulator_dynamixel_ctrl to open_manipulator_libs

diff --git a/open_manipulator_libs/package.xml b/open_manipulator_libs/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>open_manipulator_libs</name>
-  <version>2.0.0</version>
+  <version>2.0.1</version>
   <description>
     OpenManipulator library (Kinematics lib., Dynamixel lib., Drawing path lib.)
   </description>

diff --git a/open_manipulator_moveit/CHANGELOG.rst b/open_manipulator_moveit/CHANGELOG.rst
@@ -2,6 +2,10 @@
 Changelog for package open_manipulator_moveit
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.0.1 (2019-02-18)
+------------------
+* none
+
 2.0.0 (2019-02-08)
 ------------------
 * added moveit config and controller

diff --git a/open_manipulator_moveit/package.xml b/open_manipulator_moveit/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>open_manipulator_moveit</name>
-  <version>2.0.0</version>
+  <version>2.0.1</version>
   <description>
      An automatically generated package with all the configuration and launch files for using the open_manipulator with the MoveIt! Motion Planning Framework
   </description>

diff --git a/open_manipulator_teleop/CHANGELOG.rst b/open_manipulator_teleop/CHANGELOG.rst
@@ -2,6 +2,10 @@
 Changelog for package open_manipulator_teleop
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.0.1 (2019-02-18)
+------------------
+* none
+
 2.0.0 (2019-02-08)
 ------------------
 * added new package for teleoperation

diff --git a/open_manipulator_teleop/package.xml b/open_manipulator_teleop/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>open_manipulator_teleop</name>
-  <version>2.0.0</version>
+  <version>2.0.1</version>
   <description>
     Provides teleoperation using keyboard for OpenManipulator.
   </description>