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

prepare for release v2.2.2
ROBOTIS-GIT · Feb 25, 2021 · 7715138 · 7715138
2 parents ee3045b + d8123fd
commit 7715138
Show file tree

Hide file tree

Showing 17 changed files with 75 additions and 21 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -6,27 +6,46 @@ name: Lint
 # events but only for the master branch
 on:
   push:
-    branches: [ ros2, ros2-devel, dashing-devel, eloquent-devel ]
+    branches: [ ros2, ros2-devel, dashing-devel, foxy-devel, galactic-devel ]
   pull_request:
     branches: [ ros2, ros2-devel ]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  ament_lint:
+  ament_lint_dashing:
     runs-on: ubuntu-18.04
     strategy:
       fail-fast: false
       matrix:
-        linter: [copyright, cppcheck, cpplint, uncrustify, pep8, pep257, xmllint]
-        distribution: [dashing, eloquent]
+        linter: [copyright, cppcheck, cpplint, flake8, pep257, xmllint]
+        distribution: [dashing]
     steps:
-      - uses: actions/checkout@v2.3.4
-      - uses: ros-tooling/setup-ros@0.1.0
-      - uses: ros-tooling/action-ros-lint@0.0.6
+      - uses: actions/checkout@v1
+      - uses: ros-tooling/setup-ros@v0.1
+      - uses: ros-tooling/action-ros-lint@v0.1
         with:
           distribution: ${{ matrix.distribution }}
           linter: ${{ matrix.linter }}
-          package-name: |
+          package-name: 
+            turtlebot3_simulations
+            turtlebot3_fake_node
+            turtlebot3_gazebo
+
+  ament_lint_foxy:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        linter: [copyright, cppcheck, cpplint, flake8, pep257, xmllint]
+        distribution: [foxy]
+    steps:
+      - uses: actions/checkout@v1
+      - uses: ros-tooling/[email protected]
+      - uses: ros-tooling/[email protected]
+        with:
+          distribution: ${{ matrix.distribution }}
+          linter: ${{ matrix.linter }}
+          package-name: 
             turtlebot3_simulations
             turtlebot3_fake_node
             turtlebot3_gazebo
diff --git a/.travis.yml b/.travis.yml
@@ -17,6 +17,8 @@ branches:
     - ros2-devel
     - dashing-devel
     - foxy-devel
+    - galactic-devel
+
 
 install:
   - git clone --quiet --depth 1 https://github.com/ROBOTIS-GIT/ros2ci.git .ros2ci
@@ -25,3 +27,4 @@ matrix:
   include:
     - script: .ros2ci/travis.bash dashing
     - script: .ros2ci/travis.bash foxy
+    # - script: .ros2ci/travis.bash rolling
diff --git a/turtlebot3_fake_node/CHANGELOG.rst b/turtlebot3_fake_node/CHANGELOG.rst
@@ -2,6 +2,10 @@
 Changelog for package turtlebot3_fake
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.2.2 (2021-02-24)
+------------------
+* none
+
 2.2.1 (2021-01-13)
 ------------------
 * Eloquent Elusor EOL

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.1</version>
+  <version>2.2.2</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/src/turtlebot3_fake_node.cpp b/turtlebot3_fake_node/src/turtlebot3_fake_node.cpp
@@ -48,9 +48,10 @@ Turtlebot3Fake::Turtlebot3Fake()
   cmd_vel_sub_ = this->create_subscription<geometry_msgs::msg::Twist>(
     "cmd_vel", \
     qos, \
-    std::bind(&Turtlebot3Fake::command_velocity_callback, \
-    this, \
-    std::placeholders::_1));
+    std::bind(
+      &Turtlebot3Fake::command_velocity_callback, \
+      this, \
+      std::placeholders::_1));
 
   /************************************************************
   ** initialise ROS timers
@@ -78,7 +79,8 @@ void Turtlebot3Fake::init_parameters()
   this->declare_parameter("wheels.radius");
 
   // Get parameters from yaml
-  this->get_parameter_or<std::string>("joint_states_frame", \
+  this->get_parameter_or<std::string>(
+    "joint_states_frame", \
     joint_states_.header.frame_id, \
     "base_footprint");
   this->get_parameter_or<std::string>("odom_frame", odom_.header.frame_id, "odom");

diff --git a/turtlebot3_gazebo/CHANGELOG.rst b/turtlebot3_gazebo/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package turtlebot3_gazebo
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.2.2 (2021-02-24)
+------------------
+* Remove shared objects built in older version
+* Contributors: Will Son
+
 2.2.1 (2021-01-13)
 ------------------
 * Eloquent Elusor EOL

diff --git a/turtlebot3_gazebo/CMakeLists.txt b/turtlebot3_gazebo/CMakeLists.txt
@@ -20,6 +20,7 @@ endif()
 # Find ament packages and libraries for ament and system dependencies
 ################################################################################
 find_package(ament_cmake REQUIRED)
+find_package(gazebo REQUIRED)
 find_package(gazebo_ros_pkgs REQUIRED)
 find_package(geometry_msgs REQUIRED)
 find_package(nav_msgs REQUIRED)
@@ -31,8 +32,13 @@ find_package(turtlebot3 REQUIRED)
 ################################################################################
 # Build
 ################################################################################
+link_directories(
+  ${GAZEBO_LIBRARY_DIRS}
+)
+
 include_directories(
   include
+  ${GAZEBO_INCLUDE_DIRS}
 )
 
 set(dependencies
@@ -48,6 +54,15 @@ set(EXEC_NAME "turtlebot3_drive")
 add_executable(${EXEC_NAME} src/turtlebot3_drive.cpp)
 ament_target_dependencies(${EXEC_NAME} ${dependencies})
 
+add_library(obstacle1 SHARED models/turtlebot3_dqn_world/obstacle_plugin/obstacle1.cc)
+target_link_libraries(obstacle1 ${GAZEBO_LIBRARIES})
+
+add_library(obstacle2 SHARED models/turtlebot3_dqn_world/obstacle_plugin/obstacle2.cc)
+target_link_libraries(obstacle2 ${GAZEBO_LIBRARIES})
+
+add_library(obstacles SHARED models/turtlebot3_dqn_world/obstacle_plugin/obstacles.cc)
+target_link_libraries(obstacles ${GAZEBO_LIBRARIES})
+
 ################################################################################
 # Install
 ################################################################################

diff --git a/turtlebot3_gazebo/models/turtlebot3_dqn_world/obstacle_plugin/build/libobstacle1.so b/turtlebot3_gazebo/models/turtlebot3_dqn_world/obstacle_plugin/build/libobstacle1.so
diff --git a/turtlebot3_gazebo/models/turtlebot3_dqn_world/obstacle_plugin/build/libobstacle2.so b/turtlebot3_gazebo/models/turtlebot3_dqn_world/obstacle_plugin/build/libobstacle2.so
diff --git a/turtlebot3_gazebo/models/turtlebot3_dqn_world/obstacle_plugin/build/libobstacles.so b/turtlebot3_gazebo/models/turtlebot3_dqn_world/obstacle_plugin/build/libobstacles.so
diff --git a/turtlebot3_gazebo/models/turtlebot3_dqn_world/obstacle_plugin/obstacle1.cc b/turtlebot3_gazebo/models/turtlebot3_dqn_world/obstacle_plugin/obstacle1.cc
@@ -24,7 +24,7 @@
 
 namespace gazebo
 {
-class Obstacle1 : public ModelPlugin
+class Obstacle1: public ModelPlugin
 {
 public:
   void Load(physics::ModelPtr _parent, sdf::ElementPtr /*_sdf*/)

