Use Arguments in launch files and enable their reuse.

.github/workflows/ci-build-coverage.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: ros-tooling/setup-ros@0.0.26
+      - uses: ros-tooling/setup-ros@v0.2
         with:
           required-ros-distributions: foxy
       - uses: ros-tooling/action-ros-ci@v0.2
@@ -24,7 +24,8 @@ jobs:
           # build all packages listed in the meta package
           package-name:
             ros2_control_demo_hardware
-            ros2_control_demo_robot
+            ros2_control_demo_description
+            ros2_control_demo_bringup
             ros2_control_demos
           vcs-repo-file-url: |
             https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/ros2_control_demos.repos

.github/workflows/ci-build-source.yml

@@ -14,14 +14,15 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: ros-tooling/setup-ros@0.0.26
+      - uses: ros-tooling/setup-ros@v0.2
       - uses: ros-tooling/action-ros-ci@v0.2
         with:
           target-ros2-distro: foxy
           # build all packages listed in the meta package
           package-name:
             ros2_control_demo_hardware
-            ros2_control_demo_robot
+            ros2_control_demo_description
+            ros2_control_demo_bringup
             ros2_control_demos
           vcs-repo-file-url: |
             https://raw.githubusercontent.com/ros2/ros2/foxy/ros2.repos

.github/workflows/ci-ros-lint.yaml

@@ -12,14 +12,15 @@ jobs:
           linter: [copyright, cppcheck, lint_cmake]
     steps:
     - uses: actions/checkout@v1
-    - uses: ros-tooling/setup-ros@v0.1
+    - uses: ros-tooling/setup-ros@v0.2
     - uses: ros-tooling/action-ros-lint@v0.1
       with:
         distribution: foxy
         linter: ${{ matrix.linter }}
         package-name:
           ros2_control_demo_hardware
-          ros2_control_demo_robot
+          ros2_control_demo_description
+          ros2_control_demo_bringup
           ros2_control_demos
 
   ament_lint_cpplint:
@@ -31,13 +32,14 @@ jobs:
           linter: [cpplint]
     steps:
     - uses: actions/checkout@v1
-    - uses: ros-tooling/setup-ros@v0.1
+    - uses: ros-tooling/setup-ros@v0.2
     - uses: ros-tooling/action-ros-lint@v0.1
       with:
         distribution: foxy
         linter: cpplint
         arguments: "--filter=-whitespace/newline"
         package-name:
           ros2_control_demo_hardware
-          ros2_control_demo_robot
+          ros2_control_demo_description
+          ros2_control_demo_bringup
           ros2_control_demos

README.md

