Skip to content

Commit d635c3e

Browse files
christophfroehlichchristophfroehlich
committed
Merge branch 'master' into jtc/controller_plugin
2 parents 8446966 + 30473a5 commit d635c3e

File tree

112 files changed

+1053
-421
lines changed

Some content is hidden

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

112 files changed

+1053
-421
lines changed

‎.github/workflows/humble-pre-release.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Humble - pre-release
2+
# author: Christoph Froehlich <[email protected]>
3+
4+
on:
5+
workflow_dispatch:
6+
inputs:
7+
downstream_depth:
8+
description: 'The depth of the depends-on tree to be included in the overlay workspace (-1 implies unlimited, default: 0)'
9+
required: false
10+
default: 0
11+
type: number
12+
pull_request:
13+
branches:
14+
- humble
15+
types:
16+
- opened # default
17+
- reopened # default
18+
- synchronize # default
19+
- labeled # also if a label changes
20+
21+
jobs:
22+
default:
23+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-prerelease.yml@master
24+
with:
25+
ros_distro: humble
26+
# downstream_depth is not set on pull_request event
27+
prerelease_downstream_depth: ${{ github.event_name == 'pull_request' && '0' || inputs.downstream_depth }}

‎.github/workflows/humble-semi-binary-downstream-build.yml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,3 @@ jobs:
3636
# we test the downstream packages, which are part of our organization
3737
downstream_workspace: ros_controls.humble.repos
3838
not_test_downstream: false
39-
build-downstream-3rd-party:
40-
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
41-
with:
42-
ros_distro: humble
43-
ros_repo: testing
44-
ref_for_scheduled_build: humble
45-
upstream_workspace: ros2_controllers.humble.repos
46-
# we don't test this repository, we just build it
47-
not_test_build: true
48-
# we don't test the downstream packages, which are outside of our organization
49-
downstream_workspace: downstream.humble.repos
50-
not_test_downstream: true

‎.github/workflows/jazzy-pre-release.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Jazzy - pre-release
2+
# author: Christoph Froehlich <[email protected]>
3+
4+
on:
5+
workflow_dispatch:
6+
inputs:
7+
downstream_depth:
8+
description: 'The depth of the depends-on tree to be included in the overlay workspace (-1 implies unlimited, default: 0)'
9+
required: false
10+
default: 0
11+
type: number
12+
pull_request:
13+
branches:
14+
- jazzy
15+
types:
16+
- opened # default
17+
- reopened # default
18+
- synchronize # default
19+
- labeled # also if a label changes
20+
21+
jobs:
22+
default:
23+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-prerelease.yml@master
24+
with:
25+
ros_distro: jazzy
26+
# downstream_depth is not set on pull_request event
27+
prerelease_downstream_depth: ${{ github.event_name == 'pull_request' && '0' || inputs.downstream_depth }}

‎.github/workflows/jazzy-semi-binary-downstream-build.yml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,3 @@ jobs:
3636
# we test the downstream packages, which are part of our organization
3737
downstream_workspace: ros_controls.jazzy.repos
3838
not_test_downstream: false
39-
build-downstream-3rd-party:
40-
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
41-
with:
42-
ros_distro: jazzy
43-
ros_repo: testing
44-
ref_for_scheduled_build: jazzy
45-
upstream_workspace: ros2_controllers.jazzy.repos
46-
# we don't test this repository, we just build it
47-
not_test_build: true
48-
# we don't test the downstream packages, which are outside of our organization
49-
downstream_workspace: downstream.jazzy.repos
50-
not_test_downstream: true

