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

README.md

@@ -124,7 +124,7 @@ For getting started, you'll basically need three steps:
    details.
 
    ```bash
-   # Replace ur5e with one of ur3, ur3e, ur5, ur5e, ur7e, ur8long, ur10, ur10e, ur12e, ur16e, ur15, ur20, ur30
+   # Replace ur5e with one of ur3, ur5, ur10, ur3e, ur5e, ur7e, ur10e, ur12e, ur16e, ur8long, ur15, ur20, ur30
    # Replace the IP address with the IP address of your actual robot / URSim
    ros2 launch ur_robot_driver ur_control.launch.py ur_type:=ur5e robot_ip:=192.168.56.101
    ```

ur_bringup/launch/ur_control.launch.py

@@ -52,15 +52,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_moveit_config/launch/ur_moveit.launch.py

@@ -285,15 +285,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_robot_driver/doc/usage/startup.rst

@@ -22,8 +22,8 @@ nodes for UR robots. The only required arguments are the ``ur_type`` and ``robot
 
    $ ros2 launch ur_robot_driver ur_control.launch.py ur_type:=ur5e robot_ip:=192.168.56.101
 
-Allowed ``ur_type`` strings: ``ur3``, ``ur3e``, ``ur5``, ``ur5e``, ``ur7e``, ``ur8long``, ``ur10``, ``ur10e``,
-``ur12e``, ``ur16e``, ``ur15``, ``ur20``, ``ur30``.
+Allowed ``ur_type`` strings: ``ur3``, ``ur5``, ``ur10``, ``ur3e``, ``ur5e``, ``ur7e``, ``ur10e``,
+``ur12e``, ``ur16e``, ``ur8long``, ``ur15``, ``ur20``, ``ur30``.
 
 Other important arguments are:
 

ur_robot_driver/launch/ur_control.launch.py

@@ -400,15 +400,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_robot_driver/test/test_common.py

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