@@ -19,32 +19,35 @@ The repository has three goals:
 
 The repository is inspired by the [ros_control_boilerplate](https://github.com/PickNikRobotics/ros_control_boilerplate) repository from Dave Coleman.
 The simulation has three parts/packages:
-1. The first package, `ros2_control_demo_hardware`, implements the hardware interfaces described in the roadmap.
+1. The first package, `ros2_control_demo_bringup`, holds launch files and runtime configurations for demo robots.
+2. The second package, `ros2_control_demo_description`, stored URDF-description files, rviz configurations and meshes for the demo robots.
+3. The third package, `ros2_control_demo_hardware`, implements the hardware interfaces described in the roadmap.
 The examples simulate a simple *RRbot* internally to provide sufficient test and demonstration data and reduce external dependencies.
 This package does not have any dependencies except `ros2` core packages and can, therefore, be used on SoC-hardware of headless systems.
-2. The second package, `ros2_control_demo_hardware_gazebo`, uses a Gazebo simulator to simulate the *RRBot* and its physics.
-This package is useful to test the connection of `ros2_control` to the Gazebo simulator and to detect any missing plugins.
-3. The third package `ros2_control_demo_robot` holds examples for *RRbot* URDF-description, launch files and controllers.
 
 This repository demonstrates the following `ros2_control` concepts:
 
 * Creating of `*HardwareInterface` for a System, Sensor, and Actuator.
-* Creating a robot description in the form of URDF files
-* Loading the configuration and starting a robot using launch files
-* Control of two joints of *RRBot*
-* Using simulated robots and starting `ros_control` with Gazebo simulator
-* Implementing of controller switching strategy for a robot
-* Using joint limits and transmission concepts in `ros2_control`
+* Creating a robot description in the form of URDF files.
+* Loading the configuration and starting a robot using launch files.
+* Control of two joints of *RRBot*.
+* Using simulated robots and starting `ros2_control` with Gazebo simulator.
+* Implementing of controller switching strategy for a robot.
+* Using joint limits and transmission concepts in `ros2_control`.
 
 ## Quick Hints
 
 These are some quick hints, especially for those coming from a ROS1 control background:
 
-* There are now three categories of hardware interface: *Sensor*, *Actuator*, and *System*. Sensor is for individual sensors; Actuator is for individual actuators; System is for any combination of multiple sensors/actuators. You could think of a Sensor as read-only.
-* ros(1)_control only allowed three hardware interface types: position, velocity, and effort. ros2_control allows you to create any interface type by defining a custom string. For example, you might define a `position_in_degrees` or a `temperature` interface. The most common (position, velocity, acceleration, effort) are already defined as constants in hardware_interface/types/hardware_interface_type_values.hpp.
-* In ros2_control, all parameters for the driver are specified in the URDF. The ros2_control framework uses the <ros2_control> tag in the URDF.
-* <ros2_control> tags in the URDF must be compatible with the controller's configuration.
-* PLUGINLIB_EXPORT_CLASS macro is required when implementing an interface.
+* There are now three categories of hardware interface: *Sensor*, *Actuator*, and *System*.
+  *Sensor* is for individual sensors; *Actuator* is for individual actuators; *System* is for any combination of multiple sensors/actuators.
+  You could think of a Sensor as read-only.
+  All interfaces are used as plugins and therefore exported using `PLUGINLIB_EXPORT_CLASS` macro.
+* *ros(1)_control* only allowed three hardware interface types: position, velocity, and effort.
+  *ros2_control* allows you to create any interface type by defining a custom string. For example, you might define a `position_in_degrees` or a `temperature` interface. The most common (position, velocity, acceleration, effort) are already defined as constants in hardware_interface/types/hardware_interface_type_values.hpp.
+* In ros2_control, all parameters for the driver are specified in the URDF.
+  The ros2_control framework uses the **<ros2_control>** tag in the URDF.
+* Joint names in <ros2_control> tags in the URDF must be compatible with the controller's configuration.
 
 # Build from source
 ```
@@ -54,7 +57,7 @@ git clone https://github.com/ros-controls/ros2_control_demos
 ```
 
 **NOTE**: `ros2_control` and `ros2_controllers` packages are released for foxy and can be installed using package manager.
-  For daily use it is recommended to use the released version but there may always be some not-yet-released changes that are required to build the demos.
+  For daily use it is recommended to use the released version but there may always be some not-yet-released changes that are required to run the demos.
 
 * Install dependencies (maybe you need `sudo`):
   ```
@@ -71,7 +74,7 @@ git clone https://github.com/ros-controls/ros2_control_demos
 
 # Getting Started with ros2_control
 
-Each of the described example cases from the roadmap has its own launch and URDF file.
+Each of the described example cases from the [roadmap](https://github.com/ros-controls/roadmap/blob/master/design_drafts/components_architecture_and_urdf_examples.md) has its own launch and URDF file.
 
 ## Starting example robots
 
@@ -80,22 +83,22 @@ Each example is started with a single launch file which starts up the robot hard
 The `rviz2` setup can be recreated following these steps:
 
 - The robot models can be visualized using `RobotModel` display using `/robot_description` topic.
-- Or you can simply open the configuration from `rviz` folder in `ros2_control_demo_robot` package manually or directly by executing:
+- Or you can simply open the configuration from `rviz` folder in `ros2_control_demo_description` package manually or directly by executing:
   ```
-  rviz2 --display-config `ros2 pkg prefix ros2_control_demo_robot`/share/ros2_control_demo_robot/rviz/rrbot.rviz
+  rviz2 --display-config `ros2 pkg prefix ros2_control_demo_description`/share/ros2_control_demo_description/rviz/rrbot.rviz
   ```
 
 *RRBot*, or ''Revolute-Revolute Manipulator Robot'', is a simple 3-linkage, 2-joint arm that we will use to demonstrate various features. It essentially a double inverted pendulum and demonstrates some fun control concepts within a simulator and was originally introduced for Gazebo tutorials.
-The *RRbot* URDF files can be found in the `description` folder of `ros2_control_demo_robot` package.
+The *RRBot* URDF files can be found in the `urdf` folder of `ros2_control_demo_description` package.
 
-### Example 1: "Industrial Robots with only one interface"
+### General notes about examples
 
-1. Open another terminal and start the roslaunch file:
+1. To start an example open a terminal, source your ROS2-workspace and execute launch file with:
    ```
-   ros2 launch ros2_control_demo_robot rrbot_system_position_only.launch.py
+   ros2 launch ros2_control_demo_bringup <example_launch_file>
    ```
 
-2. Open another terminal and check that `RRBotSystemPositionOnlyHardware` loaded properly:
+2. To check if the hardware are controller a loaded properly, open another terminal and execute:
    ```
    ros2 control list_hardware_interfaces
    ```
@@ -105,9 +108,110 @@ The *RRbot* URDF files can be found in the `description` folder of `ros2_control
          joint1/position [unclaimed]
          joint2/position [unclaimed]
    state interfaces
-          joint1/position
-          joint2/position
+         joint1/position
+         joint2/position
+   ```
+
+3. Check which controller are running using:
+   ```
+   ros2 control list_controllers
+   ```
+   You should get something like:
    ```
+   forward_position_controller[forward_command_controller/ForwardCommandController] unconfigured
+   joint_state_broadcaster[joint_state_broadcaster/JointStateBroadcaster] active
+   ```
+
+4. Check [Controlles and moving hardware](#Controlles-and-moving-hardware) section to move *RRBot*.
+
+
+### Example 1: "Industrial Robots with only one interface"
+
+- Launch file: rrbot_system_position_only.launch.py
+- Command interfaces:
+  - joint1/position
+  - joint2/position
+- State interfaces:
+  - joint1/position
+  - joint2/position
+
+Available controllers:
+  - `joint_state_broadcaster[joint_state_broadcaster/JointStateBroadcaster]`
+  - `forward_position_controller[forward_command_controller/ForwardCommandController]` (position)
+
+Available launch-file options:
+  - `use_fake_hardware:=true` - start `FakeSystem` instead of hardware.
+    This is a simple simulation that mimics joint command to their states.
+    This is useful to test *ros2_control* integration and controllers without physical hardware.
+
+
+### Example 1: "Industrial Robots with only one interface" (Gazebo simulation)
+
+- **TBA**
+
+
+### Example 2: "Robots with multiple interfaces"
+
+- Launch file: rrbot_system_position_only.launch.py
+- Command interfaces:
+  - joint1/position
+  - joint2/position
+  - joint1/velocity
+  - joint2/velocity
+  - joint1/acceleration
+  - joint2/acceleration
+- State interfaces:
+  - joint1/position
+  - joint2/position
+  - joint1/velocity
+  - joint2/velocity
+  - joint1/acceleration
+  - joint2/acceleration
+
+Available controllers:
+  - `joint_state_broadcaster[joint_state_broadcaster/JointStateBroadcaster]`
+  - `forward_position_controller[position_controllers/JointGroupPositionController]`
+  - `forward_velocity_controller[velocity_controllers/JointGroupVelocityController]`
+  - `forward_acceleration_controller[forward_command_controller/ForwardCommandController]`
+  - `forward_illegal1_controller[forward_command_controller/ForwardCommandController]`
+  - `forward_illegal2_controller[forward_command_controller/ForwardCommandController]`
+
+Notes:
+  - The example shows how to implement multi-interface robot hardware taking care about interfaces used.
+    The two illegal controllers demonstrate how hardware interface declines faulty claims to access joint command interfaces.
+
+
+### Example 10: "Differential drive mobile robot"
+
+- Launch file: diffbot_system.launch.py
+- Command interfaces:
+  - left_wheel_joint/velocity
+  - right_wheel_joint/velocity
+- State interfaces:
+  - left_wheel_joint/position
+  - left_wheel_joint/velocity
+  - right_wheel_joint/position
+  - right_wheel_joint/velocity
+
+Available controllers:
+  - `joint_state_broadcaster[joint_state_broadcaster/JointStateBroadcaster]`
+  - `diffbot_base_controller[diff_drive_controller/DiffDriveController] active`
+
+Sending commands to diff drive controller:
+
+```
+ros2 topic pub --rate 30 /diffbot_base_controller/cmd_vel_unstamped geometry_msgs/msg/Twist "linear:
+ x: 0.7
+ y: 0.0
+ z: 0.0
+angular:
+ x: 0.0
+ y: 0.0
+ z: 1.0"
+```
+
+You should now see orange box circling in `rviz2`.
+
 
 ## Controlles and moving hardware
 To move the robot you should load and start controllers.
@@ -121,7 +225,7 @@ Check the [Results](##result) section on how to ensure that things went well.
 
 Open another terminal and load, configure and start `joint_state_controller`:
 ```
-ros2 control load_start_controller joint_state_controller
+ros2 control set_controller_state joint_state_controller start
 ```
 Check if controller is loaded properly:
 ```
@@ -137,23 +241,31 @@ Now you should also see the *RRbot* represented correctly in `rviz2`.
 
 ### Using ForwardCommandController
 
-1. If you want to test hardware with `ForwardCommandController` first load and configure it:
+1. If you want to test hardware with `ForwardCommandController` first load a controller (not always needed):
    ```
-   ros2 control load_configure_controller forward_position_controller
+   ros2 control load_controller forward_position_controller
    ```
    Check if the controller is loaded properly:
    ```
    ros2 control list_controllers
    ```
-   You should get the response:
+
+2. Then configure it:
+   ```
+   ros2 control set_controller_state forward_position_controller configure
+   ```
+   Check if the controller is loaded properly:
+   ```
+   ros2 control list_controllers
+   ```
+   You should get in the response:
    ```
-   joint_state_controller[joint_state_controller/JointStateController] active
    forward_position_controller[forward_command_controller/ForwardCommandController] inactive
    ```
 
 2. Now start the controller:
    ```
-   ros2 control switch_controllers --start-controllers forward_position_controller
+   ros2 control switch_controllers --start forward_position_controller
    ```
    Check if controllers are activated:
    ```
@@ -165,8 +277,6 @@ Now you should also see the *RRbot* represented correctly in `rviz2`.
    forward_position_controller[forward_command_controller/ForwardCommandController] active
    ```
 
-**NOTE**: You can do this in only one step by using `load_start_controller` verb instead of `load_configure_controller`.
-
 3. Send command to the controller, either:
 
    a. Manually using ros2 cli interface:
@@ -175,9 +285,9 @@ Now you should also see the *RRbot* represented correctly in `rviz2`.
    - 0.5
    - 0.5"
    ```
-   b. Or you can start demo node which sends two goals every 5 seconds in a loop:
+   B. Or you can start demo node which sends two goals every 5 seconds in a loop:
    ```
-   ros2 launch ros2_control_test_nodes rrbot_test_forward_position_controller.launch.py
+   ros2 launch ros2_control_demo_bringup test_forward_position_controller.launch.py
    ```
 
 ## Result

doc/index.rst

@@ -5,6 +5,15 @@ Demos
 
 This repository provides templates for the development of ros2_control-enabled robots and a simple simulations to demonstrate and prove ros2_control concepts.
 
+Repository organization
+^^^^^^^^^^^^^^^^^^^^^^^
+
+**Note:** the following list comprehensive.
+
+The repository is organized in the following packages:
+
+  - ``ros2_control_demo_hardware`` - implementation of example hardware interfaces,
+  - ``ros2_control_test_node`` - nodes for testing ros2_control-enabled robots and their integration in the framework.
 
 Mode switching demo
 ^^^^^^^^^^^^^^^^^^^
@@ -13,7 +22,7 @@ Start up the multi interface rrbot system:
 
 .. code-block:: bash
 
-    ros2 launch ros2_control_demo_robot rrbot_system_multi_interface.launch.py
+    ros2 launch ros2_control_demo_bringup rrbot_system_multi_interface.launch.py
 
 List the available interfaces
 

ros2_control_demo_bringup/CMakeLists.txt

@@ -0,0 +1,18 @@
+cmake_minimum_required(VERSION 3.5)
+project(ros2_control_demo_bringup)
+
+# Default to C++14
+if(NOT CMAKE_CXX_STANDARD)
+  set(CMAKE_CXX_STANDARD 14)
+endif()
+
+# find dependencies
+find_package(ament_cmake REQUIRED)
+
+## INSTALL
+install(
+  DIRECTORY config launch
+  DESTINATION share/${PROJECT_NAME}
+)
+
+ament_package()