diff --git a/nav2_behavior_tree/include/nav2_behavior_tree/bt_action_node.hpp b/nav2_behavior_tree/include/nav2_behavior_tree/bt_action_node.hpp index 7276ef79ad2..b0a1efbb043 100644 --- a/nav2_behavior_tree/include/nav2_behavior_tree/bt_action_node.hpp +++ b/nav2_behavior_tree/include/nav2_behavior_tree/bt_action_node.hpp @@ -58,9 +58,8 @@ class BtActionNode : public BT::ActionNodeBase // Get the required items from the blackboard auto bt_loop_duration = config().blackboard->template get("bt_loop_duration"); - server_timeout_ = - config().blackboard->template get("server_timeout"); - getInput("server_timeout", server_timeout_); + server_timeout_ = BT::getInputPortOrBlackboard( + "server_timeout", config().blackboard->template get("server_timeout"), config().blackboard); wait_for_service_timeout_ = config().blackboard->template get("wait_for_service_timeout"); diff --git a/nav2_behavior_tree/include/nav2_behavior_tree/bt_cancel_action_node.hpp b/nav2_behavior_tree/include/nav2_behavior_tree/bt_cancel_action_node.hpp index b6458d881a9..a6538e1ac66 100644 --- a/nav2_behavior_tree/include/nav2_behavior_tree/bt_cancel_action_node.hpp +++ b/nav2_behavior_tree/include/nav2_behavior_tree/bt_cancel_action_node.hpp @@ -56,9 +56,8 @@ class BtCancelActionNode : public BT::ActionNodeBase callback_group_executor_.add_callback_group(callback_group_, node_->get_node_base_interface()); // Get the required items from the blackboard - server_timeout_ = - config().blackboard->template get("server_timeout"); - getInput("server_timeout", server_timeout_); + server_timeout_ = BT::getInputPortOrBlackboard( + "server_timeout", config().blackboard->template get("server_timeout"), config().blackboard); wait_for_service_timeout_ = config().blackboard->template get("wait_for_service_timeout"); diff --git a/nav2_behavior_tree/include/nav2_behavior_tree/bt_service_node.hpp b/nav2_behavior_tree/include/nav2_behavior_tree/bt_service_node.hpp index 6608eee67a0..88b4bfdca50 100644 --- a/nav2_behavior_tree/include/nav2_behavior_tree/bt_service_node.hpp +++ b/nav2_behavior_tree/include/nav2_behavior_tree/bt_service_node.hpp @@ -59,9 +59,8 @@ class BtServiceNode : public BT::ActionNodeBase // Get the required items from the blackboard auto bt_loop_duration = config().blackboard->template get("bt_loop_duration"); - server_timeout_ = - config().blackboard->template get("server_timeout"); - getInput("server_timeout", server_timeout_); + server_timeout_ = BT::getInputPortOrBlackboard( + "server_timeout", config().blackboard->template get("server_timeout"), config().blackboard); wait_for_service_timeout_ = config().blackboard->template get("wait_for_service_timeout");