diff --git a/.travis.yml b/.travis.yml index a4e4ec8e..63ac2a42 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,12 +18,9 @@ notifications: - pyo@robotis.com 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 index 7a932a70..c294db9a 100644 --- 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 index 5c7f30b2..add0dc58 100644 --- a/open_manipulator/package.xml +++ b/open_manipulator/package.xml @@ -1,7 +1,7 @@ open_manipulator - 2.0.0 + 2.0.1 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 index 20eeb1f7..67e3bc74 100644 --- 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 index 267a40e9..319ef7a6 100644 --- 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 index a3ff1440..1b2609fc 100644 --- a/open_manipulator_control_gui/package.xml +++ b/open_manipulator_control_gui/package.xml @@ -1,7 +1,7 @@ open_manipulator_control_gui - 2.0.0 + 2.0.1 OpenManipulator GUI control package based on QT @@ -25,4 +25,6 @@ qt5-qmake libqt5-core libqt5-gui + cmake_modules + eigen diff --git a/open_manipulator_controller/CHANGELOG.rst b/open_manipulator_controller/CHANGELOG.rst index 8ddc199d..0e1b3a47 100644 --- 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 index 5bc3ad03..4b9cc373 100644 --- a/open_manipulator_controller/package.xml +++ b/open_manipulator_controller/package.xml @@ -1,7 +1,7 @@  open_manipulator_controller - 2.0.0 + 2.0.1 OpenManipulator controller package diff --git a/open_manipulator_description/CHANGELOG.rst b/open_manipulator_description/CHANGELOG.rst index 038bc5fb..cd8c0da5 100644 --- 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 index 49df80e1..21f6fa29 100644 --- a/open_manipulator_description/package.xml +++ b/open_manipulator_description/package.xml @@ -1,7 +1,7 @@ open_manipulator_description - 2.0.0 + 2.0.1 OpenManipulator 3D model description for visualization and simulation diff --git a/open_manipulator_libs/CHANGELOG.rst b/open_manipulator_libs/CHANGELOG.rst index 35465c14..65697baf 100644 --- 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 index 4060e7f1..77684b92 100644 --- a/open_manipulator_libs/package.xml +++ b/open_manipulator_libs/package.xml @@ -1,7 +1,7 @@  open_manipulator_libs - 2.0.0 + 2.0.1 OpenManipulator library (Kinematics lib., Dynamixel lib., Drawing path lib.) diff --git a/open_manipulator_moveit/CHANGELOG.rst b/open_manipulator_moveit/CHANGELOG.rst index fb937203..0d882658 100644 --- 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 index 71f7bdd4..604ebf19 100644 --- a/open_manipulator_moveit/package.xml +++ b/open_manipulator_moveit/package.xml @@ -1,7 +1,7 @@ open_manipulator_moveit - 2.0.0 + 2.0.1 An automatically generated package with all the configuration and launch files for using the open_manipulator with the MoveIt! Motion Planning Framework diff --git a/open_manipulator_teleop/CHANGELOG.rst b/open_manipulator_teleop/CHANGELOG.rst index e676660f..d0b0a5de 100644 --- 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 index 94889fe6..0ebf4df8 100644 --- a/open_manipulator_teleop/package.xml +++ b/open_manipulator_teleop/package.xml @@ -1,7 +1,7 @@ open_manipulator_teleop - 2.0.0 + 2.0.1 Provides teleoperation using keyboard for OpenManipulator.