diff --git a/.travis.yml b/.travis.yml index 3efada3a..68bd545f 100644 --- 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 index d26248af..a7b8da9f 100644 --- 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 index 56eabc09..9e688d91 100644 --- 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 index 4383362b..521a3e67 100644 --- a/turtlebot3/package.xml +++ b/turtlebot3/package.xml @@ -2,7 +2,7 @@ turtlebot3 - 2.0.0 + 2.0.1 ROS 2 packages for TurtleBot3 diff --git a/turtlebot3_bringup/CHANGELOG.rst b/turtlebot3_bringup/CHANGELOG.rst index 2e010291..f4ec3c4b 100644 --- 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 index a9ff378d..2c496bb6 100644 --- 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 index 7e6987f5..75afe6b4 100644 --- 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 index bb822892..df962ec1 100644 --- 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 index 2ce53d88..38dd8d6a 100644 --- a/turtlebot3_bringup/package.xml +++ b/turtlebot3_bringup/package.xml @@ -2,7 +2,7 @@ turtlebot3_bringup - 2.0.0 + 2.0.1 ROS 2 launch scripts for starting the TurtleBot3 @@ -15,11 +15,11 @@ https://github.com/ROBOTIS-GIT/turtlebot3 https://github.com/ROBOTIS-GIT/turtlebot3/issues ament_cmake - hls_lfcd_lds_driver - robot_state_publisher - rviz2 - turtlebot3_description - turtlebot3_node + hls_lfcd_lds_driver + robot_state_publisher + rviz2 + turtlebot3_description + turtlebot3_node ament_cmake diff --git a/turtlebot3_cartographer/CHANGELOG.rst b/turtlebot3_cartographer/CHANGELOG.rst index 97abeaff..e591d84e 100644 --- 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 index ca230fd2..1ae0510d 100644 --- 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 index e9f4f95c..16f6542c 100644 --- 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'), - ]) \ No newline at end of file + ]) diff --git a/turtlebot3_cartographer/launch/occupancy_grid.launch.py b/turtlebot3_cartographer/launch/occupancy_grid.launch.py index d2bbdbdd..175bb116 100644 --- 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]), - ]) \ No newline at end of file + ]) diff --git a/turtlebot3_cartographer/package.xml b/turtlebot3_cartographer/package.xml index 362f11c0..09060365 100644 --- a/turtlebot3_cartographer/package.xml +++ b/turtlebot3_cartographer/package.xml @@ -2,7 +2,7 @@ turtlebot3_cartographer - 2.0.0 + 2.0.1 ROS 2 launch scripts for cartographer @@ -15,9 +15,7 @@ https://github.com/ROBOTIS-GIT/turtlebot3 https://github.com/ROBOTIS-GIT/turtlebot3/issues ament_cmake - ament_index_python cartographer_ros - launch ament_cmake diff --git a/turtlebot3_ci.repos b/turtlebot3_ci.repos index 4fd85e2c..6892982e 100644 --- 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 index ebc3f6aa..36d5b823 100644 --- 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 index 5a2d2d98..f3f26475 100644 --- 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 index bf2ba694..871c8d13 100644 --- a/turtlebot3_description/package.xml +++ b/turtlebot3_description/package.xml @@ -2,7 +2,7 @@ turtlebot3_description - 2.0.0 + 2.0.1 3D models of the TurtleBot3 for simulation and visualization diff --git a/turtlebot3_navigation2/CHANGELOG.rst b/turtlebot3_navigation2/CHANGELOG.rst index f5f2824c..231b3fe3 100644 --- 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 index 9f008dd6..dffa8824 100644 --- 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 index 49bd950d..c5e49ddf 100644 --- 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 index 5fc792e5..600116ea 100644 --- a/turtlebot3_navigation2/package.xml +++ b/turtlebot3_navigation2/package.xml @@ -2,7 +2,7 @@ turtlebot3_navigation2 - 2.0.0 + 2.0.1 ROS 2 launch scripts for navigation2 @@ -15,7 +15,7 @@ https://github.com/ROBOTIS-GIT/turtlebot3 https://github.com/ROBOTIS-GIT/turtlebot3/issues ament_cmake - navigation2 + nav2_bringup ament_cmake diff --git a/turtlebot3_node/CHANGELOG.rst b/turtlebot3_node/CHANGELOG.rst index 8eb9098a..4f873a63 100644 --- 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 index fa428fc9..3f5c36b5 100644 --- 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" ) diff --git a/turtlebot3_node/package.xml b/turtlebot3_node/package.xml index 8b653343..96303624 100644 --- a/turtlebot3_node/package.xml +++ b/turtlebot3_node/package.xml @@ -2,7 +2,7 @@ turtlebot3_node - 2.0.0 + 2.0.1 TurtleBot3 driver node that include diff drive controller, odometry and tf node @@ -24,8 +24,8 @@ sensor_msgs std_msgs std_srvs - tf2_ros tf2 + tf2_ros turtlebot3_msgs ament_cmake diff --git a/turtlebot3_node/src/dynamixel_sdk_wrapper.cpp b/turtlebot3_node/src/dynamixel_sdk_wrapper.cpp index ca261986..d4c34e97 100644 --- a/turtlebot3_node/src/dynamixel_sdk_wrapper.cpp +++ b/turtlebot3_node/src/dynamixel_sdk_wrapper.cpp @@ -97,7 +97,7 @@ bool DynamixelSDKWrapper::set_data_to_device( return false; } - return false; + return ret; } bool DynamixelSDKWrapper::init_dynamixel_sdk_handlers() diff --git a/turtlebot3_teleop/CHANGELOG.rst b/turtlebot3_teleop/CHANGELOG.rst index 941310e6..34d95cc3 100644 --- a/turtlebot3_teleop/CHANGELOG.rst +++ b/turtlebot3_teleop/CHANGELOG.rst @@ -2,6 +2,12 @@ Changelog for package turtlebot3_teleop ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +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_teleop/package.xml b/turtlebot3_teleop/package.xml index 5bc6d21d..2ba8e3c3 100644 --- a/turtlebot3_teleop/package.xml +++ b/turtlebot3_teleop/package.xml @@ -2,7 +2,7 @@ turtlebot3_teleop - 2.0.0 + 2.0.1 Teleoperation node using keyboard for TurtleBot3. @@ -14,10 +14,8 @@ http://turtlebot3.robotis.com https://github.com/ROBOTIS-GIT/turtlebot3 https://github.com/ROBOTIS-GIT/turtlebot3/issues - geometry_msgs - launch - launch_ros - rclpy + geometry_msgs + rclpy ament_python diff --git a/turtlebot3_teleop/setup.py b/turtlebot3_teleop/setup.py index 73eb8ec7..4d4d8e7a 100644 --- a/turtlebot3_teleop/setup.py +++ b/turtlebot3_teleop/setup.py @@ -8,7 +8,7 @@ setup( name=package_name, - version='2.0.0', + version='2.0.1', packages=find_packages(exclude=[]), data_files=[ ('share/ament_index/resource_index/packages', ['resource/' + package_name]), diff --git a/turtlebot3_teleop/turtlebot3_teleop/script/teleop_keyboard.py b/turtlebot3_teleop/turtlebot3_teleop/script/teleop_keyboard.py index aa833a50..fde63513 100755 --- a/turtlebot3_teleop/turtlebot3_teleop/script/teleop_keyboard.py +++ b/turtlebot3_teleop/turtlebot3_teleop/script/teleop_keyboard.py @@ -25,7 +25,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -# /* Author: Darby Lim */ +# Author: Darby Lim import os import select