File tree Expand file tree Collapse file tree 1 file changed +2
-8
lines changed Expand file tree Collapse file tree 1 file changed +2
-8
lines changed Original file line number Diff line number Diff line change @@ -502,7 +502,7 @@ void ControllerManager::init_controller_manager()
502502 if (!is_resource_manager_initialized ())
503503 {
504504 // fallback state
505- init_min_resource_manager ( );
505+ resource_manager_ = std::make_unique<hardware_interface::ResourceManager>(trigger_clock_, get_logger () );
506506 if (!robot_description_notification_timer_)
507507 {
508508 robot_description_notification_timer_ = create_wall_timer (
@@ -638,7 +638,7 @@ void ControllerManager::robot_description_callback(const std_msgs::msg::String &
638638 {
639639 // The RM failed to init AFTER we received the description - a critical error.
640640 // don't finalize controller manager, instead keep waiting for robot description - fallback state
641- init_min_resource_manager ( );
641+ resource_manager_ = std::make_unique<hardware_interface::ResourceManager>(trigger_clock_, get_logger () );
642642 } else
643643 {
644644 RCLCPP_INFO (
@@ -842,12 +842,6 @@ void ControllerManager::init_resource_manager(const std::string & robot_descript
842842 }
843843}
844844
845- void ControllerManager::init_min_resource_manager ()
846- {
847- resource_manager_ = std::make_unique<hardware_interface::ResourceManager>(trigger_clock_, get_logger ());
848- resource_manager_->set_on_component_state_switch_callback (
849- std::bind (&ControllerManager::publish_activity, this ));
850- }
851845
852846void ControllerManager::init_services ()
853847{
You can’t perform that action at this time.
0 commit comments