Skip to content

Commit f5d9c81

Browse files
nibanovicVitezGabriela
authored andcommitted
use intantiation instead of init_min_resource_manager()
1 parent 1818d24 commit f5d9c81

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

controller_manager/include/controller_manager/controller_manager.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@ class ControllerManager : public rclcpp::Node
9494

9595
void init_resource_manager(const std::string & robot_description);
9696

97-
void init_min_resource_manager();
98-
9997
controller_interface::ControllerInterfaceBaseSharedPtr load_controller(
10098
const std::string & controller_name, const std::string & controller_type);
10199

controller_manager/src/controller_manager.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ void ControllerManager::init_controller_manager()
549549
if (!is_resource_manager_initialized())
550550
{
551551
// fallback state
552-
init_min_resource_manager();
552+
resource_manager_ = std::make_unique<hardware_interface::ResourceManager>(trigger_clock_, get_logger());
553553
if (!robot_description_notification_timer_)
554554
{
555555
robot_description_notification_timer_ = create_wall_timer(
@@ -685,7 +685,7 @@ void ControllerManager::robot_description_callback(const std_msgs::msg::String &
685685
{
686686
// The RM failed to init AFTER we received the description - a critical error.
687687
// don't finalize controller manager, instead keep waiting for robot description - fallback state
688-
init_min_resource_manager();
688+
resource_manager_ = std::make_unique<hardware_interface::ResourceManager>(trigger_clock_, get_logger());
689689
} else
690690
{
691691
RCLCPP_INFO(
@@ -890,12 +890,6 @@ void ControllerManager::init_resource_manager(const std::string & robot_descript
890890
}
891891
}
892892

893-
void ControllerManager::init_min_resource_manager()
894-
{
895-
resource_manager_ = std::make_unique<hardware_interface::ResourceManager>(trigger_clock_, get_logger());
896-
resource_manager_->set_on_component_state_switch_callback(
897-
std::bind(&ControllerManager::publish_activity, this));
898-
}
899893

900894
void ControllerManager::init_services()
901895
{

0 commit comments

Comments
 (0)