Add controller name parameter (#212)

Signed-off-by: Jakub Delicat <[email protected]> (cherry picked from commit b77f972) # Conflicts: # gz_ros2_control/src/gz_ros2_control_plugin.cpp
ros-controls · Jan 3, 2024 · bfa0305 · bfa0305
1 parent 0d72969
commit bfa0305
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/gz_ros2_control/src/gz_ros2_control_plugin.cpp b/gz_ros2_control/src/gz_ros2_control_plugin.cpp
@@ -297,6 +297,14 @@ void GazeboSimROS2ControlPlugin::Configure(
 
   // Get controller manager node name
   std::string controllerManagerNodeName{"controller_manager"};
+<<<<<<< HEAD:gz_ros2_control/src/gz_ros2_control_plugin.cpp
+=======
+
+  if (sdfPtr->HasElement("controller_manager_name")) {
+    controllerManagerNodeName = sdfPtr->GetElement("controller_manager_name")->Get<std::string>();
+  }
+
+>>>>>>> b77f972 (Add controller name parameter (#212)):ign_ros2_control/src/ign_ros2_control_plugin.cpp
   std::string ns = "/";
 
   if (sdfPtr->HasElement("ros")) {