Merge pull request #19 from ROBOTIS-GIT/kinetic-devel

merge for sync kinetic-devel and master branch
2018-04-19 23:18:47 +09:00 · 2018-04-19 23:18:47 +09:00 · 7311de9275
commit 7311de9275
parent bed48d0879 a493ea40fe
10 changed files with 39 additions and 21 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -18,9 +18,11 @@ notifications:
      - pyo@robotis.com
 env:
  matrix:
-#   - ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian
+    - ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=xenial
 #   - ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=jessie
-    - ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=file $ROSINSTALL_FILENAME=".robotis_op3_demo.rosinstall"
+#   - ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=file   OS_NAME=ubuntu OS_CODE_NAME=xenial $ROSINSTALL_FILENAME=".robotis_op3_demo.rosinstall"
+#   - 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
 branches:
  only:
    - master
@ -30,4 +32,4 @@ install:
  - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
 script:
  - source .ci_config/travis.sh
-  
+  
--- a/README.md
+++ b/README.md
@ -11,7 +11,8 @@

 ## Wiki for robotis_op3_demo Packages
 - http://wiki.ros.org/robotis_op3_demo (metapackage)
- http://wiki.ros.org/ball_detector
+- http://wiki.ros.org/op3_ball_detector
+- http://wiki.ros.org/op3_bringup
 - http://wiki.ros.org/op3_demo

 ## Open Source related to ROBOTIS OP3
@ -30,5 +31,6 @@

 ## Documents and Videos related to ROBOTIS OP3
 - [ROBOTIS e-Manual for ROBOTIS OP3](http://emanual.robotis.com/docs/en/platform/op3/introduction/)
+- [ROBOTIS e-Manual for ROBOTIS THORMANG3](http://emanual.robotis.com/docs/en/platform/thormang3/introduction/)
 - [ROBOTIS e-Manual for ROBOTIS Framework](http://emanual.robotis.com/docs/en/software/robotis_framework_packages/)
 - [ROBOTIS e-Manual for Dynamixel SDK](http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_sdk/overview/)
--- a/op3_ball_detector/CHANGELOG.rst
+++ b/op3_ball_detector/CHANGELOG.rst
@ -1,12 +1,12 @@
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Changelog for package ball_detector
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Changelog for package op3_ball_detector
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

-0.1.0 (2018-03-30)
+0.1.0 (2018-04-19)
 ------------------
-* first release
+* first release for ROS Kinetic
 * added launch files in order to move the camera setting to op3_camera_setting package
 * added missing package in find_package()
 * refacoring to release
-* splited repositoryfrom ROBOTIS-OP3
+* split repositoryfrom ROBOTIS-OP3
 * Contributors: Kayman, Zerom, Pyo
--- a/op3_ball_detector/CMakeLists.txt
+++ b/op3_ball_detector/CMakeLists.txt
@ -73,7 +73,6 @@ generate_dynamic_reconfigure_options(
  cfg/DetectorParams.cfg
 )

-
 ################################################################################
 # Declare catkin specific configuration to be passed to dependent projects
 ##################################################################################
--- a/op3_ball_detector/package.xml
+++ b/op3_ball_detector/package.xml
@ -11,7 +11,7 @@
  <author email="kmjung@robotis.com">Kayman</author>
  <author email="zerom@robotis.com">Zerom</author>
  <maintainer email="pyo@robotis.com">Pyo</maintainer>
-  <url type="website">http://wiki.ros.org/ball_detector</url>
+  <url type="website">http://wiki.ros.org/op3_ball_detector</url>
  <url type="emanual">http://emanual.robotis.com/docs/en/platform/op3/introduction/</url>
  <url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Demo</url>
  <url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Demo/issues</url>
--- a/op3_bringup/CHANGELOG.rst
+++ b/op3_bringup/CHANGELOG.rst
@ -0,0 +1,11 @@
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Changelog for package op3_bringup
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+0.1.0 (2018-04-19)
+------------------
+* first release for ROS Kinetic
+* updated CMakeLists.txt and package.xml of op3_bringup
+* changed rviz config file
+* refacoring to release
+* Contributors: Kayman, Pyo
--- a/op3_bringup/package.xml
+++ b/op3_bringup/package.xml
@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
  <name>op3_bringup</name>
-  <version>0.0.1</version>
+  <version>0.1.0</version>
  <description>
    This package is a demo for first time users.
    There is an example in the demo where you can run and visualize the robot.
@ -15,6 +15,7 @@
  <url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Demo/issues</url>
  <buildtool_depend>catkin</buildtool_depend>
  <exec_depend>op3_manager</exec_depend>
+  <exec_depend>op3_description</exec_depend>
  <exec_depend>usb_cam</exec_depend>
  <exec_depend>joint_state_publisher</exec_depend>
  <exec_depend>robot_state_publisher</exec_depend>
--- a/op3_demo/CHANGELOG.rst
+++ b/op3_demo/CHANGELOG.rst
@ -2,11 +2,11 @@
 Changelog for package op3_demo
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

-0.1.0 (2018-03-30)
+0.1.0 (2018-04-19)
 ------------------
-* first release
+* first release for ROS Kinetic
 * added launch files in order to move the camera setting to op3_camera_setting package
 * added missing package in find_package()
 * refacoring to release
-* splited repositoryfrom ROBOTIS-OP3
-* Contributors: Kayman, Yoshimaru Tanaka, Pyo
+* split repositoryfrom ROBOTIS-OP3
+* Contributors: Kayman, Zerom, Yoshimaru Tanaka, Pyo
--- a/robotis_op3_demo/CHANGELOG.rst
+++ b/robotis_op3_demo/CHANGELOG.rst
@ -2,11 +2,13 @@
 Changelog for package robotis_op3_demo
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

-0.1.0 (2018-03-30)
+0.1.0 (2018-04-19)
 ------------------
-* first release
+* first release for ROS Kinetic
 * added launch files in order to move the camera setting to op3_camera_setting package
 * added missing package in find_package()
+* updated CMakeLists.txt and package.xml of op3_bringup
+* changed rviz config file
 * refacoring to release
-* splited repositoryfrom ROBOTIS-OP3
+* split repositoryfrom ROBOTIS-OP3
 * Contributors: Kayman, Zerom, Yoshimaru Tanaka, Pyo
--- a/robotis_op3_demo/package.xml
+++ b/robotis_op3_demo/package.xml
@ -12,8 +12,9 @@
  <url type="emanual">http://emanual.robotis.com/docs/en/platform/op3/introduction/</url>
  <url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Demo</url>
  <url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Demo/issues</url>
-  <buildtool_depend>catkin</buildtool_depend>    
+  <buildtool_depend>catkin</buildtool_depend>
  <exec_depend>op3_ball_detector</exec_depend>
+  <exec_depend>op3_bringup</exec_depend>
  <exec_depend>op3_demo</exec_depend>
  <export><metapackage/></export>
 </package>