Merge branch 'master' into develop

Author: Taehun Lim

.travis.yml

@@ -12,14 +12,16 @@ compiler:
   - gcc
 notifications:
   email:
-    on_success: always
+    on_success: change
     on_failure: always
     recipients:
       - [email protected]
 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=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

README.md

@@ -1,16 +1,41 @@
-<img src="https://raw.githubusercontent.com/ROBOTIS-GIT/ROBOTIS-Documents/master/wiki-images/Turtlebot3/Turtlebot3_logo.jpg" width="300">
+# TurtleBot3
+<img src="https://github.com/ROBOTIS-GIT/emanual/blob/master/assets/images/platform/turtlebot3/logo_turtlebot3.png" width="300">
 
-# TurtleBot3 Applications Package
-[![GitHub version](https://badge.fury.io/gh/ROBOTIS-GIT%2Fturtlebot3_applications.svg)](https://badge.fury.io/gh/ROBOTIS-GIT%2Fturtlebot3_applications) [![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_applications.svg?branch=master)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_applications)
+## ROS Packages for TurtleBot3 Applications
+|Version|Kinetic + Ubuntu Xenial|Melodic + Ubuntu Bionic|
+|:---:|:---:|:---:|
+|[![GitHub version](https://badge.fury.io/gh/ROBOTIS-GIT%2Fturtlebot3_applications.svg)](https://badge.fury.io/gh/ROBOTIS-GIT%2Fturtlebot3_applications)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_applications.svg?branch=kinetic-devel)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_applications)|-|
 
-# TurtleBot3 Packages
+## ROBOTIS e-Manual for TurtleBot3
+- [ROBOTIS e-Manual for TurtleBot3](http://turtlebot3.robotis.com/)
+
+## Wiki for turtlebot3_applications Packages
+- http://wiki.ros.org/turtlebot3_applications (metapackage)
+- http://wiki.ros.org/turtlebot3_automatic_parking
+- http://wiki.ros.org/turtlebot3_automatic_parking_vision
+- http://wiki.ros.org/turtlebot3_follow_filter
+- http://wiki.ros.org/turtlebot3_follower
+- http://wiki.ros.org/turtlebot3_panorama
+
+## Open Source related to TurtleBot3
 - [turtlebot3](https://github.com/ROBOTIS-GIT/turtlebot3)
 - [turtlebot3_msgs](https://github.com/ROBOTIS-GIT/turtlebot3_msgs)
 - [turtlebot3_simulations](https://github.com/ROBOTIS-GIT/turtlebot3_simulations)
 - [turtlebot3_applications](https://github.com/ROBOTIS-GIT/turtlebot3_applications)
 - [turtlebot3_autorace](https://github.com/ROBOTIS-GIT/turtlebot3_autorace)
+- [turtlebot3_deliver](https://github.com/ROBOTIS-GIT/turtlebot3_deliver)
+- [hls_lfcd_lds_driver](https://github.com/ROBOTIS-GIT/hls_lfcd_lds_driver)
+- [open_manipulator](https://github.com/ROBOTIS-GIT/open_manipulator)
+- [dynamixel_sdk](https://github.com/ROBOTIS-GIT/DynamixelSDK)
+- [dynamixel_workbench](https://github.com/ROBOTIS-GIT/dynamixel-workbench)
+- [OpenCR-Hardware](https://github.com/ROBOTIS-GIT/OpenCR-Hardware)
+- [OpenCR](https://github.com/ROBOTIS-GIT/OpenCR)
 
-# TurtleBot3 Documents
-- http://turtlebot3.robotis.com/
-- http://www.turtlebot.com/
-- 
+## Documents and Videos related to TurtleBot3
+- [ROBOTIS e-Manual for TurtleBot3](http://turtlebot3.robotis.com/)
+- [ROBOTIS e-Manual for OpenManipulator](http://emanual.robotis.com/docs/en/platform/openmanipulator/)
+- [ROBOTIS e-Manual for Dynamixel SDK](http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_sdk/overview/)
+- [ROBOTIS e-Manual for Dynamixel Workbench](http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_workbench/)
+- [Website for TurtleBot Series](http://www.turtlebot.com/)
+- [e-Book for TurtleBot3](https://community.robotsource.org/t/download-the-ros-robot-programming-book-for-free/51/)
+- [Videos for TurtleBot3 ](https://www.youtube.com/playlist?list=PLRG6WP3c31_XI3wlvHlx2Mp8BYqgqDURU)

turtlebot3_applications/CHANGELOG.rst

@@ -2,6 +2,14 @@
 Changelog for package turtlebot3_applications
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.2.0 (2018-04-20)
+------------------
+* added turtlebot3 automatic parking vision example source code (turtlebot3_automatic_parking_vision)
+* changes to ar_marker_alvar from ar_pose package (turtlebot3_automatic_parking_vision)
+* fixed recovering method of automatic parking using vision (turtlebot3_automatic_parking_vision)
+* added angles of center, start, end into spot filter (turtlebot3_automatic_parking)
+* Contributors: Leon Jung, Gilbert, Pyo
+
 0.1.0 (2018-03-14)
 ------------------
 * added turtlebot3_automatic_parking pkg

turtlebot3_applications/package.xml

@@ -1,22 +1,23 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>turtlebot3_applications</name>
-  <version>0.1.0</version>
+  <version>0.2.0</version>
   <description>
     ROS packages for the turtlebot3 applications (meta package)
   </description>
   <license>Apache 2.0</license>
   <license>BSD</license>
-  <author>Christopher Tatsch</author>
-  <author>Ashe Kim</author>
-  <author email="[email protected]">Leon Jung</author>
-  <author email="[email protected]">Darby Lim</author>
   <author email="[email protected]">Gilbert</author>
+  <author email="[email protected]">Darby Lim</author>
+  <author email="[email protected]">Leon Jung</author>
   <author email="[email protected]">Pyo</author>
+  <author>Christopher Tatsch</author>
+  <author>Ashe Kim</author>
   <maintainer email="[email protected]">Pyo</maintainer>
-  <url type="bugtracker">https://github.com/ROBOTIS-GIT/turtlebot3_applications/issues</url>
+  <url type="website">http://wiki.ros.org/turtlebot3</url>
+  <url type="emanual">http://turtlebot3.robotis.com</url>
   <url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3_applications</url>
-  <url type="website">http://turtlebot3.robotis.com</url>
+  <url type="bugtracker">https://github.com/ROBOTIS-GIT/turtlebot3_applications/issues</url>
   <buildtool_depend>catkin</buildtool_depend>
   <exec_depend>turtlebot3_automatic_parking</exec_depend>
   <exec_depend>turtlebot3_automatic_parking_vision</exec_depend>

turtlebot3_automatic_parking/CHANGELOG.rst

@@ -2,6 +2,11 @@
 Changelog for package turtlebot3_automatic_parking
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.2.0 (2018-04-20)
+------------------
+* added angles of center, start, end into spot filter
+* Contributors: Gilbert
+
 0.1.0 (2018-03-14)
 ------------------
 * added turtlebot3_automatic_parking pkg

turtlebot3_automatic_parking/package.xml

@@ -1,16 +1,17 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>turtlebot3_automatic_parking</name>
-  <version>0.1.0</version>
+  <version>0.2.0</version>
   <description>
 	  Package for turtlebot3 automatic_parking. You need a reflective tape and real robots. You can see parking spot using this pacakge on rviz.
   </description>
   <license>Apache 2.0</license>
   <author email="[email protected]">Gilbert</author>
   <maintainer email="[email protected]">Pyo</maintainer>
-  <url type="bugtracker">https://github.com/ROBOTIS-GIT/turtlebot3_applications/issues</url>
+  <url type="website">http://wiki.ros.org/turtlebot3</url>
+  <url type="emanual">http://turtlebot3.robotis.com</url>
   <url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3_applications</url>
-  <url type="website">http://turtlebot3.robotis.com</url>
+  <url type="bugtracker">https://github.com/ROBOTIS-GIT/turtlebot3_applications/issues</url>
   <buildtool_depend>catkin</buildtool_depend>
   <depend>rospy</depend>
   <depend>std_msgs</depend>

turtlebot3_automatic_parking_vision/CHANGELOG.rst

@@ -0,0 +1,14 @@
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Changelog for package turtlebot3_automatic_parking_vision
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+0.2.0 (2018-04-20)
+------------------
+* added turtlebot3 automatic parking vision example source code
+* changes to ar_marker_alvar from ar_pose package
+* fixed recovering method of automatic parking using vision
+* Contributors: Leon Jung, Pyo
+
+0.1.0 (2018-03-15)
+------------------
+* none