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

Update ros2 version
ROBOTIS-GIT · Sep 5, 2019 · 758c89a · 758c89a
2 parents a404089 + 6fa9b1a
commit 758c89a
Show file tree

Hide file tree

Showing 30 changed files with 119 additions and 94 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,6 @@ branches:
 
 install:
   - git clone --quiet --depth 1 https://github.com/ROBOTIS-GIT/ros2ci.git .ros2ci
-  - cp turtlebot3_ci.repos .ros2ci/additional_repos.repos
 
 matrix:
   include:

diff --git a/turtlebot3.repos b/turtlebot3.repos
@@ -11,10 +11,6 @@ repositories:
     type: git
     url: https://github.com/ROBOTIS-GIT/turtlebot3_simulations.git
     version: ros2
-  utils/cartographer_ros:
-    type: git
-    url: https://github.com/ROBOTIS-GIT/cartographer_ros.git
-    version: dashing
   utils/DynamixelSDK:
     type: git
     url: https://github.com/ROBOTIS-GIT/DynamixelSDK.git

diff --git a/turtlebot3/CHANGELOG.rst b/turtlebot3/CHANGELOG.rst
@@ -2,6 +2,13 @@
 Changelog for package turtlebot3
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.0.1 (2019-09-05)
+------------------
+* Updated the CHANGELOG and version to release binary packages
+* Added missing exec_depend for nav2_bringup
+* Modified dependency packages
+* Contributors: Ruffin, Darby Lim, Pyo
+
 2.0.0 (2019-08-20)
 ------------------
 * Supported ROS 2 Dashing Diademata

diff --git a/turtlebot3/package.xml b/turtlebot3/package.xml
@@ -2,7 +2,7 @@
 <?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.0</version>
+  <version>2.0.1</version>
   <description>
     ROS 2 packages for TurtleBot3
   </description>

diff --git a/turtlebot3_bringup/CHANGELOG.rst b/turtlebot3_bringup/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package turtlebot3_bringup
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.0.1 (2019-09-05)
+------------------
+* Updated the CHANGELOG and version to release binary packages
+* Modified dependency packages
+* Contributors: Darby Lim, Pyo
+
 2.0.0 (2019-08-20)
 ------------------
 * Supported ROS 2 Dashing Diademata

diff --git a/turtlebot3_bringup/launch/robot.launch.py b/turtlebot3_bringup/launch/robot.launch.py
@@ -1,20 +1,20 @@
-# /*******************************************************************************
-# * Copyright 2019 ROBOTIS CO., LTD.
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# *     http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# *******************************************************************************/
-
-# /* Author: Darby Lim */
+#!/usr/bin/env python3
+#
+# Copyright 2019 ROBOTIS CO., LTD.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Authors: Darby Lim
 
 import os
 

diff --git a/turtlebot3_bringup/launch/rviz2.launch.py b/turtlebot3_bringup/launch/rviz2.launch.py
@@ -1,20 +1,20 @@
-# /*******************************************************************************
-# * Copyright 2019 ROBOTIS CO., LTD.
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# *     http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# *******************************************************************************/
-
-# /* Author: Darby Lim */
+#!/usr/bin/env python3
+#
+# Copyright 2019 ROBOTIS CO., LTD.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Authors: Darby Lim
 
 import os
 

diff --git a/turtlebot3_bringup/launch/turtlebot3_state_publisher.launch.py b/turtlebot3_bringup/launch/turtlebot3_state_publisher.launch.py
@@ -1,20 +1,20 @@
-# /*******************************************************************************
-# * Copyright 2019 ROBOTIS CO., LTD.
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# *     http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# *******************************************************************************/
-
-# /* Author: Darby Lim */
+#!/usr/bin/env python3
+#
+# Copyright 2019 ROBOTIS CO., LTD.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Authors: Darby Lim
 
 import os
 

diff --git a/turtlebot3_bringup/package.xml b/turtlebot3_bringup/package.xml
@@ -2,7 +2,7 @@
 <?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.0</version>
