diff --git a/ur_simulation_gz/launch/ur_sim_control.launch.py b/ur_simulation_gz/launch/ur_sim_control.launch.py index d1e9632..4bd5bef 100644 --- a/ur_simulation_gz/launch/ur_sim_control.launch.py +++ b/ur_simulation_gz/launch/ur_sim_control.launch.py @@ -202,14 +202,15 @@ def generate_launch_description(): description="Type/series of used UR robot.", choices=[ "ur3", - "ur3e", "ur5", + "ur10", + "ur3e", "ur5e", "ur7e", - "ur10", "ur10e", "ur12e", "ur16e", + "ur8long", "ur15", "ur20", "ur30", diff --git a/ur_simulation_gz/launch/ur_sim_moveit.launch.py b/ur_simulation_gz/launch/ur_sim_moveit.launch.py index 26528e2..d73e8bf 100644 --- a/ur_simulation_gz/launch/ur_sim_moveit.launch.py +++ b/ur_simulation_gz/launch/ur_sim_moveit.launch.py @@ -85,14 +85,15 @@ def generate_launch_description(): description="Type/series of used UR robot.", choices=[ "ur3", - "ur3e", "ur5", + "ur10", + "ur3e", "ur5e", "ur7e", - "ur10", "ur10e", "ur12e", "ur16e", + "ur8long", "ur15", "ur20", "ur30", diff --git a/ur_simulation_gz/test/test_description.py b/ur_simulation_gz/test/test_description.py index eeab24b..cc8c5e5 100644 --- a/ur_simulation_gz/test/test_description.py +++ b/ur_simulation_gz/test/test_description.py @@ -41,14 +41,15 @@ "ur_type", [ "ur3", - "ur3e", "ur5", + "ur10", + "ur3e", "ur5e", "ur7e", - "ur10", "ur10e", "ur12e", "ur16e", + "ur8long", "ur15", "ur20", "ur30", diff --git a/ur_simulation_gz/test/test_gz.py b/ur_simulation_gz/test/test_gz.py index fbdf4f0..cff3570 100644 --- a/ur_simulation_gz/test/test_gz.py +++ b/ur_simulation_gz/test/test_gz.py @@ -74,7 +74,7 @@ # might change, once the gz launch system migration is done using gzserver and such.... # @launch_testing.parametrize( # "ur_type", -# ["ur3", "ur3e", "ur5", "ur5e", "ur7e", "ur10", "ur10e", "ur12e", "ur16e", "ur15", "ur20", "ur30"], +# ["ur3", "ur5", "ur10", "ur3e", "ur5e", "ur7e", "ur10e", "ur12e", "ur16e", "ur8long", "ur15", "ur20", "ur30"], # ) @pytest.mark.launch_test def generate_test_description(): diff --git a/ur_simulation_gz/urdf/ur_gz.urdf.xacro b/ur_simulation_gz/urdf/ur_gz.urdf.xacro index e7a6087..c0096b0 100644 --- a/ur_simulation_gz/urdf/ur_gz.urdf.xacro +++ b/ur_simulation_gz/urdf/ur_gz.urdf.xacro @@ -7,7 +7,7 @@ - +