Merge pull request #605 from ROBOTIS-GIT/ros2-devel

merge ros2-devel
ROBOTIS-GIT · Jun 23, 2020 · fb6b9ac · fb6b9ac
2 parents 1ff16b4 + 4befcdd
commit fb6b9ac
Show file tree

Hide file tree

Showing 21 changed files with 96 additions and 31 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,25 +2,28 @@ services:
   - docker
 
 language:
-  - none
+  - generic
 
 notifications:
   email:
     on_success: change
     on_failure: always
     recipients:
-      - [email protected]
-      - [email protected]
+      - [email protected]
 
 branches:
   only:
     - ros2
     - ros2-devel
     - dashing-devel
+    - eloquent-devel
+    - foxy-devel
 
 install:
   - git clone --quiet --depth 1 https://github.com/ROBOTIS-GIT/ros2ci.git .ros2ci
 
 matrix:
   include:
     - script: .ros2ci/travis.bash dashing
+    - script: .ros2ci/travis.bash eloquent
+    - script: .ros2ci/travis.bash nightly
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
@@ -1,4 +1,4 @@
-ISSUE TEMPLATE ver. 0.3.0
+ISSUE TEMPLATE ver. 0.4.0
 
 1. Which TurtleBot3 you have?
 
@@ -10,13 +10,16 @@ ISSUE TEMPLATE ver. 0.3.0
 
     - [ ] ROS 1 Kinetic Kame
     - [ ] ROS 1 Melodic Morenia
+    - [ ] ROS 1 Noetic Ninjemys
     - [ ] ROS 2 Dashing Diademata
     - [ ] ROS 2 Eloquent Elusor
+    - [ ] ROS 2 Foxy Fitzroy
     - [ ] etc (PLEASE, WRITE DOWN YOUR ROS VERSION HERE)
 
 3. Which SBC(Single Board Computer) is working on TurtleBot3?
 
     - [ ] Raspberry Pi 3
+    - [ ] Raspberry Pi 4
     - [ ] Intel Joule 570x
     - [ ] etc (PLEASE, WRITE DOWN YOUR SBC HERE)
 
@@ -25,12 +28,14 @@ ISSUE TEMPLATE ver. 0.3.0
     - [ ] Raspbian
     - [ ] Ubuntu MATE 16.04 or later
     - [ ] Ubuntu Server 18.04 or later
+    - [ ] Ubuntu Server 20.04 or later
     - [ ] etc (PLEASE, WRITE DOWN YOUR OS)
 
 5. Which OS you installed in Remote PC?
 
     - [ ] Ubuntu 16.04 LTS (Xenial Xerus)
     - [ ] Ubuntu 18.04 LTS (Bionic Beaver)
+    - [ ] Ubuntu 20.04 LTS (Focal Fossa)
     - [ ] Linux Mint 18.x
     - [ ] Linux Mint 19.x
     - [ ] etc (PLEASE, WRITE DOWN YOUR OS)

diff --git a/README.md b/README.md
@@ -2,14 +2,14 @@
 <img src="https://github.com/ROBOTIS-GIT/emanual/blob/master/assets/images/platform/turtlebot3/logo_turtlebot3.png" width="300">
 
 ## 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)|
+|develop|master|Kinetic + Ubuntu Xenial|Melodic + Ubuntu Bionic|Noetic + Ubuntu Focal|
+|:---:|:---:|:---:|:---:|:---:|
+|[![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)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3.svg?branch=noetic-devel)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3)|
 
 ## ROS 2 Packages for TurtleBot3