+  <version>2.0.1</version>
   <description>
     ROS 2 launch scripts for starting the TurtleBot3
   </description>
@@ -15,11 +15,11 @@
   <url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3</url>
   <url type="bugtracker">https://github.com/ROBOTIS-GIT/turtlebot3/issues</url>
   <buildtool_depend>ament_cmake</buildtool_depend>
-  <depend>hls_lfcd_lds_driver</depend>
-  <depend>robot_state_publisher</depend>
-  <depend>rviz2</depend>
-  <depend>turtlebot3_description</depend>
-  <depend>turtlebot3_node</depend>
+  <exec_depend>hls_lfcd_lds_driver</exec_depend>
+  <exec_depend>robot_state_publisher</exec_depend>
+  <exec_depend>rviz2</exec_depend>
+  <exec_depend>turtlebot3_description</exec_depend>
+  <exec_depend>turtlebot3_node</exec_depend>
   <export>
     <build_type>ament_cmake</build_type>
   </export>

diff --git a/turtlebot3_cartographer/CHANGELOG.rst b/turtlebot3_cartographer/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package turtlebot3_cartographer
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.0.1 (2019-09-05)
+------------------
+* Updated the CHANGELOG and version to release binary packages
+* Modified dependency packages
+* Contributors: Darby Lim, Pyo
+
 2.0.0 (2019-08-20)
 ------------------
 * Supported ROS 2 Dashing Diademata

diff --git a/turtlebot3_cartographer/CMakeLists.txt b/turtlebot3_cartographer/CMakeLists.txt
@@ -8,8 +8,6 @@ project(turtlebot3_cartographer)
 # Find ament packages and libraries for ament and system dependencies
 ################################################################################
 find_package(ament_cmake REQUIRED)
-find_package(cartographer REQUIRED)
-find_package(cartographer_ros REQUIRED)
 
 ################################################################################
 # Install

diff --git a/turtlebot3_cartographer/launch/cartographer.launch.py b/turtlebot3_cartographer/launch/cartographer.launch.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# /* Author: Darby Lim */
+# Author: Darby Lim
 
 import os
 from ament_index_python.packages import get_package_share_directory
@@ -80,4 +80,4 @@ def generate_launch_description():
             arguments=['-d', rviz_config_dir],
             parameters=[{'use_sim_time': use_sim_time}],
             output='screen'),
-    ])
+    ])
diff --git a/turtlebot3_cartographer/launch/occupancy_grid.launch.py b/turtlebot3_cartographer/launch/occupancy_grid.launch.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# /* Author: Darby Lim */
+# Author: Darby Lim
 
 from launch import LaunchDescription
 from launch.actions import DeclareLaunchArgument
@@ -47,4 +47,4 @@ def generate_launch_description():
             output='screen',
             parameters=[{'use_sim_time': use_sim_time}],
             arguments=['-resolution', resolution, '-publish_period_sec', publish_period_sec]),
-    ])
+    ])
diff --git a/turtlebot3_cartographer/package.xml b/turtlebot3_cartographer/package.xml
@@ -2,7 +2,7 @@
 <?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.0</version>
+  <version>2.0.1</version>
   <description>
     ROS 2 launch scripts for cartographer
   </description>
@@ -15,9 +15,7 @@
   <url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3</url>
   <url type="bugtracker">https://github.com/ROBOTIS-GIT/turtlebot3/issues</url>
   <buildtool_depend>ament_cmake</buildtool_depend>
-  <exec_depend>ament_index_python</exec_depend>
   <exec_depend>cartographer_ros</exec_depend>
-  <exec_depend>launch</exec_depend>
   <export>
     <build_type>ament_cmake</build_type>
   </export>

diff --git a/turtlebot3_ci.repos b/turtlebot3_ci.repos
@@ -3,10 +3,6 @@ repositories:
     type: git
     url: https://github.com/ROBOTIS-GIT/turtlebot3_msgs.git
     version: ros2
-  utils/cartographer_ros:
-    type: git
-    url: https://github.com/ROBOTIS-GIT/cartographer_ros.git
-    version: dashing
   utils/DynamixelSDK:
     type: git
     url: https://github.com/ROBOTIS-GIT/DynamixelSDK.git

