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

Ros2 devel

Author: ROBOTIS-Will

.github/workflows/lint.yml

@@ -6,22 +6,22 @@ name: Lint
 # events but only for the master branch
 on:
   push:
-    branches: [ ros2, ros2-devel, dashing-devel, foxy-devel, galactic-devel ]
+    branches: [ ros2, ros2-devel, foxy-devel, galactic-devel ]
   pull_request:
-    branches: [ ros2, ros2-devel ]
+    branches: [ ros2, ros2-devel, foxy-devel, galactic-devel ]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  ament_lint_dashing:
-    runs-on: ubuntu-18.04
+  ament_lint_foxy:
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
         linter: [copyright, cppcheck, cpplint, flake8, pep257, xmllint]
-        distribution: [dashing]
+        distribution: [foxy]
     steps:
       - uses: actions/checkout@v1
-      - uses: ros-tooling/setup-ros@v0.1
+      - uses: ros-tooling/setup-ros@0.2.1
       - uses: ros-tooling/action-ros-lint@v0.1
         with:
           distribution: ${{ matrix.distribution }}
@@ -31,16 +31,16 @@ jobs:
             turtlebot3_fake_node
             turtlebot3_gazebo
 
-  ament_lint_foxy:
+  ament_lint_galactic:
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
         linter: [copyright, cppcheck, cpplint, flake8, pep257, xmllint]
-        distribution: [foxy]
+        distribution: [galactic]
     steps:
       - uses: actions/checkout@v1
-      - uses: ros-tooling/setup-ros@v0.1
+      - uses: ros-tooling/setup-ros@0.2.1
       - uses: ros-tooling/action-ros-lint@v0.1
         with:
           distribution: ${{ matrix.distribution }}

.github/workflows/ros-ci.yml

@@ -1,15 +1,15 @@
-name: ros-ci
+name: ros2-devel
 
 # Controls when the action will run. Triggers the workflow on push or pull request
 on:
   push:
-    branches: [ ros2 ]
+    branches: [ ros2, ros2-devel, foxy-devel, galactic-devel ]
   pull_request:
-    branches: [ ros2 ]
+    branches: [ ros2, ros2-devel, foxy-devel, galactic-devel ]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  ros2-ci:
+  galactic-devel-ci:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -46,7 +46,7 @@ jobs:
         with:
           path: ros_ws/src
       - name: Setup ROS environment
-        uses: ros-tooling/setup-ros@0.1.2
+        uses: ros-tooling/setup-ros@0.2.1
         with:
           required-ros-distributions: ${{ matrix.ros_distribution }}
       - name: Build and Test
@@ -55,3 +55,4 @@ jobs:
           package-name: turtlebot3_simulations
           target-ros2-distro: ${{ matrix.ros_distribution }}
           vcs-repo-file-url: "https://raw.githubusercontent.com/ROBOTIS-GIT/turtlebot3_simulations/ros2-devel/turtlebot3_simulations_ci.repos"
+  

README.md

@@ -11,6 +11,8 @@
 
 [![foxy-devel Status](https://github.com/ROBOTIS-GIT/turtlebot3_simulations/workflows/foxy-devel/badge.svg)](https://github.com/ROBOTIS-GIT/turtlebot3_simulations/tree/foxy-devel)
 
+[![galactic-devel Status](https://github.com/ROBOTIS-GIT/turtlebot3_simulations/workflows/galactic-devel/badge.svg)](https://github.com/ROBOTIS-GIT/turtlebot3_simulations/tree/galactic-devel)
+
 ## ROBOTIS e-Manual for TurtleBot3
 - [ROBOTIS e-Manual for TurtleBot3](http://turtlebot3.robotis.com/)
 

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

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}
 )
 

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([

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)
 

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.

turtlebot3_fake_node/rviz/model.rviz

@@ -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