Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ROS 2 add UR, Kinova, Robotiq components #44

Merged
merged 34 commits into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
43c3eb1
Fixed prefix
delihus Apr 17, 2024
74f37c2
Added launches and gz mappings
delihus Apr 19, 2024
8954f82
update launches
delihus Apr 19, 2024
5a5054a
fixed astra
delihus Apr 19, 2024
86ecacd
removed print
delihus Apr 24, 2024
557b865
Fixed unused file
delihus Apr 24, 2024
40a99e6
renamed files
delihus Apr 24, 2024
513cbb2
Added ur
delihus Apr 26, 2024
17806b9
added kinova
delihus Apr 26, 2024
136fa02
split 6dof and 7dof
delihus Apr 26, 2024
02470cb
Added rootiq
delihus May 8, 2024
8891641
Added suggestion
delihus May 8, 2024
31ddc87
simplfied urfd | removed use_gpu | removed simulation-engine
delihus May 8, 2024
acf8dd4
simplfied urfd | removed use_gpu | removed simulation-engine
delihus May 8, 2024
c7f1c71
Merge branch 'ros2-add-launch-and-remappings' into ros2-add-ur-component
delihus May 8, 2024
7c21b00
applied new changes to ur
delihus May 8, 2024
442e5ba
removed simulation-engine from s3 | fix with no namespace
delihus May 8, 2024
a38d56e
Merge branch 'ros2-add-launch-and-remappings' into ros2-add-ur-component
delihus May 8, 2024
a3d1b8c
fixed namespaced ros2_control
delihus May 9, 2024
00f50f5
Suggestions
rafal-gorecki May 9, 2024
08daf66
add
rafal-gorecki May 9, 2024
4b5081e
workflow simplify
rafal-gorecki May 9, 2024
0589e91
Merge branch 'ros2' into ros2-add-launch-and-remappings
rafal-gorecki May 9, 2024
bc117d8
added kinovas | added roboteqs | fixed namespaced JTS and GC
delihus May 10, 2024
95d148a
Removed unnecessary topic form realsense
delihus May 10, 2024
46c887f
Merge remote-tracking branch 'origin/ros2-add-launch-and-remappings' …
delihus May 10, 2024
20e6ae3
Merge pull request #45 from husarion/suggestions
delihus May 10, 2024
028610f
Made new tests
delihus May 10, 2024
c54eaf9
Merge branch 'suggestions' into ros2-add-launch-and-remappings
delihus May 10, 2024
e999c15
fixed astra
delihus May 10, 2024
ca12cba
Merge remote-tracking branch 'origin/ros2-add-launch-and-remappings' …
delihus May 10, 2024
9ffa466
applied tests
delihus May 10, 2024
636732d
Merge remote-tracking branch 'origin/ros2' into ros2-add-ur-component
delihus May 15, 2024
cc857d2
Added comment about GRP03
delihus May 15, 2024
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
20 changes: 20 additions & 0 deletions config/gz_kinova_remappings.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
- topic_name: <robot_namespace><device_namespace>/wrist_mounted_camera/camera_info
ros_type_name: sensor_msgs/msg/CameraInfo
gz_type_name: ignition.msgs.CameraInfo
lazy: true

- topic_name: <robot_namespace><device_namespace>/wrist_mounted_camera/image
ros_type_name: sensor_msgs/msg/Image
gz_type_name: ignition.msgs.Image
lazy: true

- topic_name: <robot_namespace><device_namespace>/wrist_mounted_camera/depth_image
ros_type_name: sensor_msgs/msg/Image
gz_type_name: ignition.msgs.Image
lazy: true

