Skip to content

Commit 3e1ddd3

Browse files
robotpilotrobotpilot
authored
Merge pull request #90 from ROBOTIS-GIT/develop
added dependency option for open_manipulator_control_gui package
2 parents c390e7f + 897e579 commit 3e1ddd3

File tree

16 files changed

+47
-14
lines changed

16 files changed

+47
-14
lines changed

‎.travis.yml

+3-6
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,9 @@ notifications:
1818
- pyo@robotis.com
1919
env:
2020
matrix:
21-
- ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=file $ROSINSTALL_FILENAME=".open_manipulator.rosinstall"
22-
- ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=file $ROSINSTALL_FILENAME=".open_manipulator.rosinstall"
23-
- ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=stretch
24-
#- ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=xenial
25-
#- ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=bionic
26-
#- ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=stretch
21+
- ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=xenial
22+
- ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=bionic
23+
- ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=stretch
2724
matrix:
2825
allow_failures:
2926
- env: ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=stretch

‎open_manipulator/CHANGELOG.rst

+5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
Changelog for package open_manipulator
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
2.0.1 (2019-02-18)
6+
------------------
7+
* added dependency option for open_manipulator_control_gui package
8+
* Contributors: Pyo
9+
510
2.0.0 (2019-02-08)
611
------------------
712
* updated the CHANGELOG and version to release binary packages

‎open_manipulator/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>open_manipulator</name>
4-
<version>2.0.0</version>
4+
<version>2.0.1</version>
55
<description>
66
ROS-enabled OpenManipulator is a full open robot platform consisting of OpenSoftware​, OpenHardware and OpenCR(Embedded board)​.
77
The OpenManipulator is allowed users to control it more easily by linking with the MoveIt! package. Moreover it has full hardware compatibility with TurtleBot3​.

‎open_manipulator_control_gui/CHANGELOG.rst

+5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
Changelog for package open_manipulator_control_gui
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
2.0.1 (2019-02-18)
6+
------------------
7+
* added dependency option for open_manipulator_control_gui package
8+
* Contributors: Pyo
9+
510
2.0.0 (2019-02-08)
611
------------------
712
* updated the CHANGELOG and version to release binary packages (first relese)

‎open_manipulator_control_gui/CMakeLists.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ find_package(catkin REQUIRED COMPONENTS
1515
std_msgs
1616
sensor_msgs
1717
open_manipulator_msgs
18+
cmake_modules
1819
)
20+
find_package(Eigen3 REQUIRED)
1921
find_package(Qt5Widgets REQUIRED)
2022

2123
set(${PROJECT_NAME}_SRCS
@@ -65,6 +67,7 @@ endif()
6567
catkin_package(
6668
INCLUDE_DIRS include
6769
CATKIN_DEPENDS roscpp std_msgs sensor_msgs open_manipulator_msgs
70+
DEPENDS EIGEN3
6871
)
6972

7073
qt5_wrap_cpp(${PROJECT_NAME}_MOCS ${${PROJECT_NAME}_HDRS})
@@ -86,11 +89,12 @@ include_directories(
8689
include
8790
${open_manipulator_control_gui_INCLUDE_DIRECTORIES}
8891
${catkin_INCLUDE_DIRS}
92+
${EIGEN3_INCLUDE_DIRS}
8993
)
9094

9195
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})
9296
add_dependencies(open_manipulator_control_gui ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
93-
target_link_libraries(open_manipulator_control_gui Qt5::Widgets ${catkin_LIBRARIES})
97+
target_link_libraries(open_manipulator_control_gui Qt5::Widgets ${catkin_LIBRARIES} ${Eigen3_LIBRARIES})
9498

9599
#################################################################################
96100
## Install

‎open_manipulator_control_gui/package.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>open_manipulator_control_gui</name>
4-
<version>2.0.0</version>
4+
<version>2.0.1</version>
55
<description>
66
OpenManipulator GUI control package based on QT
77
</description>
@@ -25,4 +25,6 @@
2525
<depend>qt5-qmake</depend>
2626
<depend>libqt5-core</depend>
2727
<depend>libqt5-gui</depend>
28+
<depend>cmake_modules</depend>
29+
<depend>eigen</depend>
2830
</package>

‎open_manipulator_controller/CHANGELOG.rst

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
Changelog for package open_manipulator_controller
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
2.0.1 (2019-02-18)
6+
------------------
7+
* none
8+
59
2.0.0 (2019-02-08)
610
------------------
711
* added jointspace path serv, moveit params

‎open_manipulator_controller/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>open_manipulator_controller</name>
4-
<version>2.0.0</version>
4+
<version>2.0.1</version>
55
<description>
66
OpenManipulator controller package
77
</description>

‎open_manipulator_description/CHANGELOG.rst

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
Changelog for package open_manipulator_description
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
2.0.1 (2019-02-18)
6+
------------------
7+
* none
8+
59
2.0.0 (2019-02-08)
610
------------------
711
* deleted model.launch

‎open_manipulator_description/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>open_manipulator_description</name>
4-
<version>2.0.0</version>
4+
<version>2.0.1</version>
55
<description>
66
OpenManipulator 3D model description for visualization and simulation
77
</description>

‎open_manipulator_libs/CHANGELOG.rst

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
Changelog for package open_manipulator_libs
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
2.0.1 (2019-02-18)
6+
------------------
7+
* none
8+
59
2.0.0 (2019-02-08)
610
------------------
711
* changed open_manipulator_dynamixel_ctrl to open_manipulator_libs

‎open_manipulator_libs/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>open_manipulator_libs</name>
4-
<version>2.0.0</version>
4+
<version>2.0.1</version>
55
<description>
66
OpenManipulator library (Kinematics lib., Dynamixel lib., Drawing path lib.)
77
</description>

‎open_manipulator_moveit/CHANGELOG.rst

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
Changelog for package open_manipulator_moveit
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
2.0.1 (2019-02-18)
6+
------------------
7+
* none
8+
59
2.0.0 (2019-02-08)
610
------------------
711
* added moveit config and controller

‎open_manipulator_moveit/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>open_manipulator_moveit</name>
4-
<version>2.0.0</version>
4+
<version>2.0.1</version>
55
<description>
66
An automatically generated package with all the configuration and launch files for using the open_manipulator with the MoveIt! Motion Planning Framework
77
</description>

‎open_manipulator_teleop/CHANGELOG.rst

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
Changelog for package open_manipulator_teleop
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
2.0.1 (2019-02-18)
6+
------------------
7+
* none
8+
59
2.0.0 (2019-02-08)
610
------------------
711
* added new package for teleoperation

‎open_manipulator_teleop/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>open_manipulator_teleop</name>
4-
<version>2.0.0</version>
4+
<version>2.0.1</version>
55
<description>
66
Provides teleoperation using keyboard for OpenManipulator.
77
</description>

0 commit comments

Comments
 (0)