From b4d14879beb366a2ac563426254fdb572fc60592 Mon Sep 17 00:00:00 2001
From: Will Son <willson@robotis.com>
Date: Fri, 16 Apr 2021 16:04:06 +0900
Subject: [PATCH] release 2.0.2

---
 .github/workflows/ros-ci.yml     | 24 ++++++++++++------------
 launch/hlds_laser.launch.py      |  4 ++--
 launch/view_hlds_laser.launch.py |  4 ++--
 src/hlds_laser_publisher.cpp     |  4 ++--
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ros-ci.yml b/.github/workflows/ros-ci.yml
index cb5ca18..28c79b0 100644
--- a/.github/workflows/ros-ci.yml
+++ b/.github/workflows/ros-ci.yml
@@ -1,29 +1,29 @@
-name: ros2
+name: dashing-devel
 
 # Controls when the action will run. Triggers the workflow on push or pull request
 on:
   push:
-    branches: [ ros2 ]
+    branches: [ dashing-devel ]
   pull_request:
-    branches: [ ros2 ]
+    branches: [ dashing-devel ]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  ros2-ci:
+  dashing-devel-ci:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         ros_distribution:
-          # - dashing
+          - dashing
           # - foxy
           # - galactic
-          - rolling
+          # - rolling
         include:
             # Dashing Diademata (May 2019 - May 2021)
-          # - docker_image: ubuntu:bionic
-          #   ros_distribution: dashing
-          #   ros_version: 2
+          - docker_image: ubuntu:bionic
+            ros_distribution: dashing
+            ros_version: 2
             # Foxy Fitzroy (June 2020 - May 2023)
           # - docker_image: ubuntu:focal
           #   ros_distribution: foxy
@@ -33,9 +33,9 @@ jobs:
           #   ros_distribution: galactic
           #   ros_version: 2
             # Rolling
-          - docker_image: ubuntu:focal
-            ros_distribution: rolling
-            ros_version: 2
+          # - docker_image: ubuntu:focal
+          #   ros_distribution: rolling
+          #   ros_version: 2
     container:
       image: ${{ matrix.docker_image }}
     steps:
diff --git a/launch/hlds_laser.launch.py b/launch/hlds_laser.launch.py
index aa38b93..d9f97c7 100644
--- a/launch/hlds_laser.launch.py
+++ b/launch/hlds_laser.launch.py
@@ -45,8 +45,8 @@ def generate_launch_description():
 
         Node(
             package='hls_lfcd_lds_driver',
-            executable='hlds_laser_publisher',
-            name='hlds_laser_publisher',
+            node_executable='hlds_laser_publisher',
+            node_name='hlds_laser_publisher',
             parameters=[{'port': port, 'frame_id': frame_id}],
             output='screen'),
     ])
diff --git a/launch/view_hlds_laser.launch.py b/launch/view_hlds_laser.launch.py
index 85f14fb..9a49b26 100644
--- a/launch/view_hlds_laser.launch.py
+++ b/launch/view_hlds_laser.launch.py
@@ -32,8 +32,8 @@ def generate_launch_description():
     return LaunchDescription([
         Node(
             package='rviz2',
-            executable='rviz2',
-            name='rviz2',
+            node_executable='rviz2',
+            node_name='rviz2',
             arguments=['-d', rviz_config_dir],
             output='screen'),
     ])
diff --git a/src/hlds_laser_publisher.cpp b/src/hlds_laser_publisher.cpp
index cfebeba..a5970ff 100644
--- a/src/hlds_laser_publisher.cpp
+++ b/src/hlds_laser_publisher.cpp
@@ -145,8 +145,8 @@ int main(int argc, char **argv)
   std::string frame_id;
   int baud_rate;
 
-  node->declare_parameter<std::string>("port");
-  node->declare_parameter<std::string>("frame_id");
+  node->declare_parameter("port");
+  node->declare_parameter("frame_id");
 
   node->get_parameter_or<std::string>("port", port, "/dev/ttyUSB0");
   node->get_parameter_or<std::string>("frame_id", frame_id, "laser");