Merge branch 'master' into use_generic_steering_state_msg

ros-controls · Jan 7, 2024 · fd71b75 · fd71b75
2 parents d816abb + 30eb4b0
commit fd71b75
Show file tree

Hide file tree

Showing 127 changed files with 3,977 additions and 1,032 deletions.
diff --git a/.github/ISSUE_TEMPLATE/good-first-issue.md b/.github/ISSUE_TEMPLATE/good-first-issue.md
@@ -55,6 +55,6 @@ Don’t hesitate to ask questions or to get help if you feel like you are gettin
 Furthermore, you find helpful resources here:
 * [ROS2 Control Contribution Guide](https://control.ros.org/master/doc/contributing/contributing.html)
 * [ROS2 Tutorials](https://docs.ros.org/en/rolling/Tutorials.html)
-* [ROS Answers](https://answers.ros.org/questions/)
+* [Robotics Stack Exchange](https://robotics.stackexchange.com)
 
 **Good luck with your first issue!**
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -11,3 +11,17 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "github-actions"
+    # Workflow files stored in the
+    # default location of `.github/workflows`
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "humble"
+  - package-ecosystem: "github-actions"
+    # Workflow files stored in the
+    # default location of `.github/workflows`
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "iron"
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -8,7 +8,6 @@ pull_request_rules:
         branches:
           - humble
 
-
   - name: Backport to iron at reviewers discretion
     conditions:
       - base=master
@@ -21,7 +20,31 @@ pull_request_rules:
   - name: Ask to resolve conflict
     conditions:
       - conflict
-      - author!=mergify
+      - author!=mergify[bot]
+      - author!=dependabot[bot]
     actions:
         comment:
           message: This pull request is in conflict. Could you fix it @{{author}}?
+
+  - name: Ask to resolve conflict for backports
+    conditions:
+      - conflict
+      - author=mergify[bot]
+    actions:
+        comment:
+          message: This pull request is in conflict. Could you fix it @bmagyar @dstogl @christophfroehlich?
+
+  - name: development targets master branch
+    conditions:
+      - base!=master
+      - author!=bmagyar
+      - author!=dstogl
+      - author!=christophfroehlich
+      - author!=mergify[bot]
+      - author!=dependabot[bot]
+    actions:
+        comment:
+          message: |
+            @{{author}}, all pull requests must be targeted towards the `master` development branch.
+            Once merged into `master`, it is possible to backport to @{{base}}, but it must be in `master`
+            to have these changes reflected into new distributions.
diff --git a/.github/reviewer-lottery.yml b/.github/reviewer-lottery.yml
@@ -13,28 +13,21 @@ groups:
   - name: reviewers
     reviewers: 5
     usernames:
-      - rosterloh
-      - progtologist
+      - aprotyas
       - arne48
+      - bijoua29
       - christophfroehlich
       - DasRoteSkelett
-      - sgmurray
-      - harderthan
-      - jaron-l
-      - malapatiravi
+      - duringhof
       - erickisos
-      - sachinkum0009
-      - qiayuanliao
-      - homalozoa
-      - anfemosa
-      - jackcenter
-      - VX792
-      - mhubii
+      - fmauch
+      - jaron-l
       - livanov93
-      - aprotyas
+      - mcbed
+      - moriarty
+      - olivier-stasse
       - peterdavidfagan
-      - duringhof
+      - progtologist
+      - saikishor
       - VanshGehlot
-      - bijoua29
-      - LukasMacha97
-      - mcbed
+      - VX792
diff --git a/.github/workflows/ci-coverage-build-humble.yml b/.github/workflows/ci-coverage-build-humble.yml
@@ -17,11 +17,11 @@ jobs:
     env:
       ROS_DISTRO: humble
     steps:
-      - uses: ros-tooling/[email protected].0
+      - uses: ros-tooling/[email protected].1
         with:
           required-ros-distributions: ${{ env.ROS_DISTRO }}
       - uses: actions/checkout@v4
-      - uses: ros-tooling/[email protected].4
+      - uses: ros-tooling/[email protected].5
         with:
           target-ros2-distro: ${{ env.ROS_DISTRO }}
           import-token: ${{ secrets.GITHUB_TOKEN }}
@@ -38,6 +38,7 @@ jobs:
             imu_sensor_broadcaster
             joint_state_broadcaster
             joint_trajectory_controller
+            pid_controller
             position_controllers
             range_sensor_broadcaster
             steering_controllers_library
@@ -59,7 +60,7 @@ jobs:
           file: ros_ws/lcov/total_coverage.info
           flags: unittests
           name: codecov-umbrella
-      - uses: actions/upload-artifact@v3.1.3
+      - uses: actions/upload-artifact@v4.0.0
         with:
           name: colcon-logs-coverage-humble
           path: ros_ws/log
diff --git a/.github/workflows/ci-coverage-build-iron.yml b/.github/workflows/ci-coverage-build-iron.yml
@@ -17,11 +17,11 @@ jobs:
     env:
       ROS_DISTRO: iron
     steps:
-      - uses: ros-tooling/[email protected].0
+      - uses: ros-tooling/[email protected].1
         with:
           required-ros-distributions: ${{ env.ROS_DISTRO }}
       - uses: actions/checkout@v4
-      - uses: ros-tooling/[email protected].4
+      - uses: ros-tooling/[email protected].5
         with:
           target-ros2-distro: ${{ env.ROS_DISTRO }}
           import-token: ${{ secrets.GITHUB_TOKEN }}
@@ -38,6 +38,7 @@ jobs:
             imu_sensor_broadcaster
             joint_state_broadcaster
             joint_trajectory_controller
+            pid_controller
             position_controllers
             range_sensor_broadcaster
             steering_controllers_library
@@ -59,7 +60,7 @@ jobs:
           file: ros_ws/lcov/total_coverage.info
           flags: unittests
           name: codecov-umbrella
-      - uses: actions/upload-artifact@v3.1.3
+      - uses: actions/upload-artifact@v4.0.0
         with:
           name: colcon-logs-coverage-iron
           path: ros_ws/log
diff --git a/.github/workflows/ci-coverage-build.yml b/.github/workflows/ci-coverage-build.yml
@@ -17,11 +17,11 @@ jobs:
     env:
       ROS_DISTRO: rolling
     steps:
-      - uses: ros-tooling/[email protected].0
+      - uses: ros-tooling/[email protected].1
         with:
           required-ros-distributions: ${{ env.ROS_DISTRO }}
       - uses: actions/checkout@v4
-      - uses: ros-tooling/[email protected].4
+      - uses: ros-tooling/[email protected].5
         with:
           target-ros2-distro: ${{ env.ROS_DISTRO }}
           import-token: ${{ secrets.GITHUB_TOKEN }}
@@ -38,6 +38,7 @@ jobs:
             imu_sensor_broadcaster
             joint_state_broadcaster
             joint_trajectory_controller
+            pid_controller
             position_controllers
             range_sensor_broadcaster
             steering_controllers_library
@@ -59,7 +60,7 @@ jobs:
           file: ros_ws/lcov/total_coverage.info
           flags: unittests
           name: codecov-umbrella
-      - uses: actions/upload-artifact@v3.1.3
+      - uses: actions/upload-artifact@v4.0.0
         with:
           name: colcon-logs-coverage-rolling
           path: ros_ws/log
diff --git a/.github/workflows/ci-format.yml b/.github/workflows/ci-format.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-python@v4.7.1
+    - uses: actions/setup-python@v5.0.0
       with:
         python-version: '3.10'
     - name: Install system hooks

diff --git a/.github/workflows/ci-ros-lint.yml b/.github/workflows/ci-ros-lint.yml
@@ -14,7 +14,7 @@ jobs:
       AMENT_CPPCHECK_ALLOW_SLOW_VERSIONS: true
     steps:
     - uses: actions/checkout@v4
-    - uses: ros-tooling/[email protected].0
+    - uses: ros-tooling/[email protected].1
     - uses: ros-tooling/[email protected]
       with:
         distribution: rolling
@@ -31,6 +31,7 @@ jobs:
           imu_sensor_broadcaster
           joint_state_broadcaster
           joint_trajectory_controller
+          pid_controller
           position_controllers
           range_sensor_broadcaster
           ros2_controllers
@@ -69,6 +70,7 @@ jobs:
           imu_sensor_broadcaster
           joint_state_broadcaster
           joint_trajectory_controller
+          pid_controller
           position_controllers
           range_sensor_broadcaster
           ros2_controllers

diff --git a/.github/workflows/humble-abi-compatibility.yml b/.github/workflows/humble-abi-compatibility.yml
@@ -1,8 +1,6 @@
 name: Humble - ABI Compatibility Check
 on:
   workflow_dispatch:
-    branches:
-      - humble
   pull_request:
     branches:
       - humble
@@ -15,6 +13,6 @@ jobs:
       - uses: ros-industrial/industrial_ci@master
         env:
           ROS_DISTRO: humble
-          ROS_REPO: main
+          ROS_REPO: testing
           ABICHECK_URL: github:${{ github.repository }}#${{ github.base_ref }}
           NOT_TEST_BUILD: true
diff --git a/.github/workflows/iron-abi-compatibility.yml b/.github/workflows/iron-abi-compatibility.yml
@@ -1,8 +1,6 @@
 name: Iron - ABI Compatibility Check
 on:
   workflow_dispatch:
-    branches:
-      - iron
   pull_request:
     branches:
       - iron
@@ -15,6 +13,6 @@ jobs:
       - uses: ros-industrial/industrial_ci@master
         env:
           ROS_DISTRO: iron
-          ROS_REPO: main
+          ROS_REPO: testing
           ABICHECK_URL: github:${{ github.repository }}#${{ github.base_ref }}
           NOT_TEST_BUILD: true
diff --git a/.github/workflows/reusable-ros-tooling-source-build.yml b/.github/workflows/reusable-ros-tooling-source-build.yml
@@ -26,13 +26,13 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: ros-tooling/[email protected].0
+      - uses: ros-tooling/[email protected].1
         with:
           required-ros-distributions: ${{ inputs.ros_distro }}
       - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
-      - uses: ros-tooling/[email protected].4
+      - uses: ros-tooling/[email protected].5
         with:
           target-ros2-distro: ${{ inputs.ros_distro }}
           ref: ${{ inputs.ref }}
@@ -63,7 +63,7 @@ jobs:
             https://raw.githubusercontent.com/ros2/ros2/${{ inputs.ros2_repo_branch }}/ros2.repos
             https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/ros2_controllers.${{ inputs.ros_distro }}.repos?token=${{ secrets.GITHUB_TOKEN }}
           colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
-      - uses: actions/upload-artifact@v3.1.3
+      - uses: actions/upload-artifact@v4.0.0
         with:
           name: colcon-logs-ubuntu-22.04
           path: ros_ws/log
diff --git a/.github/workflows/reviewer_lottery.yml b/.github/workflows/reviewer_lottery.yml
@@ -6,6 +6,7 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
+    if: github.actor != 'dependabot[bot]' && github.actor != 'mergify[bot]'
     steps:
     - uses: actions/checkout@v4
     - uses: uesteibar/reviewer-lottery@v3

diff --git a/.github/workflows/rolling-abi-compatibility.yml b/.github/workflows/rolling-abi-compatibility.yml
@@ -1,8 +1,6 @@
 name: Rolling - ABI Compatibility Check
 on:
   workflow_dispatch:
-    branches:
-      - master
   pull_request:
     branches:
       - master
@@ -15,6 +13,6 @@ jobs:
       - uses: ros-industrial/industrial_ci@master
         env:
           ROS_DISTRO: rolling
-          ROS_REPO: main
+          ROS_REPO: testing
           ABICHECK_URL: github:${{ github.repository }}#${{ github.base_ref }}
           NOT_TEST_BUILD: true
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![Licence](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![codecov](https://codecov.io/gh/ros-controls/ros2_controllers/graph/badge.svg?token=KSdY0tsHm6)](https://codecov.io/gh/ros-controls/ros2_controllers)
 
-Commonly used and generalized controllers for ros2-control framework that are ready to use with many robots, MoveIt2 and Navigation2.
+Commonly used and generalized controllers for ros2-control framework that are ready to use with many robots, MoveIt2 and Nav2.
 
 ## Build status
 

diff --git a/ackermann_steering_controller/CHANGELOG.rst b/ackermann_steering_controller/CHANGELOG.rst
@@ -2,6 +2,18 @@
 Changelog for package ackermann_steering_controller
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+4.2.0 (2023-12-12)
+------------------
+
+4.1.0 (2023-12-01)
+------------------
+
+4.0.0 (2023-11-21)
+------------------
+* fix tests for API break of passing controller manager update rate in init method (`#854 <https://github.com/ros-controls/ros2_controllers/issues/854>`_)
+* Adjust tests after passing URDF to controllers (`#817 <https://github.com/ros-controls/ros2_controllers/issues/817>`_)
+* Contributors: Bence Magyar, Sai Kishor Kothakota
+
 3.17.0 (2023-10-31)
 -------------------
 * Improve docs (`#785 <https://github.com/ros-controls/ros2_controllers/issues/785>`_)

diff --git a/ackermann_steering_controller/CMakeLists.txt b/ackermann_steering_controller/CMakeLists.txt
@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.16)
 project(ackermann_steering_controller LANGUAGES CXX)
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
-  add_compile_options(-Wall -Wextra -Wpedantic -Wconversion)
+  add_compile_options(-Wall -Wextra -Wpedantic -Werror=conversion -Werror=unused-but-set-variable
+                      -Werror=return-type -Werror=shadow -Werror=format)
 endif()
 
 # find dependencies

diff --git a/ackermann_steering_controller/package.xml b/ackermann_steering_controller/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>ackermann_steering_controller</name>
-  <version>3.17.0</version>
+  <version>4.2.0</version>
   <description>Steering controller for Ackermann kinematics. Rear fixed wheels are powering the vehicle and front wheels are steering it.</description>
   <license>Apache License 2.0</license>
   <maintainer email="[email protected]">Bence Magyar</maintainer>

diff --git a/ackermann_steering_controller/test/test_ackermann_steering_controller.hpp b/ackermann_steering_controller/test/test_ackermann_steering_controller.hpp
@@ -147,7 +147,7 @@ class AckermannSteeringControllerFixture : public ::testing::Test
 protected:
   void SetUpController(const std::string controller_name = "test_ackermann_steering_controller")
   {
-    ASSERT_EQ(controller_->init(controller_name, ""), controller_interface::return_type::OK);
+    ASSERT_EQ(controller_->init(controller_name, "", 0), controller_interface::return_type::OK);
 
     if (position_feedback_ == true)
     {

diff --git a/admittance_controller/CHANGELOG.rst b/admittance_controller/CHANGELOG.rst
@@ -2,6 +2,18 @@
 Changelog for package admittance_controller
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+4.2.0 (2023-12-12)
+------------------
+
+4.1.0 (2023-12-01)
+------------------
+
+4.0.0 (2023-11-21)
+------------------
+* fix tests for API break of passing controller manager update rate in init method (`#854 <https://github.com/ros-controls/ros2_controllers/issues/854>`_)
+* Adjust tests after passing URDF to controllers (`#817 <https://github.com/ros-controls/ros2_controllers/issues/817>`_)
+* Contributors: Bence Magyar, Sai Kishor Kothakota
+
 3.17.0 (2023-10-31)
 -------------------