minor rebase corrections ros-controls#3

VX792 · VX792 · commit 1f18afad981f · 2021-09-09T20:11:51.000+02:00
diff --git a/controller_manager/src/controller_manager.cpp b/controller_manager/src/controller_manager.cpp
@@ -1253,8 +1253,15 @@ void ControllerManager::RTControllerListWrapper::wait_until_rt_not_using(
   }
 }
 
-int ControllerManager::get_update_rate() const {
+int ControllerManager::get_update_rate() const 
+{
   return update_rate_;
 }
 
+void ControllerManager::configure() {
+  if (!get_parameter("update_rate", update_rate_)) {
+      RCLCPP_WARN(get_logger(), "'update_rate' parameter not set, using default value.");
+  }
+}
+
 }  // namespace controller_manager

Original file line number	Diff line number	Diff line change
`@@ -1253,8 +1253,15 @@ void ControllerManager::RTControllerListWrapper::wait_until_rt_not_using(`
`1253`	`1253`	`}`
`1254`	`1254`	`}`
`1255`	`1255`
`1256`		`-int ControllerManager::get_update_rate() const {`
	`1256`	`+int ControllerManager::get_update_rate() const`
	`1257`	`+{`
`1257`	`1258`	`return update_rate_;`
`1258`	`1259`	`}`
`1259`	`1260`
	`1261`	`+void ControllerManager::configure() {`
	`1262`	`+ if (!get_parameter("update_rate", update_rate_)) {`
	`1263`	`+ RCLCPP_WARN(get_logger(), "'update_rate' parameter not set, using default value.");`
	`1264`	`+ }`
	`1265`	`+}`
	`1266`	`+`
`1260`	`1267`	`} // namespace controller_manager`