-|ros2-devel|ros2|Dashing + Ubuntu Bionic|
-|:---:|:---:|:---:|
-|[![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)|
+|ros2-devel|ros2|Dashing + Ubuntu Bionic|Eloquent + Ubuntu Bionic|Foxy + Ubuntu Focal|
+|:---:|:---:|:---:|:---:|:---:|
+|[![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)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3.svg?branch=eloquent-devel)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3.svg?branch=foxy-devel)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3)|
 
 ## ROBOTIS e-Manual for TurtleBot3
 - [ROBOTIS e-Manual for TurtleBot3](http://turtlebot3.robotis.com/)

diff --git a/turtlebot3/CHANGELOG.rst b/turtlebot3/CHANGELOG.rst
@@ -2,6 +2,13 @@
 Changelog for package turtlebot3
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.0 (2020-06-22)
+------------------
+* ROS 2 Foxy Fitzroy supported
+* ROS 2 Eloquent Elusor supported
+* Enable Windows port
+* Contributors: Ryan, Ashe, Sean Yen
+
 2.0.1 (2019-09-05)
 ------------------
 * Updated the CHANGELOG and version to release binary packages

diff --git a/turtlebot3/package.xml b/turtlebot3/package.xml
@@ -2,15 +2,15 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>turtlebot3</name>
-  <version>2.0.1</version>
+  <version>2.1.0</version>
   <description>
     ROS 2 packages for TurtleBot3
   </description>
   <license>Apache 2.0</license>
   <author email="[email protected]">Darby Lim</author>
   <author email="[email protected]">Ryan Shim</author>
   <author email="[email protected]">Pyo</author>
-  <maintainer email="pyo@robotis.com">Pyo</maintainer>
+  <maintainer email="willson@robotis.com">Will Son</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>

diff --git a/turtlebot3_bringup/CHANGELOG.rst b/turtlebot3_bringup/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package turtlebot3_bringup
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.0 (2020-06-22)
+------------------
+* ROS 2 Foxy Fitzroy supported
+* ROS 2 Eloquent Elusor supported
+* Contributors: Ryan, Ashe
+
 2.0.1 (2019-09-05)
 ------------------
 * Updated the CHANGELOG and version to release binary packages

diff --git a/turtlebot3_bringup/package.xml b/turtlebot3_bringup/package.xml
@@ -2,14 +2,14 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>turtlebot3_bringup</name>
-  <version>2.0.1</version>
+  <version>2.1.0</version>
   <description>
     ROS 2 launch scripts for starting the TurtleBot3
   </description>
   <license>Apache 2.0</license>
   <author email="[email protected]">Darby Lim</author>
   <author email="[email protected]">Pyo</author>
-  <maintainer email="pyo@robotis.com">Pyo</maintainer>
+  <maintainer email="willson@robotis.com">Will Son</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>

diff --git a/turtlebot3_cartographer/CHANGELOG.rst b/turtlebot3_cartographer/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package turtlebot3_cartographer
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.0 (2020-06-22)
+------------------
+* ROS 2 Foxy Fitzroy supported
+* ROS 2 Eloquent Elusor supported
+* Contributors: Ryan, Ashe
+
 2.0.1 (2019-09-05)
 ------------------
 * Updated the CHANGELOG and version to release binary packages

diff --git a/turtlebot3_cartographer/package.xml b/turtlebot3_cartographer/package.xml
@@ -2,14 +2,14 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>turtlebot3_cartographer</name>
-  <version>2.0.1</version>
+  <version>2.1.0</version>
   <description>
     ROS 2 launch scripts for cartographer
   </description>
   <license>Apache 2.0</license>
   <author email="[email protected]">Darby Lim</author>
   <author email="[email protected]">Pyo</author>
-  <maintainer email="pyo@robotis.com">Pyo</maintainer>
+  <maintainer email="willson@robotis.com">Will Son</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>

diff --git a/turtlebot3_description/CHANGELOG.rst b/turtlebot3_description/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package turtlebot3_description
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.0 (2020-06-22)
+------------------
+* ROS 2 Foxy Fitzroy supported
+* ROS 2 Eloquent Elusor supported
+* Contributors: Ryan, Ashe
+
 2.0.1 (2019-09-05)
 ------------------
 * Updated the CHANGELOG and version to release binary packages

diff --git a/turtlebot3_description/package.xml b/turtlebot3_description/package.xml
@@ -2,14 +2,14 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>turtlebot3_description</name>
-  <version>2.0.1</version>
+  <version>2.1.0</version>
   <description>
     3D models of the TurtleBot3 for simulation and visualization
   </description>
   <license>Apache 2.0</license>
   <author email="[email protected]">Darby Lim</author>
   <author email="[email protected]">Pyo</author>
-  <maintainer email="pyo@robotis.com">Pyo</maintainer>
+  <maintainer email="willson@robotis.com">Will Son</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>

diff --git a/turtlebot3_example/CHANGELOG.rst b/turtlebot3_example/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package turtlebot3_example
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.0 (2020-06-22)
+------------------
+* ROS 2 Foxy Fitzroy supported
+* ROS 2 Eloquent Elusor supported
+* Contributors: Ryan, Ashe
+
 2.0.1 (2019-00-00)
 ------------------
 *

diff --git a/turtlebot3_example/package.xml b/turtlebot3_example/package.xml
@@ -2,13 +2,13 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>turtlebot3_example</name>
-  <version>2.0.1</version>
+  <version>2.1.0</version>
   <description>
     This package provides four basic examples for TurtleBot3 (i.e., interactive marker, object detection, patrol and position control).
   </description>
   <author email="[email protected]">Ryan Shim</author>
   <author email="[email protected]">Gilbert</author>
-  <maintainer email="pyo@robotis.com">Pyo</maintainer>
+  <maintainer email="willson@robotis.com">Will Son</maintainer>
   <license>Apache 2.0</license>
   <url type="website">http://wiki.ros.org/turtlebot3_example</url>
   <url type="emanual">http://turtlebot3.robotis.com</url>

diff --git a/turtlebot3_navigation2/CHANGELOG.rst b/turtlebot3_navigation2/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package turtlebot3_navigation2
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.0 (2020-06-22)
+------------------
+* ROS 2 Foxy Fitzroy supported
+* ROS 2 Eloquent Elusor supported
+* Contributors: Ryan, Ashe
+
 2.0.1 (2019-09-05)
 ------------------
 * Updated the CHANGELOG and version to release binary packages

diff --git a/turtlebot3_navigation2/launch/navigation2.launch.py b/turtlebot3_navigation2/launch/navigation2.launch.py
@@ -47,7 +47,7 @@ def generate_launch_description():
 
     rviz_config_dir = os.path.join(
         get_package_share_directory('nav2_bringup'),
-        'launch',
+        'rviz',
         'nav2_default_view.rviz')
 
     return LaunchDescription([

diff --git a/turtlebot3_navigation2/package.xml b/turtlebot3_navigation2/package.xml
@@ -2,14 +2,14 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>turtlebot3_navigation2</name>
-  <version>2.0.1</version>
+  <version>2.1.0</version>
   <description>
     ROS 2 launch scripts for navigation2
   </description>
   <license>Apache 2.0</license>
   <author email="[email protected]">Darby Lim</author>
   <author email="[email protected]">Pyo</author>
-  <maintainer email="pyo@robotis.com">Pyo</maintainer>
+  <maintainer email="willson@robotis.com">Will Son</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>

diff --git a/turtlebot3_node/CHANGELOG.rst b/turtlebot3_node/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package turtlebot3_node
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.0 (2020-06-22)
+------------------
+* ROS 2 Foxy Fitzroy supported
+* ROS 2 Eloquent Elusor supported
+* Contributors: Ryan, Ashe
+
 2.0.1 (2019-09-05)
 ------------------
 * Updated the CHANGELOG and version to release binary packages

diff --git a/turtlebot3_node/package.xml b/turtlebot3_node/package.xml
@@ -2,14 +2,14 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>turtlebot3_node</name>
-  <version>2.0.1</version>
+  <version>2.1.0</version>
   <description>
     TurtleBot3 driver node that include diff drive controller, odometry and tf node
   </description>
   <license>Apache 2.0</license>
   <author email="[email protected]">Darby Lim</author>
   <author email="[email protected]">Pyo</author>
-  <maintainer email="pyo@robotis.com">Pyo</maintainer>
+  <maintainer email="willson@robotis.com">Will Son</maintainer>
   <url type="website">http://wiki.ros.org/turtlebot3_node</url>
   <url type="emanual">http://turtlebot3.robotis.com</url>
   <url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3</url>

diff --git a/turtlebot3_teleop/CHANGELOG.rst b/turtlebot3_teleop/CHANGELOG.rst
@@ -2,6 +2,13 @@
 Changelog for package turtlebot3_teleop
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.0 (2020-06-22)
+------------------
+* ROS 2 Foxy Fitzroy supported
+* ROS 2 Eloquent Elusor supported
+* Enable Windows teleop keyboard
+* Contributors: Ryan, Ashe, Sean Yen
+
 2.0.1 (2019-09-05)
 ------------------
 * Updated the CHANGELOG and version to release binary packages

diff --git a/turtlebot3_teleop/package.xml b/turtlebot3_teleop/package.xml
@@ -2,13 +2,13 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>turtlebot3_teleop</name>
-  <version>2.0.1</version>
+  <version>2.1.0</version>
   <description>
     Teleoperation node using keyboard for TurtleBot3.
   </description>
   <author email="[email protected]">Darby Lim</author>
   <author email="[email protected]">Pyo</author>
-  <maintainer email="pyo@robotis.com">Pyo</maintainer>
+  <maintainer email="willson@robotis.com">Will Son</maintainer>
   <license>Apache 2.0</license>
   <url type="website">http://wiki.ros.org/turtlebot3_teleop</url>
   <url type="emanual">http://turtlebot3.robotis.com</url>

diff --git a/turtlebot3_teleop/turtlebot3_teleop/script/teleop_keyboard.py b/turtlebot3_teleop/turtlebot3_teleop/script/teleop_keyboard.py
@@ -30,8 +30,10 @@
 import os
 import select
 import sys
-import termios
-import tty
+if os.name == 'nt':
+  import msvcrt
+else:
+  import termios, tty
 
 from geometry_msgs.msg import Twist
 import rclpy
@@ -70,6 +72,8 @@
 
 
 def get_key(settings):
+    if os.name == 'nt':
+        return msvcrt.getch().decode('utf-8')
     tty.setraw(sys.stdin.fileno())
     rlist, _, _ = select.select([sys.stdin], [], [], 0.1)
     if rlist:
@@ -123,7 +127,9 @@ def check_angular_limit_velocity(velocity):
 
 
 def main():
-    settings = termios.tcgetattr(sys.stdin)
+    settings = None
+    if os.name != 'nt':
+        settings = termios.tcgetattr(sys.stdin)
 
     rclpy.init()
 
@@ -212,7 +218,8 @@ def main():
 
         pub.publish(twist)
 
-        termios.tcsetattr(sys.stdin, termios.TCSADRAIN, settings)
+        if os.name != 'nt':
+            termios.tcsetattr(sys.stdin, termios.TCSADRAIN, settings)
 
 if __name__ == '__main__':
     main()