galactic sync

ROBOTIS-GIT · Jun 14, 2021 · a1d03d3 · a1d03d3
2 parents 38c94f4 + 101704f
commit a1d03d3
Show file tree

Hide file tree

Showing 106 changed files with 1,416 additions and 3,611 deletions.
diff --git a/turtlebot3_fake_node/CHANGELOG.rst b/turtlebot3_fake_node/CHANGELOG.rst
@@ -2,6 +2,14 @@
 Changelog for package turtlebot3_fake
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.2.4 (2021-06-14)
+------------------
+* Release for ROS2 Galactic
+* Clean up unncessary files
+* Use turtlebot3_common mesh modeling
+* Independent turtlebot3_simulations package
+* Contributors: Will Son
+
 2.2.3 (2021-04-12)
 ------------------
 * Update required keyword arguments

diff --git a/turtlebot3_fake_node/CMakeLists.txt b/turtlebot3_fake_node/CMakeLists.txt
@@ -53,7 +53,7 @@ install(TARGETS ${EXEC_NAME}
   DESTINATION lib/${PROJECT_NAME}
 )
 
-install(DIRECTORY launch param rviz
+install(DIRECTORY launch param
   DESTINATION share/${PROJECT_NAME}
 )
 

diff --git a/turtlebot3_fake_node/launch/rviz2.launch.py b/turtlebot3_fake_node/launch/rviz2.launch.py
@@ -23,9 +23,9 @@
 
 def generate_launch_description():
     rviz_config_dir = os.path.join(
-        get_package_share_directory('turtlebot3_fake_node'),
+        get_package_share_directory('turtlebot3_gazebo'),
         'rviz',
-        'model.rviz'
+        'tb3_gazebo.rviz'
     )
 
     return LaunchDescription([

diff --git a/turtlebot3_fake_node/launch/turtlebot3_fake_node.launch.py b/turtlebot3_fake_node/launch/turtlebot3_fake_node.launch.py
@@ -45,7 +45,7 @@ def generate_launch_description():
     urdf_file_name = 'turtlebot3_' + TURTLEBOT3_MODEL + '.urdf'
 
     urdf = os.path.join(
-        get_package_share_directory('turtlebot3_description'),
+        get_package_share_directory('turtlebot3_gazebo'),
         'urdf',
         urdf_file_name)
 

diff --git a/turtlebot3_fake_node/package.xml b/turtlebot3_fake_node/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_fake_node</name>
-  <version>2.2.3</version>
+  <version>2.2.4</version>
   <description>
     Package for TurtleBot3 fake node. With this package, simple tests can be done without a robot.
     You can do simple tests using this package on rviz without real robots.

diff --git a/turtlebot3_fake_node/rviz/model.rviz b/turtlebot3_fake_node/rviz/model.rviz
diff --git a/turtlebot3_gazebo/CHANGELOG.rst b/turtlebot3_gazebo/CHANGELOG.rst
@@ -2,6 +2,15 @@
 Changelog for package turtlebot3_gazebo
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.2.4 (2021-06-14)
+------------------
+* Release for ROS2 Galactic
+* Separate world and robot models(#162)
+* Clean up unncessary files
+* Use turtlebot3_common mesh modeling
+* Independent turtlebot3_simulations package
+* Contributors: Joep Tool, Will Son
+
 2.2.3 (2021-04-12)
 ------------------
 * Update required keyword arguments

diff --git a/turtlebot3_gazebo/CMakeLists.txt b/turtlebot3_gazebo/CMakeLists.txt
@@ -69,7 +69,7 @@ install(TARGETS ${EXEC_NAME}
   DESTINATION lib/${PROJECT_NAME}
 )
 
-install(DIRECTORY launch models rviz worlds
+install(DIRECTORY launch models rviz urdf worlds
   DESTINATION share/${PROJECT_NAME}/
 )