Skip to content

Commit 9dc25fb

Browse files
authored
Add support for UR15 (#97)
1 parent 790126b commit 9dc25fb

File tree

5 files changed

+18
-3
lines changed

5 files changed

+18
-3
lines changed

ur_simulation_gz/launch/ur_sim_control.launch.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ def generate_launch_description():
210210
"ur10e",
211211
"ur12e",
212212
"ur16e",
213+
"ur15",
213214
"ur20",
214215
"ur30",
215216
],

ur_simulation_gz/launch/ur_sim_moveit.launch.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ def generate_launch_description():
9393
"ur10e",
9494
"ur12e",
9595
"ur16e",
96+
"ur15",
9697
"ur20",
9798
"ur30",
9899
],

ur_simulation_gz/test/test_description.py

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,20 @@
3939

4040
@pytest.mark.parametrize(
4141
"ur_type",
42-
["ur3", "ur3e", "ur5", "ur5e", "ur7e", "ur10", "ur10e", "ur12e", "ur16e", "ur20", "ur30"],
42+
[
43+
"ur3",
44+
"ur3e",
45+
"ur5",
46+
"ur5e",
47+
"ur7e",
48+
"ur10",
49+
"ur10e",
50+
"ur12e",
51+
"ur16e",
52+
"ur15",
53+
"ur20",
54+
"ur30",
55+
],
4356
)
4457
@pytest.mark.parametrize("prefix", ["", "my_ur_"])
4558
def test_ur_urdf_xacro(ur_type, prefix):

ur_simulation_gz/test/test_gz.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
# might change, once the gz launch system migration is done using gzserver and such....
7575
# @launch_testing.parametrize(
7676
# "ur_type",
77-
# ["ur3", "ur3e", "ur5", "ur5e", "ur7e", "ur10", "ur10e", "ur12e", "ur16e", "ur20", "ur30"],
77+
# ["ur3", "ur3e", "ur5", "ur5e", "ur7e", "ur10", "ur10e", "ur12e", "ur16e", "ur15", "ur20", "ur30"],
7878
# )
7979
@pytest.mark.launch_test
8080
def generate_test_description():

ur_simulation_gz/urdf/ur_gz.urdf.xacro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<xacro:include filename="$(find ur_simulation_gz)/urdf/ur_gz.ros2_control.xacro" />
99

10-
<!-- possible 'ur_type' values: ur3, ur3e, ur5, ur5e, ur7e, ur10, ur10e, ur12e, ur16e, ur20, ur30 -->
10+
<!-- possible 'ur_type' values: ur3, ur3e, ur5, ur5e, ur7e, ur10, ur10e, ur12e, ur16e, ur15, ur20, ur30 -->
1111
<!-- the default value should raise an error in case this was called without defining the type -->
1212
<xacro:arg name="ur_type" default="ur5x"/>
1313

0 commit comments

Comments
 (0)