Merge pull request #476 from ROBOTIS-GIT/master

merge for sync kinetic-devel and master branch

.travis.yml

@@ -34,4 +34,3 @@ install:
   - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
 script:
   - source .ci_config/travis.sh
-

ISSUE_TEMPLATE.md

@@ -1,43 +1,53 @@
-ISSUE TEMPLATE ver. 0.2.0
+ISSUE TEMPLATE ver. 0.3.0
 
 1. Which TurtleBot3 you have?
 
     - [ ] Burger
     - [ ] Waffle
     - [ ] Waffle Pi
 
-2. Which SBC(Single Board Computer) is working on TurtleBot3?
+2. Which ROS is working with TurtleBot3?
+
+    - [ ] ROS 1 Kinetic Kame
+    - [ ] ROS 1 Melodic Morenia
+    - [ ] ROS 2 Dashing Diademata
+    - [ ] ROS 2 Eloquent Elusor
+    - [ ] etc (PLEASE, WRITE DOWN YOUR ROS VERSION HERE)
+
+3. Which SBC(Single Board Computer) is working on TurtleBot3?
 
     - [ ] Raspberry Pi 3
     - [ ] Intel Joule 570x
     - [ ] etc (PLEASE, WRITE DOWN YOUR SBC HERE)
 
-3. Which OS you installed in SBC?
+4. Which OS you installed in SBC?
 
-    - [ ] Ubuntu MATE 16.04 or later
     - [ ] Raspbian
+    - [ ] Ubuntu MATE 16.04 or later
+    - [ ] Ubuntu Server 18.04 or later
     - [ ] etc (PLEASE, WRITE DOWN YOUR OS)
 
-4. Which OS you installed in Remote PC?
+5. Which OS you installed in Remote PC?
 
     - [ ] Ubuntu 16.04 LTS (Xenial Xerus)
     - [ ] Ubuntu 18.04 LTS (Bionic Beaver)
     - [ ] Linux Mint 18.x
+    - [ ] Linux Mint 19.x
     - [ ] etc (PLEASE, WRITE DOWN YOUR OS)
 
-5. Write down software version and firmware version
+6. Write down software version and firmware version
 
     - Software version: [x.x.x]
     - Firmware version: [x.x.x]
- 
-6. Write down the commands you used in order
+
+7. Write down the commands you used in order
 
     - HERE
- 
-7. Copy and Paste your error message on terminal
+
+8. Copy and Paste your error message on terminal
 
     - HERE
-  
-8. Please, describe detailedly what difficulty you are in 
+
+9. Please, describe detailedly what difficulty you are in
 
     - HERE

README.md

@@ -1,10 +1,15 @@
 # TurtleBot3
 <img src="https://github.com/ROBOTIS-GIT/emanual/blob/master/assets/images/platform/turtlebot3/logo_turtlebot3.png" width="300">
 
-## ROS Packages for TurtleBot3
-|Version|Kinetic + Ubuntu Xenial|Melodic + Ubuntu Bionic|
+## ROS 1 Packages for TurtleBot3
+|develop|master|Kinetic + Ubuntu Xenial|Melodic + Ubuntu Bionic|
+|:---:|:---:|:---:|:---:|
+|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3.svg?branch=develop)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3.svg?branch=master)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3.svg?branch=kinetic-devel)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3.svg?branch=melodic-devel)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3)|
+
+## ROS 2 Packages for TurtleBot3
+|ros2-devel|ros2|Dashing + Ubuntu Bionic|
 |:---:|:---:|:---:|