diff --git a/turtlebot3_gazebo/models/turtlebot3_dqn_world/obstacle_plugin/obstacle2.cc b/turtlebot3_gazebo/models/turtlebot3_dqn_world/obstacle_plugin/obstacle2.cc
@@ -24,7 +24,7 @@
 
 namespace gazebo
 {
-class Obstacle2 : public ModelPlugin
+class Obstacle2: public ModelPlugin
 {
 public:
   void Load(physics::ModelPtr _parent, sdf::ElementPtr /*_sdf*/)

diff --git a/turtlebot3_gazebo/models/turtlebot3_dqn_world/obstacle_plugin/obstacles.cc b/turtlebot3_gazebo/models/turtlebot3_dqn_world/obstacle_plugin/obstacles.cc
@@ -26,7 +26,7 @@
 
 namespace gazebo
 {
-class Obstacles : public ModelPlugin
+class Obstacles: public ModelPlugin
 {
 public:
   void Load(physics::ModelPtr _parent, sdf::ElementPtr /*_sdf*/)

diff --git a/turtlebot3_gazebo/package.xml b/turtlebot3_gazebo/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_gazebo</name>
-  <version>2.2.1</version>
+  <version>2.2.2</version>
   <description>
     Gazebo simulation package for the TurtleBot3
   </description>

diff --git a/turtlebot3_gazebo/src/turtlebot3_drive.cpp b/turtlebot3_gazebo/src/turtlebot3_drive.cpp
@@ -45,9 +45,10 @@ Turtlebot3Drive::Turtlebot3Drive()
   scan_sub_ = this->create_subscription<sensor_msgs::msg::LaserScan>(
     "scan", \
     rclcpp::SensorDataQoS(), \
-    std::bind(&Turtlebot3Drive::scan_callback, \
-    this, \
-    std::placeholders::_1));
+    std::bind(
+      &Turtlebot3Drive::scan_callback, \
+      this, \
+      std::placeholders::_1));
   odom_sub_ = this->create_subscription<nav_msgs::msg::Odometry>(
     "odom", qos, std::bind(&Turtlebot3Drive::odom_callback, this, std::placeholders::_1));
 

diff --git a/turtlebot3_simulations/CHANGELOG.rst b/turtlebot3_simulations/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package turtlebot3_simulations
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.2.2 (2021-02-24)
+------------------
+* Remove shared objects built in older version
+* Contributors: Will Son
+
 2.2.1 (2021-01-13)
 ------------------
 * Eloquent Elusor EOL

diff --git a/turtlebot3_simulations/package.xml b/turtlebot3_simulations/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_simulations</name>
-  <version>2.2.1</version>
+  <version>2.2.2</version>
   <description>
     ROS 2 packages for TurtleBot3 simulations
   </description>