diff --git a/turtlebot3_description/CHANGELOG.rst b/turtlebot3_description/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package turtlebot3_description
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.0.1 (2019-09-05)
+------------------
+* Updated the CHANGELOG and version to release binary packages
+* Modified dependency packages
+* Contributors: Darby Lim, Pyo
+
 2.0.0 (2019-08-20)
 ------------------
 * Supported ROS 2 Dashing Diademata

diff --git a/turtlebot3_description/CMakeLists.txt b/turtlebot3_description/CMakeLists.txt
@@ -28,5 +28,4 @@ install(DIRECTORY meshes rviz urdf
 ################################################################################
 # Macro for ament package
 ################################################################################
-ament_export_dependencies(urdf)
 ament_package()
diff --git a/turtlebot3_description/package.xml b/turtlebot3_description/package.xml
@@ -2,7 +2,7 @@
 <?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.0</version>
+  <version>2.0.1</version>
   <description>
     3D models of the TurtleBot3 for simulation and visualization
   </description>

diff --git a/turtlebot3_navigation2/CHANGELOG.rst b/turtlebot3_navigation2/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package turtlebot3_navigation2
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.0.1 (2019-09-05)
+------------------
+* Updated the CHANGELOG and version to release binary packages
+* Modified dependency packages
+* Contributors: Darby Lim, Pyo
+
 2.0.0 (2019-08-20)
 ------------------
 * Supported ROS 2 Dashing Diademata

diff --git a/turtlebot3_navigation2/CMakeLists.txt b/turtlebot3_navigation2/CMakeLists.txt
@@ -8,7 +8,6 @@ project(turtlebot3_navigation2)
 # Find ament packages and libraries for ament and system dependencies
 ################################################################################
 find_package(ament_cmake REQUIRED)
-find_package(navigation2 REQUIRED)
 
 ################################################################################
 # Install

diff --git a/turtlebot3_navigation2/launch/navigation2.launch.py b/turtlebot3_navigation2/launch/navigation2.launch.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# /* Author: Darby Lim */
+# Author: Darby Lim
 
 import os
 

diff --git a/turtlebot3_navigation2/package.xml b/turtlebot3_navigation2/package.xml
@@ -2,7 +2,7 @@
 <?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.0</version>
+  <version>2.0.1</version>
   <description>
     ROS 2 launch scripts for navigation2
   </description>
@@ -15,7 +15,7 @@
   <url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3</url>
   <url type="bugtracker">https://github.com/ROBOTIS-GIT/turtlebot3/issues</url>
   <buildtool_depend>ament_cmake</buildtool_depend>
-  <exec_depend>navigation2</exec_depend>
+  <exec_depend>nav2_bringup</exec_depend>
   <export>
     <build_type>ament_cmake</build_type>
   </export>

diff --git a/turtlebot3_node/CHANGELOG.rst b/turtlebot3_node/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package turtlebot3_node
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.0.1 (2019-09-05)
+------------------
+* Updated the CHANGELOG and version to release binary packages
+* Modified dependency packages
+* Contributors: Darby Lim, Pyo
+
 2.0.0 (2019-08-20)
 ------------------
 * Supported ROS 2 Dashing Diademata

diff --git a/turtlebot3_node/CMakeLists.txt b/turtlebot3_node/CMakeLists.txt
@@ -24,7 +24,6 @@ find_package(rclcpp REQUIRED)
 find_package(rcutils REQUIRED)
 find_package(sensor_msgs REQUIRED)
 find_package(std_msgs REQUIRED)
-find_package(std_msgs REQUIRED)
 find_package(std_srvs REQUIRED)
 find_package(tf2 REQUIRED)
 find_package(tf2_ros REQUIRED)
@@ -63,8 +62,8 @@ set(DEPENDENCIES
   "sensor_msgs"
   "std_msgs"
   "std_srvs"
-  "tf2_ros"
   "tf2"
+  "tf2_ros"
   "turtlebot3_msgs"
 )