Merge branch 'ros2-master' into prepare/humble

ros-controls · Jan 15, 2025 · 377e501 · 377e501
2 parents 69ff5b3 + 4885811
commit 377e501
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/humble-abi-compatibility.yml b/.github/workflows/humble-abi-compatibility.yml
@@ -13,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/rolling-abi-compatibility.yml b/.github/workflows/rolling-abi-compatibility.yml
@@ -17,6 +17,6 @@ jobs:
       - uses: ros-industrial/industrial_ci@master
         env:
           ROS_DISTRO: ${{ matrix.ROS_DISTRO }}
-          ROS_REPO: main
+          ROS_REPO: testing
           ABICHECK_URL: github:${{ github.repository }}#${{ github.base_ref }}
           NOT_TEST_BUILD: true
diff --git a/include/control_filters/exponential_filter.hpp b/include/control_filters/exponential_filter.hpp
@@ -22,7 +22,7 @@
 #include "filters/filter_base.hpp"
 
 #include "control_toolbox/filters.hpp"
-#include "exponential_filter_parameters.hpp"
+#include "control_toolbox/exponential_filter_parameters.hpp"
 
 namespace control_filters
 {

diff --git a/include/control_filters/low_pass_filter.hpp b/include/control_filters/low_pass_filter.hpp
@@ -22,7 +22,7 @@
 #include "geometry_msgs/msg/wrench_stamped.hpp"
 
 #include "control_toolbox/low_pass_filter.hpp"
-#include "low_pass_filter_parameters.hpp"
+#include "control_toolbox/low_pass_filter_parameters.hpp"
 
 namespace control_filters
 {

diff --git a/include/control_filters/rate_limiter.hpp b/include/control_filters/rate_limiter.hpp
@@ -24,7 +24,7 @@
 #include "filters/filter_base.hpp"
 
 #include "control_toolbox/rate_limiter.hpp"
-#include "rate_limiter_parameters.hpp"
+#include "control_toolbox/rate_limiter_parameters.hpp"
 
 namespace control_filters
 {