Skip to content
This repository has been archived by the owner on Dec 13, 2024. It is now read-only.

Make UR base config work with any UR arm #53

Merged
merged 1 commit into from
Jun 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions src/picknik_ur_base_config/config/base_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ hardware:
robot_description:
urdf:
package: "picknik_ur_base_config"
path: "description/picknik_ur5e.xacro"
path: "description/picknik_ur.xacro"
srdf:
package: "picknik_ur_base_config"
path: "config/moveit/picknik_ur5e.srdf"
path: "config/moveit/picknik_ur.srdf"
# Specify any additional parameters required for the URDF.
# Many of these are specific to the UR descriptions packages, and can be customized as needed.
# [Optional]
Expand All @@ -90,17 +90,17 @@ hardware:
# To use parameters from a different package, place them in a config/ROBOT_NAME/ directory,
# replace ROBOT_NAME with the value used for hardware.type in this file.
- kinematics_parameters_file:
# Load default_kinematics.yaml from ur_description/config/ur5e
# Load default_kinematics.yaml from ur_description/config/<ur_type>
package: "ur_description"
path: "config/ur5e/default_kinematics.yaml"
path: "config/%>> hardware.type <<%/default_kinematics.yaml"
- physical_parameters_file:
# Load physical_parameters.yaml from ur_description/config/ur5e
# Load physical_parameters.yaml from ur_description/config/<ur_type>
package: "ur_description"
path: "config/ur5e/physical_parameters.yaml"
path: "config/%>> hardware.type <<%/physical_parameters.yaml"
- visual_parameters_file:
# Load visual_parameters.yaml from ur_description/config/ur5e
# Load visual_parameters.yaml from ur_description/config/<ur_type>
package: "ur_description"
path: "config/ur5e/visual_parameters.yaml"
path: "config/%>> hardware.type <<%/visual_parameters.yaml"

# Sets ROS global params for launch.
# [Optional]
Expand Down Expand Up @@ -133,7 +133,7 @@ moveit_params:
path: "config/moveit/pick_ik_kinematics.yaml"
servo:
package: "picknik_ur_base_config"
path: "config/moveit/ur5e_servo.yaml"
path: "config/moveit/ur_servo.yaml"
sensors_3d:
package: "picknik_ur_base_config"
path: "config/moveit/sensors_3d.yaml"
Expand Down Expand Up @@ -172,7 +172,7 @@ ui_params:
ros2_control:
config:
package: "picknik_ur_base_config"
path: "config/control/picknik_ur5e.ros2_control.yaml"
path: "config/control/picknik_ur.ros2_control.yaml"
# MoveIt Studio will load and activate these controllers at start up to ensure they are available.
# If not specified, it is up to the user to ensure the appropriate controllers are active and available
# for running the application.
Expand Down Expand Up @@ -223,4 +223,4 @@ objectives:
# [Required]
waypoints_file:
package_name: "picknik_ur_base_config"
relative_path: "waypoints/ur5e_waypoints.yaml"
relative_path: "waypoints/ur_waypoints.yaml"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I worry about letting someone choose the UR model and giving them access to waypoints that were specific to a UR5e. What do you think about stripping this file back to a single pose that works on all models (like a zero pose)?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think since all the URs are approximately proportional to each other, a joint state that works for one should work for the others as well. I wouldn't block this PR on the basis of this.