‎.github/workflows/rolling-pre-release.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Rolling - pre-release
2+
# author: Christoph Froehlich <[email protected]>
3+
4+
on:
5+
workflow_dispatch:
6+
inputs:
7+
downstream_depth:
8+
description: 'The depth of the depends-on tree to be included in the overlay workspace (-1 implies unlimited, default: 0)'
9+
required: false
10+
default: 0
11+
type: number
12+
pull_request:
13+
branches:
14+
- master
15+
types:
16+
- opened # default
17+
- reopened # default
18+
- synchronize # default
19+
- labeled # also if a label changes
20+
21+
jobs:
22+
default:
23+
strategy:
24+
fail-fast: false
25+
matrix:
26+
ROS_DISTRO: [kilted, rolling]
27+
28+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-prerelease.yml@master
29+
with:
30+
ros_distro: ${{ matrix.ROS_DISTRO }}
31+
# downstream_depth is not set on pull_request event
32+
prerelease_downstream_depth: ${{ github.event_name == 'pull_request' && '0' || inputs.downstream_depth }}

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,3 @@ jobs:
4141
# we test the downstream packages, which are part of our organization
4242
downstream_workspace: ros_controls.${{ matrix.ROS_DISTRO }}.repos
4343
not_test_downstream: false
44-
build-downstream-3rd-party:
45-
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
46-
strategy:
47-
fail-fast: false
48-
matrix:
49-
ROS_DISTRO: [kilted, rolling]
50-
with:
51-
ros_distro: ${{ matrix.ROS_DISTRO }}
52-
ros_repo: testing
53-
ref_for_scheduled_build: master
54-
upstream_workspace: ros2_controllers.${{ matrix.ROS_DISTRO }}.repos
55-
# we don't test this repository, we just build it
56-
not_test_build: true
57-
# we don't test the downstream packages, which are outside of our organization
58-
downstream_workspace: downstream.${{ matrix.ROS_DISTRO }}.repos
59-
not_test_downstream: true

‎.pre-commit-config.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
repos:
1717
# Standard hooks
1818
- repo: https://github.com/pre-commit/pre-commit-hooks
19-
rev: v5.0.0
19+
rev: v6.0.0
2020
hooks:
2121
- id: check-added-large-files
2222
- id: check-ast
@@ -64,7 +64,7 @@ repos:
6464

6565
# CPP hooks
6666
- repo: https://github.com/pre-commit/mirrors-clang-format
67-
rev: v20.1.8
67+
rev: v21.1.0
6868
hooks:
6969
- id: clang-format
7070
args: ['-fallback-style=none', '-i']
@@ -116,7 +116,7 @@ repos:
116116
args: [
117117
'--max-line-length=100',
118118
'--ignore=D001',
119-
'--ignore-path=motion_primitives_forward_controller/userdoc.rst' # D000 fails with myst_parser
119+
'--ignore-path=motion_primitives_controllers/userdoc.rst' # D000 fails with myst_parser
120120
]
121121
exclude: CHANGELOG\.rst$
122122

@@ -138,7 +138,7 @@ repos:
138138
exclude: CHANGELOG\.rst|\.(svg|pyc|drawio)$
139139

140140
- repo: https://github.com/python-jsonschema/check-jsonschema
141-
rev: 0.33.2
141+
rev: 0.33.3
142142
hooks:
143143
- id: check-github-workflows
144144
args: ["--verbose"]

‎ackermann_steering_controller/CHANGELOG.rst‎

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

5+
5.6.1 (2025-08-30)
6+
------------------
7+
8+
5.6.0 (2025-08-29)
9+
------------------
10+
511
5.5.0 (2025-07-31)
612
------------------
713

‎ackermann_steering_controller/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>ackermann_steering_controller</name>
5-
<version>5.5.0</version>
5+
<version>5.6.1</version>
66
<description>Steering controller for Ackermann kinematics. Rear fixed wheels are powering the vehicle and front wheels are steering it.</description>
77

88
<maintainer email="[email protected]">Bence Magyar</maintainer>

‎admittance_controller/CHANGELOG.rst‎

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

5+
5.6.1 (2025-08-30)
6+
------------------
7+
8+
5.6.0 (2025-08-29)
9+
------------------
10+
* tf2_ros to hpp headers (`#1866 <https://github.com/ros-controls/ros2_controllers/issues/1866>`_)
11+
* Remove usage of `get_ordered_interfaces` but update parameter validation instead (`#1816 <https://github.com/ros-controls/ros2_controllers/issues/1816>`_)
12+
* Contributors: Christoph Fröhlich, Tim Clephas
13+
514
5.5.0 (2025-07-31)
615
------------------
716
* Fix `child_frame_id` in controller_state_msg (`#1601 <https://github.com/ros-controls/ros2_controllers/issues/1601>`_)

0 commit comments

Comments
 (0)