Skip to content

Commit 93b25c6

Browse files
authored
Add support for UR7e and UR12e (#86)
* Add support for UR7e and UR12e * Add ur_description to upstream workspace
1 parent 6102b21 commit 93b25c6

File tree

4 files changed

+32
-3
lines changed

4 files changed

+32
-3
lines changed

Universal_Robots_ROS2_Gazebo_Simulation.humble.repos

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,8 @@ repositories:
1919
type: git
2020
url: https://github.com/ros-controls/ros2_controllers.git
2121
version: humble
22+
23+
ur_description:
24+
type: git
25+
url: https://github.com/UniversalRobots/Universal_Robots_ROS2_Description.git
26+
version: humble

ur_simulation_gazebo/launch/ur_sim_control.launch.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,19 @@ def generate_launch_description():
196196
DeclareLaunchArgument(
197197
"ur_type",
198198
description="Type/series of used UR robot.",
199-
choices=["ur3", "ur3e", "ur5", "ur5e", "ur10", "ur10e", "ur16e", "ur20", "ur30"],
199+
choices=[
200+
"ur3",
201+
"ur3e",
202+
"ur5",
203+
"ur5e",
204+
"ur7e",
205+
"ur10",
206+
"ur12e",
207+
"ur10e",
208+
"ur16e",
209+
"ur20",
210+
"ur30",
211+
],
200212
default_value="ur5e",
201213
)
202214
)

ur_simulation_gazebo/launch/ur_sim_moveit.launch.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,19 @@ def generate_launch_description():
9898
DeclareLaunchArgument(
9999
"ur_type",
100100
description="Type/series of used UR robot.",
101-
choices=["ur3", "ur3e", "ur5", "ur5e", "ur10", "ur10e", "ur16e", "ur20", "ur30"],
101+
choices=[
102+
"ur3",
103+
"ur3e",
104+
"ur5",
105+
"ur5e",
106+
"ur7e",
107+
"ur10",
108+
"ur12e",
109+
"ur10e",
110+
"ur16e",
111+
"ur20",
112+
"ur30",
113+
],
102114
default_value="ur5e",
103115
)
104116
)

ur_simulation_gazebo/test/test_gazebo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
@pytest.mark.launch_test
7272
@launch_testing.parametrize(
7373
"ur_type",
74-
["ur3", "ur3e", "ur5", "ur5e", "ur10", "ur10e", "ur16e", "ur20", "ur30"],
74+
["ur3", "ur3e", "ur5", "ur5e", "ur7e", "ur10", "ur10e", "ur12e", "ur16e", "ur20", "ur30"],
7575
)
7676
def generate_test_description(ur_type):
7777
gazebo = IncludeLaunchDescription(

0 commit comments

Comments
 (0)