-|[![GitHub version](https://badge.fury.io/gh/ROBOTIS-GIT%2Fturtlebot3.svg)](https://badge.fury.io/gh/ROBOTIS-GIT%2Fturtlebot3)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3.svg?branch=kinetic-devel)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3.svg?branch=melodic-devel)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3)|
+|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3.svg?branch=ros2-devel)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3.svg?branch=ros2)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3.svg?branch=dashing-devel)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3)|
 
 ## ROBOTIS e-Manual for TurtleBot3
 - [ROBOTIS e-Manual for TurtleBot3](http://turtlebot3.robotis.com/)

turtlebot3/CHANGELOG.rst

@@ -2,6 +2,14 @@
 Changelog for package turtlebot3
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.2.1 (2019-08-20)
+------------------
+* Fixed typo `#436 <https://github.com/ROBOTIS-GIT/turtlebot3/issues/436>`_
+* Fixed ROS_ASSERT bug `#416 <https://github.com/ROBOTIS-GIT/turtlebot3/issues/416>`_
+* Deleted '/' to sync tf2 `#402 <https://github.com/ROBOTIS-GIT/turtlebot3/issues/402>`_
+* Added turtlebot3_remote.launch to turtlebot3_model.launch `#389 <https://github.com/ROBOTIS-GIT/turtlebot3/issues/389>`_
+* Contributors: Jonathan Hechtbauer, Pallav Bhalla, ant, Ryan Shim, Kayman, Darby Lim, Gilbert, Pyo
+
 1.2.0 (2019-01-22)
 ------------------
 * changed math.ceil() operation `#373 <https://github.com/ROBOTIS-GIT/turtlebot3/issues/373>`_

turtlebot3/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>turtlebot3</name>
-  <version>1.2.0</version>
+  <version>1.2.1</version>
   <description>
     ROS packages for the Turtlebot3 (meta package)
   </description>
@@ -13,7 +13,6 @@
   <author email="[email protected]">HanCheol Cho</author>
   <author>Leon Jung</author>
   <maintainer email="[email protected]">Pyo</maintainer>
-  <maintainer email="[email protected]">Gilbert</maintainer>
   <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</url>

turtlebot3_bringup/CHANGELOG.rst

@@ -2,6 +2,11 @@
 Changelog for package turtlebot3_bringup
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.2.1 (2019-08-20)
+------------------
+* Added turtlebot3_remote.launch to turtlebot3_model.launch `#389 <https://github.com/ROBOTIS-GIT/turtlebot3/issues/389>`_
+* Contributors: Jonathan Hechtbauer, Gilbert
+
 1.2.0 (2019-01-22)
 ------------------
 * none

turtlebot3_bringup/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>turtlebot3_bringup</name>
-  <version>1.2.0</version>
+  <version>1.2.1</version>
   <description>
     roslaunch scripts for starting the TurtleBot3
   </description>
@@ -10,7 +10,6 @@
   <author email="[email protected]">Darby Lim</author>
   <author email="[email protected]">Gilbert</author>
   <maintainer email="[email protected]">Pyo</maintainer>
-  <maintainer email="[email protected]">Gilbert</maintainer>
   <url type="website">http://wiki.ros.org/turtlebot3_bringup</url>
   <url type="emanual">http://turtlebot3.robotis.com</url>
   <url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3</url>

turtlebot3_description/CHANGELOG.rst

@@ -2,6 +2,10 @@
 Changelog for package turtlebot3_description
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.2.1 (2019-08-20)
+------------------
+* none
+
 1.2.0 (2019-01-22)
 ------------------
 * none

turtlebot3_description/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>turtlebot3_description</name>
-  <version>1.2.0</version>
+  <version>1.2.1</version>
   <description>
     3D models of the TurtleBot3 for simulation and visualization
   </description>
@@ -10,7 +10,6 @@
   <author email="[email protected]">Darby Lim</author>
   <author email="[email protected]">Gilbert</author>
   <maintainer email="[email protected]">Pyo</maintainer>
-  <maintainer email="[email protected]">Gilbert</maintainer>
   <url type="website">http://wiki.ros.org/turtlebot3_description</url>
   <url type="emanual">http://turtlebot3.robotis.com</url>
   <url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3</url>

turtlebot3_example/CHANGELOG.rst

@@ -2,6 +2,11 @@
 Changelog for package turtlebot3_example
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.2.1 (2019-08-20)
+------------------
+* Fixed typo `#436 <https://github.com/ROBOTIS-GIT/turtlebot3/issues/436>`_
+* Contributors: Pallav Bhalla
+
 1.2.0 (2019-01-22)
 ------------------
 * changed math.ceil() operation `#373 <https://github.com/ROBOTIS-GIT/turtlebot3/issues/373>`_

turtlebot3_example/nodes/turtlebot3_pointop_key

@@ -64,7 +64,7 @@ class GotoPoint():
         angular_speed = 1
         (goal_x, goal_y, goal_z) = self.getkey()
         if goal_z > 180 or goal_z < -180:
-            print("you input worng z range.")
+            print("you input wrong z range.")
             self.shutdown()
         goal_z = np.deg2rad(goal_z)
         goal_distance = sqrt(pow(goal_x - position.x, 2) + pow(goal_y - position.y, 2))

turtlebot3_example/package.xml

@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>turtlebot3_example</name>
-  <version>1.2.0</version>
+  <version>1.2.1</version>
   <description>
     This package provides four TurtleBot3 basic example include move using interactive marker, move and stop using LDS, move to goal position, move to custom routes. The interactions node is that you can control the TurtleBot3 front and back side or rotate to goal position. The obstacle node is that when the robot meets an obstacle, it stops. The patrol node is that TurtleBot3 move to custom route. There are 3 route(square, triangle, circle) in this package. You can add your route and move the TurtleBot3. The pointop node is that you can insert goal position include distance x-axis, y-axis and angluar z-axis.  
   </description>
   <license>Apache 2.0</license>
   <author email="[email protected]">Gilbert</author>
   <maintainer email="[email protected]">Pyo</maintainer>
-  <maintainer email="[email protected]">Gilbert</maintainer>
   <url type="website">http://wiki.ros.org/turtlebot3_example</url>
   <url type="emanual">http://turtlebot3.robotis.com</url>
   <url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3</url>

turtlebot3_navigation/CHANGELOG.rst

@@ -2,6 +2,11 @@
 Changelog for package turtlebot3_navigation
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.2.1 (2019-08-20)
+------------------
+* Deleted '/' to sync tf2 `#402 <https://github.com/ROBOTIS-GIT/turtlebot3/issues/402>`_
+* Contributors: Ryan Shim, Kayman, Darby Lim
+
 1.2.0 (2019-01-22)
 ------------------
 * updated map.yaml `#348 <https://github.com/ROBOTIS-GIT/turtlebot3/issues/348>`_
@@ -18,7 +23,7 @@ Changelog for package turtlebot3_navigation
 1.0.0 (2018-05-29)
 ------------------
 * modified navigation parameters
-* modified control frequency and inflation radius 
+* modified control frequency and inflation radius
 * modified param after experiments
 * merged pull request `#202 <https://github.com/ROBOTIS-GIT/turtlebot3/issues/202>`_ from ROBOTIS-GIT/feature-cartographer
 * merged pull request `#220 <https://github.com/ROBOTIS-GIT/turtlebot3/issues/220>`_ `#212 <https://github.com/ROBOTIS-GIT/turtlebot3/issues/212>`_ `#200 <https://github.com/ROBOTIS-GIT/turtlebot3/issues/200>`_ `#154 <https://github.com/ROBOTIS-GIT/turtlebot3/issues/154>`_ `#153 <https://github.com/ROBOTIS-GIT/turtlebot3/issues/153>`_ `#147 <https://github.com/ROBOTIS-GIT/turtlebot3/issues/147>`_ `#146 <https://github.com/ROBOTIS-GIT/turtlebot3/issues/146>`_

turtlebot3_navigation/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>turtlebot3_navigation</name>
-  <version>1.2.0</version>
+  <version>1.2.1</version>
   <description>
     The turtlebot3_navigation provides roslaunch scripts for starting the navigation.
   </description>
@@ -11,7 +11,6 @@
   <author email="[email protected]">Gilbert</author>
   <author>Leon Jung</author>
   <maintainer email="[email protected]">Pyo</maintainer>
-  <maintainer email="[email protected]">Gilbert</maintainer>
   <url type="website">http://wiki.ros.org/turtlebot3_navigation</url>
   <url type="emanual">http://turtlebot3.robotis.com</url>
   <url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3</url>

turtlebot3_navigation/param/global_costmap_params.yaml

@@ -1,6 +1,6 @@
 global_costmap:
-  global_frame: /map
-  robot_base_frame: /base_footprint
+  global_frame: map
+  robot_base_frame: base_footprint
 
   update_frequency: 10.0
   publish_frequency: 10.0

turtlebot3_navigation/param/local_costmap_params.yaml

@@ -1,6 +1,6 @@
 local_costmap:
-  global_frame: /odom
-  robot_base_frame: /base_footprint
+  global_frame: odom
+  robot_base_frame: base_footprint
 
   update_frequency: 10.0
   publish_frequency: 10.0

turtlebot3_slam/CHANGELOG.rst

@@ -2,6 +2,11 @@
 Changelog for package turtlebot3_slam
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.2.1 (2019-08-20)
+------------------
+* Fixed ROS_ASSERT bug `#416 <https://github.com/ROBOTIS-GIT/turtlebot3/issues/416>`_
+* Contributors: ant, Ryan Shim, Kayman
+
 1.2.0 (2019-01-22)
 ------------------
 * modified rosdep `#342 <https://github.com/ROBOTIS-GIT/turtlebot3/issues/342>`_

turtlebot3_slam/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>turtlebot3_slam</name>
-  <version>1.2.0</version>
+  <version>1.2.1</version>
   <description>
     The turtlebot3_slam package provides roslaunch scripts for starting the SLAM
   </description>
@@ -11,7 +11,6 @@
   <author email="[email protected]">Gilbert</author>
   <author>Leon Jung</author>
   <maintainer email="[email protected]">Pyo</maintainer>
-  <maintainer email="[email protected]">Gilbert</maintainer>
   <url type="website">http://wiki.ros.org/turtlebot3_slam</url>
   <url type="emanual">http://turtlebot3.robotis.com</url>
   <url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3</url>

turtlebot3_slam/src/flat_world_imu_node.cpp

@@ -18,7 +18,8 @@
 
 FlatWorldImuNode::FlatWorldImuNode()
 {
-  ROS_ASSERT(init());
+  bool init_result = init();
+  ROS_ASSERT(init_result);
 }
 
 FlatWorldImuNode::~FlatWorldImuNode()

turtlebot3_teleop/CHANGELOG.rst

@@ -2,6 +2,10 @@
 Changelog for package turtlebot3_teleop
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.2.1 (2019-08-20)
+------------------
+* none
+
 1.2.0 (2019-01-22)
 ------------------
 * added windows port `#358 <https://github.com/ROBOTIS-GIT/turtlebot3/issues/358>`_

turtlebot3_teleop/package.xml

@@ -1,15 +1,14 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>turtlebot3_teleop</name>
-  <version>1.2.0</version>
+  <version>1.2.1</version>
   <description>
     Provides teleoperation using keyboard for TurtleBot3.
   </description>
   <license>BSD</license>
   <author>Melonee Wise</author>
   <author email="[email protected]">Darby Lim</author>
   <maintainer email="[email protected]">Pyo</maintainer>
-  <maintainer email="[email protected]">Gilbert</maintainer>
   <url type="website">http://wiki.ros.org/turtlebot3_teleop</url>
   <url type="emanual">http://turtlebot3.robotis.com</url>
   <url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3</url>