Skip to content

Commit a24cdfd

Browse files
authored
clean up default controller names (Kinovarobotics#145)
* clean up default controller names * update default robot_position_controller name
1 parent 680a22a commit a24cdfd

File tree

5 files changed

+13
-7
lines changed

5 files changed

+13
-7
lines changed

kortex_bringup/launch/kortex_control.launch.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515
# Authors: Marq Rasmussen, Denis Stogl
1616

1717
from launch import LaunchDescription
18-
from launch.actions import DeclareLaunchArgument, RegisterEventHandler, OpaqueFunction
18+
from launch.actions import (
19+
DeclareLaunchArgument,
20+
OpaqueFunction,
21+
RegisterEventHandler,
22+
)
1923
from launch.event_handlers import OnProcessExit
2024
from launch.conditions import IfCondition
2125
from launch.substitutions import (
@@ -314,7 +318,7 @@ def generate_launch_description():
314318
declared_arguments.append(
315319
DeclareLaunchArgument(
316320
"robot_pos_controller",
317-
default_value="streaming_controller",
321+
default_value="twist_controller",
318322
description="Robot controller to start.",
319323
)
320324
)

kortex_bringup/launch/kortex_sim_control.launch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ def generate_launch_description():
361361
declared_arguments.append(
362362
DeclareLaunchArgument(
363363
"robot_pos_controller",
364-
default_value="streaming_controller",
364+
default_value="twist_controller",
365365
description="Robot controller to start.",
366366
)
367367
)

kortex_description/arms/gen3/6dof/config/ros2_controllers.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ controller_manager:
88
joint_trajectory_controller:
99
type: joint_trajectory_controller/JointTrajectoryController
1010

11-
streaming_controller:
11+
twist_controller:
1212
type: picknik_twist_controller/PicknikTwistController
1313

1414
robotiq_gripper_controller:
@@ -39,7 +39,7 @@ joint_trajectory_controller:
3939
stopped_velocity_tolerance: 0.0
4040
goal_time: 0.0
4141

42-
streaming_controller:
42+
twist_controller:
4343
ros__parameters:
4444
joint: tcp
4545
interface_names:

kortex_description/arms/gen3/7dof/config/ros2_controllers.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ controller_manager:
88
joint_trajectory_controller:
99
type: joint_trajectory_controller/JointTrajectoryController
1010

11-
streaming_controller:
11+
twist_controller:
1212
type: picknik_twist_controller/PicknikTwistController
1313

1414
robotiq_gripper_controller:
@@ -40,7 +40,7 @@ joint_trajectory_controller:
4040
stopped_velocity_tolerance: 0.0
4141
goal_time: 0.0
4242

43-
streaming_controller:
43+
twist_controller:
4444
ros__parameters:
4545
joint: tcp
4646
interface_names:

kortex_description/package.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ for Kortex arms and supported grippers</p>
1919
<exec_depend>joint_state_publisher</exec_depend>
2020
<exec_depend>robot_state_publisher</exec_depend>
2121
<exec_depend>robotiq_description</exec_depend>
22+
<exec_depend>picknik_reset_fault_controller</exec_depend>
23+
<exec_depend>picknik_twist_controller</exec_depend>
2224
<exec_depend>rviz2</exec_depend>
2325

2426
<export>

0 commit comments

Comments
 (0)