Skip to content

Commit

Permalink
fix config files
Browse files Browse the repository at this point in the history
  • Loading branch information
Aron Svastits committed Nov 13, 2023
1 parent 4b15071 commit ed5e62d
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 7 deletions.
6 changes: 3 additions & 3 deletions kuka_kss_rsi_driver/launch/startup.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ def launch_setup(context, *args, **kwargs):
use_fake_hardware = LaunchConfiguration('use_fake_hardware')

# TODO(Svastits):better way to handle supported robot models and families
if robot_model.perform(context) in ["kr6_r700-sixx", "kr6_r900-sixx"]:
if robot_model.perform(context) in ["kr6_r700_sixx", "kr6_r900_sixx"]:
robot_family = "agilus"
elif robot_model.perform(context) in ["kr16_r2010-2"]:
elif robot_model.perform(context) in ["kr16_r2010_2"]:
robot_family = "cybertech"
else:
print("[ERROR] [launch]: robot model not recognized")
Expand Down Expand Up @@ -112,7 +112,7 @@ def generate_launch_description():
launch_arguments = []
launch_arguments.append(DeclareLaunchArgument(
'robot_model',
default_value='kr6_r700-sixx'
default_value='kr6_r700_sixx'
))
launch_arguments.append(DeclareLaunchArgument(
'use_fake_hardware',
Expand Down
2 changes: 1 addition & 1 deletion kuka_kss_rsi_driver/src/robot_manager_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ RobotManagerNode::RobotManagerNode()
is_configured_qos);

this->registerStaticParameter<std::string>(
"robot_model", "kr6_r700-sixx",
"robot_model", "kr6_r700_sixx",
kuka_drivers_core::ParameterSetAccessRights{true, false,
false, false, false}, [this](const std::string & robot_model) {
return this->onRobotModelChangeRequest(robot_model);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
joint_impedance_controller:
joint_trajectory_controller:
ros__parameters:
joints:
- joint_a1
Expand All @@ -7,3 +7,10 @@ joint_impedance_controller:
- joint_a4
- joint_a5
- joint_a6

command_interfaces:
- position
state_interfaces:
- position
state_publish_rate: 100.0
action_monitor_rate: 20.0
4 changes: 2 additions & 2 deletions kuka_sunrise_fri_driver/config/ros2_controller_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ controller_manager:
type: joint_state_broadcaster/JointStateBroadcaster

fri_configuration_controller:
type: fri_configuration_controller/FRIConfigurationController
type: kuka_controllers/FRIConfigurationController

fri_state_broadcaster:
type: fri_state_broadcaster/FRIStateBroadcaster
type: kuka_controllers/FRIStateBroadcaster

configure_components_on_start: [""]

0 comments on commit ed5e62d

Please sign in to comment.