- ros_topic_name: <robot_namespace><device_namespace>/wrist_mounted_camera/points
ros_type_name: sensor_msgs/msg/PointCloud2
gz_type_name: ignition.msgs.PointCloudPacked
lazy: true
38 changes: 38 additions & 0 deletions config/kinova_6dof_controllers.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/**:
joint_trajectory_controller:
ros__parameters:
joints:
- joint_1
- joint_2
- joint_3
- joint_4
- joint_5
- joint_6
command_interfaces:
- position
state_interfaces:
- position
- velocity
state_publish_rate: 100.0
action_monitor_rate: 20.0
allow_partial_joints_goal: false
constraints:
stopped_velocity_tolerance: 0.0
goal_time: 0.0

twist_controller:
ros__parameters:
joint: tcp
interface_names:
- twist.linear.x
- twist.linear.y
- twist.linear.z
- twist.angular.x
- twist.angular.y
- twist.angular.z

robotiq_gripper_controller:
ros__parameters:
default: true
joint: robotiq_85_left_knuckle_joint
allow_stalling: true
39 changes: 39 additions & 0 deletions config/kinova_7dof_controllers.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/**:
joint_trajectory_controller:
ros__parameters:
joints:
- joint_1
- joint_2
- joint_3
- joint_4
- joint_5
- joint_6
- joint_7
command_interfaces:
- position
state_interfaces:
- position
- velocity
state_publish_rate: 100.0
action_monitor_rate: 20.0
allow_partial_joints_goal: false
constraints:
stopped_velocity_tolerance: 0.0
goal_time: 0.0

twist_controller:
ros__parameters:
joint: tcp
interface_names:
- twist.linear.x
- twist.linear.y
- twist.linear.z
- twist.angular.x
- twist.angular.y
- twist.angular.z

robotiq_gripper_controller:
ros__parameters:
default: true
joint: robotiq_85_left_knuckle_joint
allow_stalling: true
13 changes: 13 additions & 0 deletions config/robotiq_controllers.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/**:
robotiq_gripper_controller:
ros__parameters:
default: true
joint: robotiq_85_left_knuckle_joint
use_effort_interface: true
use_speed_interface: true

robotiq_activation_controller:
ros__parameters:
default: true
joint: robotiq_85_left_knuckle_joint

95 changes: 95 additions & 0 deletions config/ur_controllers.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
/**:
speed_scaling_state_broadcaster:
ros__parameters:
state_publish_rate: 100.0


force_torque_sensor_broadcaster:
ros__parameters:
sensor_name: tcp_fts_sensor
state_interface_names:
- force.x
- force.y
- force.z
- torque.x
- torque.y
- torque.z
frame_id: tool0
topic_name: ft_data


joint_trajectory_controller:
ros__parameters:
joints:
- shoulder_pan_joint
- shoulder_lift_joint
- elbow_joint
- wrist_1_joint
- wrist_2_joint
- wrist_3_joint
command_interfaces:
- position
state_interfaces:
- position
- velocity
state_publish_rate: 100.0
action_monitor_rate: 20.0
allow_partial_joints_goal: false
constraints:
stopped_velocity_tolerance: 0.2
goal_time: 0.0
shoulder_pan_joint: { trajectory: 0.2, goal: 0.1 }
shoulder_lift_joint: { trajectory: 0.2, goal: 0.1 }
elbow_joint: { trajectory: 0.2, goal: 0.1 }
wrist_1_joint: { trajectory: 0.2, goal: 0.1 }
wrist_2_joint: { trajectory: 0.2, goal: 0.1 }
wrist_3_joint: { trajectory: 0.2, goal: 0.1 }


scaled_joint_trajectory_controller:
ros__parameters:
joints:
- shoulder_pan_joint
- shoulder_lift_joint
- elbow_joint
- wrist_1_joint
- wrist_2_joint
- wrist_3_joint
command_interfaces:
- position
state_interfaces:
- position
- velocity
state_publish_rate: 100.0
action_monitor_rate: 20.0
allow_partial_joints_goal: false
constraints:
stopped_velocity_tolerance: 0.2
goal_time: 0.0
shoulder_pan_joint: { trajectory: 0.2, goal: 0.1 }
shoulder_lift_joint: { trajectory: 0.2, goal: 0.1 }
elbow_joint: { trajectory: 0.2, goal: 0.1 }
wrist_1_joint: { trajectory: 0.2, goal: 0.1 }
wrist_2_joint: { trajectory: 0.2, goal: 0.1 }
wrist_3_joint: { trajectory: 0.2, goal: 0.1 }

forward_velocity_controller:
ros__parameters:
joints:
- shoulder_pan_joint
- shoulder_lift_joint
- elbow_joint
- wrist_1_joint
- wrist_2_joint
- wrist_3_joint
interface_name: velocity

forward_position_controller:
ros__parameters:
joints:
- shoulder_pan_joint
- shoulder_lift_joint
- elbow_joint
- wrist_1_joint
- wrist_2_joint
- wrist_3_joint
19 changes: 15 additions & 4 deletions launch/gz_components.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,11 @@ def get_launch_description(name: str, package: str, namespace: str, component: y
device_namespace = get_value(component, "device_namespace")
robot_namespace = namespace

if len(robot_namespace) and robot_namespace[0] != "/":
robot_namespace = "/" + robot_namespace
if len(device_namespace) and device_namespace[0] != "/":
device_namespace = "/" + device_namespace
if not name.find("ur3") and not name.find("kinova"):
if len(robot_namespace) and robot_namespace[0] != "/":
robot_namespace = "/" + robot_namespace
if len(device_namespace) and device_namespace[0] != "/":
device_namespace = "/" + device_namespace

return IncludeLaunchDescription(
PythonLaunchDescriptionSource([package, "/launch/gz_", name, ".launch.py"]),
Expand All @@ -67,6 +68,16 @@ def get_launch_descriptions_from_yaml_node(
"LDR13": "ouster_os",
"LDR20": "velodyne",
"CAM01": "orbbec_astra",
"MAN01": "ur",
"MAN02": "ur",
# "MAN03": "kinova_lite" sim_isaac error
"MAN04": "kinova_6dof",
"MAN05": "kinova_6dof",
"MAN06": "kinova_7dof",
"MAN07": "kinova_7dof",
"GRP02": "robotiq",
# "GRP03": "robotiq", Waiting for release
# https://github.com/PickNikRobotics/ros2_robotiq_gripper/blob/main/robotiq_description/urdf/robotiq_2f_85_macro.urdf.xacro
}

for component in node["components"]:
Expand Down
Loading
Loading