Merge branch 'master' into autodocs_parameters_nested

.github/mergify.yml

@@ -32,13 +32,13 @@ pull_request_rules:
       - author=mergify[bot]
     actions:
         comment:
-          message: This pull request is in conflict. Could you fix it @bmagyar @dstogl @christophfroehlich?
+          message: This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich?
 
   - name: development targets master branch
     conditions:
       - base!=master
       - author!=bmagyar
-      - author!=dstogl
+      - author!=destogl
       - author!=christophfroehlich
       - author!=mergify[bot]
       - author!=dependabot[bot]

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

@@ -60,7 +60,7 @@ jobs:
           file: ros_ws/lcov/total_coverage.info
           flags: unittests
           name: codecov-umbrella
-      - uses: actions/upload-artifact@v4.0.0
+      - uses: actions/upload-artifact@v4.1.0
         with:
           name: colcon-logs-coverage-humble
           path: ros_ws/log

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

@@ -60,7 +60,7 @@ jobs:
           file: ros_ws/lcov/total_coverage.info
           flags: unittests
           name: codecov-umbrella
-      - uses: actions/upload-artifact@v4.0.0
+      - uses: actions/upload-artifact@v4.1.0
         with:
           name: colcon-logs-coverage-iron
           path: ros_ws/log

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

@@ -60,7 +60,7 @@ jobs:
           file: ros_ws/lcov/total_coverage.info
           flags: unittests
           name: codecov-umbrella
-      - uses: actions/upload-artifact@v4.0.0
+      - uses: actions/upload-artifact@v4.1.0
         with:
           name: colcon-logs-coverage-rolling
           path: ros_ws/log

.github/workflows/reusable-ros-tooling-source-build.yml

@@ -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@v4.0.0
+      - uses: actions/upload-artifact@v4.1.0
         with:
           name: colcon-logs-ubuntu-22.04
           path: ros_ws/log

pid_controller/include/pid_controller/pid_controller.hpp

@@ -35,7 +35,6 @@
 #include "std_srvs/srv/set_bool.hpp"
 
 #include "control_msgs/msg/joint_controller_state.hpp"
-#include "control_msgs/msg/joint_jog.hpp"
 
 #include "control_msgs/msg/pid_state.hpp"
 #include "trajectory_msgs/msg/joint_trajectory_point.hpp"