Skip to content

Commit e119ee1

Browse files
Felix ExnerVinDp
authored andcommitted
Always use ros2_control node from controller_manager package
Since that also has realtime scheuling built-in we no longer need our own.
1 parent 2048d14 commit e119ee1

File tree

3 files changed

+0
-125
lines changed

3 files changed

+0
-125
lines changed

ur_robot_driver/CMakeLists.txt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,6 @@ add_executable(dashboard_client
8484
target_link_libraries(dashboard_client ${catkin_LIBRARIES} ur_client_library::urcl)
8585
ament_target_dependencies(dashboard_client ${${PROJECT_NAME}_EXPORTED_TARGETS} ${THIS_PACKAGE_INCLUDE_DEPENDS})
8686

87-
#
88-
# ur_ros2_control_node
89-
#
90-
add_executable(ur_ros2_control_node
91-
src/ur_ros2_control_node.cpp
92-
)
93-
ament_target_dependencies(ur_ros2_control_node
94-
controller_manager
95-
rclcpp
96-
)
97-
9887
#
9988
# controller_stopper_node
10089
#

ur_robot_driver/launch/ur_control.launch.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -247,19 +247,6 @@ def launch_setup(context, *args, **kwargs):
247247
ParameterFile(initial_joint_controllers, allow_substs=True),
248248
],
249249
output="screen",
250-
condition=IfCondition(use_mock_hardware),
251-
)
252-
253-
ur_control_node = Node(
254-
package="ur_robot_driver",
255-
executable="ur_ros2_control_node",
256-
parameters=[
257-
robot_description,
258-
update_rate_config_file,
259-
ParameterFile(initial_joint_controllers, allow_substs=True),
260-
],
261-
output="screen",
262-
condition=UnlessCondition(use_mock_hardware),
263250
)
264251

265252
dashboard_client_node = Node(
@@ -389,7 +376,6 @@ def controller_spawner(controllers, active=True):
389376

390377
nodes_to_start = [
391378
control_node,
392-
ur_control_node,
393379
dashboard_client_node,
394380
tool_communication_node,
395381
controller_stopper_node,

ur_robot_driver/src/ur_ros2_control_node.cpp

Lines changed: 0 additions & 100 deletions
This file was deleted.

0 commit comments

Comments
 (0)