From 1e2a5dd86568c378aa587f7c2337d6de466a81d7 Mon Sep 17 00:00:00 2001 From: Shinnosuke Hirakawa Date: Mon, 14 Mar 2022 12:47:42 +0900 Subject: [PATCH 1/3] fix(ad_service_state_monitor): fix callback group Signed-off-by: Shinnosuke Hirakawa --- .../ad_service_state_monitor_node.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/ad_service_state_monitor/src/ad_service_state_monitor_node/ad_service_state_monitor_node.cpp b/system/ad_service_state_monitor/src/ad_service_state_monitor_node/ad_service_state_monitor_node.cpp index 3fd02bfa8a682..931c9c256f348 100644 --- a/system/ad_service_state_monitor/src/ad_service_state_monitor_node/ad_service_state_monitor_node.cpp +++ b/system/ad_service_state_monitor/src/ad_service_state_monitor_node/ad_service_state_monitor_node.cpp @@ -462,5 +462,5 @@ AutowareStateMonitorNode::AutowareStateMonitorNode() // Timer const auto period_ns = rclcpp::Rate(update_rate_).period(); timer_ = rclcpp::create_timer( - this, get_clock(), period_ns, std::bind(&AutowareStateMonitorNode::onTimer, this)); + this, get_clock(), period_ns, std::bind(&AutowareStateMonitorNode::onTimer, this), callback_group_subscribers_); } From 425c606fd350f2b61d79c8de7e4518581fe7e07b Mon Sep 17 00:00:00 2001 From: Shinnosuke Hirakawa Date: Mon, 14 Mar 2022 13:13:20 +0900 Subject: [PATCH 2/3] fix(external_cmd_selector): fix callback grouop Signed-off-by: Shinnosuke Hirakawa --- .../src/external_cmd_selector/external_cmd_selector_node.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/control/external_cmd_selector/src/external_cmd_selector/external_cmd_selector_node.cpp b/control/external_cmd_selector/src/external_cmd_selector/external_cmd_selector_node.cpp index 69e41f11e628e..2844954bfe173 100644 --- a/control/external_cmd_selector/src/external_cmd_selector/external_cmd_selector_node.cpp +++ b/control/external_cmd_selector/src/external_cmd_selector/external_cmd_selector_node.cpp @@ -103,7 +103,7 @@ ExternalCmdSelector::ExternalCmdSelector(const rclcpp::NodeOptions & node_option // Timer const auto period_ns = rclcpp::Rate(update_rate).period(); timer_ = rclcpp::create_timer( - this, get_clock(), period_ns, std::bind(&ExternalCmdSelector::onTimer, this)); + this, get_clock(), period_ns, std::bind(&ExternalCmdSelector::onTimer, this), callback_group_subscribers_); } void ExternalCmdSelector::onLocalControlCmd(const ExternalControlCommand::ConstSharedPtr msg) From 5ab16080e38e0b4b875e8e9a7c5f89ea7013f904 Mon Sep 17 00:00:00 2001 From: Shinnosuke Hirakawa Date: Mon, 14 Mar 2022 13:29:53 +0900 Subject: [PATCH 3/3] chore: clang-format Signed-off-by: Shinnosuke Hirakawa --- .../src/external_cmd_selector/external_cmd_selector_node.cpp | 3 ++- .../ad_service_state_monitor_node.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/control/external_cmd_selector/src/external_cmd_selector/external_cmd_selector_node.cpp b/control/external_cmd_selector/src/external_cmd_selector/external_cmd_selector_node.cpp index 2844954bfe173..a93f1b4dc6559 100644 --- a/control/external_cmd_selector/src/external_cmd_selector/external_cmd_selector_node.cpp +++ b/control/external_cmd_selector/src/external_cmd_selector/external_cmd_selector_node.cpp @@ -103,7 +103,8 @@ ExternalCmdSelector::ExternalCmdSelector(const rclcpp::NodeOptions & node_option // Timer const auto period_ns = rclcpp::Rate(update_rate).period(); timer_ = rclcpp::create_timer( - this, get_clock(), period_ns, std::bind(&ExternalCmdSelector::onTimer, this), callback_group_subscribers_); + this, get_clock(), period_ns, std::bind(&ExternalCmdSelector::onTimer, this), + callback_group_subscribers_); } void ExternalCmdSelector::onLocalControlCmd(const ExternalControlCommand::ConstSharedPtr msg) diff --git a/system/ad_service_state_monitor/src/ad_service_state_monitor_node/ad_service_state_monitor_node.cpp b/system/ad_service_state_monitor/src/ad_service_state_monitor_node/ad_service_state_monitor_node.cpp index 931c9c256f348..cbfb469a72fa2 100644 --- a/system/ad_service_state_monitor/src/ad_service_state_monitor_node/ad_service_state_monitor_node.cpp +++ b/system/ad_service_state_monitor/src/ad_service_state_monitor_node/ad_service_state_monitor_node.cpp @@ -462,5 +462,6 @@ AutowareStateMonitorNode::AutowareStateMonitorNode() // Timer const auto period_ns = rclcpp::Rate(update_rate_).period(); timer_ = rclcpp::create_timer( - this, get_clock(), period_ns, std::bind(&AutowareStateMonitorNode::onTimer, this), callback_group_subscribers_); + this, get_clock(), period_ns, std::bind(&AutowareStateMonitorNode::onTimer, this), + callback_group_subscribers_); }