Update ros2_control_node.cpp

christophfroehlich · web-flow · commit 2e03f9378b6e · 2025-11-14T22:23:28.000+01:00
diff --git a/controller_manager/src/ros2_control_node.cpp b/controller_manager/src/ros2_control_node.cpp
@@ -67,13 +67,6 @@ int main(int argc, char ** argv)
     }
   }
 
-<<<<<<< HEAD
-=======
-  // wait for the clock to be available
-  cm->get_clock()->wait_until_started();
-  cm->get_clock()->sleep_for(rclcpp::Duration::from_seconds(1.0 / cm->get_update_rate()));
-
->>>>>>> 94e610a (Fix the CPU affinity of the ros2_control_node (#2509))
   RCLCPP_INFO(cm->get_logger(), "update rate is %d Hz", cm->get_update_rate());
   const int thread_priority = cm->get_parameter_or<int>("thread_priority", kSchedPriority);
   RCLCPP_INFO(

Original file line number	Diff line number	Diff line change
`@@ -67,13 +67,6 @@ int main(int argc, char ** argv)`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
`70`		`-<<<<<<< HEAD`
`71`		`-=======`
`72`		`- // wait for the clock to be available`
`73`		`- cm->get_clock()->wait_until_started();`
`74`		`- cm->get_clock()->sleep_for(rclcpp::Duration::from_seconds(1.0 / cm->get_update_rate()));`
`75`		`-`
`76`		`->>>>>>> 94e610a (Fix the CPU affinity of the ros2_control_node (#2509))`
`77`	`70`	`RCLCPP_INFO(cm->get_logger(), "update rate is %d Hz", cm->get_update_rate());`
`78`	`71`	`const int thread_priority = cm->get_parameter_or<int>("thread_priority", kSchedPriority);`
`79`	`72`	`RCLCPP_INFO(`