Skip to content

Commit c254ecb

Browse files
Merge branch 'master' into feat/schema-description
2 parents a440719 + 38124b7 commit c254ecb

File tree

64 files changed

+1269
-291
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1269
-291
lines changed

.github/workflows/docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: docker/setup-buildx-action@v3
2323

2424
- name: Checkout repository
25-
uses: actions/checkout@v5
25+
uses: actions/checkout@v6
2626

2727
- name: Log in to the Container registry
2828
uses: docker/login-action@v3
@@ -62,7 +62,7 @@ jobs:
6262
uses: docker/setup-buildx-action@v3
6363

6464
- name: Checkout repository
65-
uses: actions/checkout@v5
65+
uses: actions/checkout@v6
6666

6767
- name: Log in to the Container registry
6868
uses: docker/login-action@v3

.github/workflows/rolling-abi-compatibility.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ on:
1414
- '**/package.xml'
1515
- '**/CMakeLists.txt'
1616
- 'ros2_control-not-released.rolling.repos'
17-
- 'ros2_control-not-released.kilted.repos'
1817

1918
concurrency:
2019
# cancel previous runs of the same workflow, except for pushes on given branches

.github/workflows/rolling-binary-build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ on:
1717
- '**/package.xml'
1818
- '**/CMakeLists.txt'
1919
- 'ros2_control-not-released.rolling.repos'
20-
- 'ros2_control-not-released.kilted.repos'
2120
push: *event
2221
schedule:
2322
# Run every morning to detect flakiness and broken dependencies

.github/workflows/rolling-debian-build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ on:
1414
- '**/package.xml'
1515
- '**/CMakeLists.txt'
1616
- 'ros2_control.rolling.repos'
17-
- 'ros2_control.kilted.repos'
1817
schedule:
1918
# Run every day to detect flakiness and broken dependencies
2019
- cron: '03 1 * * MON-FRI'

.github/workflows/rolling-rhel-binary-build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ on:
1414
- '**/package.xml'
1515
- '**/CMakeLists.txt'
1616
- 'ros2_control.rolling.repos'
17-
- 'ros2_control.kilted.repos'
1817
schedule:
1918
# Run every day to detect flakiness and broken dependencies
2019
- cron: '03 1 * * MON-FRI'

.github/workflows/rolling-semi-binary-build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ on:
1717
- '**/package.xml'
1818
- '**/CMakeLists.txt'
1919
- 'ros2_control.rolling.repos'
20-
- 'ros2_control.kilted.repos'
2120
push: *event
2221
schedule:
2322
# Run every morning to detect flakiness and broken dependencies

.github/workflows/rolling-semi-binary-downstream-build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ on:
1717
- '**/package.xml'
1818
- '**/CMakeLists.txt'
1919
- 'ros_controls.rolling.repos'
20-
- 'ros_controls.kilted.repos'
2120

2221
concurrency:
2322
group: ${{ github.workflow }}-${{ github.ref }}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ on:
1414
- '**/package.xml'
1515
- '**/CMakeLists.txt'
1616
- 'ros2_control.rolling.repos'
17-
- 'ros2_control.kilted.repos'
1817
pull_request:
1918
branches:
2019
- master

controller_interface/CHANGELOG.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
Changelog for package controller_interface
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
6.0.2 (2025-11-09)
6+
------------------
7+
* Extend the reasoning for the capacity mismatch (`#2723 <https://github.com/ros-controls/ros2_control/issues/2723>`_)
8+
* Contributors: Sai Kishor Kothakota
9+
510
6.0.1 (2025-11-03)
611
------------------
712

controller_interface/include/controller_interface/controller_interface_params.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ struct ControllerInterfaceParams
4747
std::string controller_name = "";
4848
std::string robot_description = "";
4949
unsigned int update_rate = 0;
50+
unsigned int controller_manager_update_rate = 0;
5051

5152
std::string node_namespace = "";
5253
rclcpp::NodeOptions node_options = rclcpp::NodeOptions();

0 commit comments

Comments
 (0)