Reorder model listings by generation, payload

The list of supported robot models has been growing over time. This commit
sorts them by generation (CB3, e-Series and UR series) and each generation
by payload.

Author: urfeex

ur_simulation_gz/launch/ur_sim_control.launch.py

@@ -202,15 +202,15 @@ def generate_launch_description():
             description="Type/series of used UR robot.",
             choices=[
                 "ur3",
-                "ur3e",
                 "ur5",
+                "ur10",
+                "ur3e",
                 "ur5e",
                 "ur7e",
-                "ur8long",
-                "ur10",
                 "ur10e",
                 "ur12e",
                 "ur16e",
+                "ur8long",
                 "ur15",
                 "ur20",
                 "ur30",

ur_simulation_gz/launch/ur_sim_moveit.launch.py

@@ -85,15 +85,15 @@ def generate_launch_description():
             description="Type/series of used UR robot.",
             choices=[
                 "ur3",
-                "ur3e",
                 "ur5",
+                "ur10",
+                "ur3e",
                 "ur5e",
                 "ur7e",
-                "ur8long",
-                "ur10",
                 "ur10e",
                 "ur12e",
                 "ur16e",
+                "ur8long",
                 "ur15",
                 "ur20",
                 "ur30",

ur_simulation_gz/test/test_description.py

@@ -41,15 +41,15 @@
     "ur_type",
     [
         "ur3",
-        "ur3e",
         "ur5",
+        "ur10",
+        "ur3e",
         "ur5e",
         "ur7e",
-        "ur8long",
-        "ur10",
         "ur10e",
         "ur12e",
         "ur16e",
+        "ur8long",
         "ur15",
         "ur20",
         "ur30",

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", "ur8long", "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():

ur_simulation_gz/urdf/ur_gz.urdf.xacro

@@ -7,7 +7,7 @@
 
   <xacro:include filename="$(find ur_simulation_gz)/urdf/ur_gz.ros2_control.xacro" />
 
-  <!-- possible 'ur_type' values: ur3, ur3e, ur5, ur5e, ur7e, ur8long, ur10, ur10e, ur12e, ur16e, ur15, ur20, ur30 -->
+  <!-- possible 'ur_type' values: ur3, ur5, ur10, ur3e, ur5e, ur7e, ur10e, ur12e, ur16e, ur8long, ur15, ur20, ur30 -->
   <!-- the default value should raise an error in case this was called without defining the type -->
   <xacro:arg name="ur_type" default="ur5x"/>