Skip to content

Commit 2211a6e

Browse files
christophfroehlichchristophfroehlich
committed
Merge branch 'master' into jtc/controller_plugin
2 parents d16ced8 + 9ce90ba commit 2211a6e

File tree

67 files changed

+245
-47
lines changed

Some content is hidden

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

67 files changed

+245
-47
lines changed

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: Rolling Windows Semi-Binary Build
2+
# author: Christoph Fröhlich <[email protected]>
3+
# description: 'Build & test all dependencies from semi-binary packages.'
4+
5+
on:
6+
workflow_dispatch:
7+
pull_request:
8+
branches:
9+
- master
10+
paths:
11+
- '**.hpp'
12+
- '**.h'
13+
- '**.cpp'
14+
- '**.py'
15+
- '.github/workflows/rolling-semi-binary-build-win.yml'
16+
- '**/package.xml'
17+
- '**/CMakeLists.txt'
18+
- 'ros2_controllers.rolling.repos'
19+
- 'ros2_controllers.windows.rolling.repos'
20+
push:
21+
branches:
22+
- master
23+
paths:
24+
- '**.hpp'
25+
- '**.h'
26+
- '**.cpp'
27+
- '**.py'
28+
- '.github/workflows/rolling-semi-binary-build-win.yml'
29+
- '**/package.xml'
30+
- '**/CMakeLists.txt'
31+
- 'ros2_controllers.rolling.repos'
32+
- 'ros2_controllers.windows.rolling.repos'
33+
34+
concurrency:
35+
# cancel previous runs of the same workflow, except for pushes on given branches
36+
group: ${{ github.workflow }}-${{ github.ref }}
37+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
38+
39+
jobs:
40+
binary-windows:
41+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-win-build.yml@master
42+
with:
43+
ros_distro: rolling
44+
pixi_dependencies: typeguard jinja2 boost compilers
45+
windows_dependencies: ros2_controllers.windows.rolling.repos
46+
ninja_packages: rsl
47+
skip_packages: diagnostic_remote_logging generate_parameter_library_example_external generate_parameter_library_example
48+
target_cmake_args: -DBUILD_TESTING=OFF

‎.github/workflows/stale.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
issues: write
1313
pull-requests: write
1414
steps:
15-
- uses: actions/stale@v9
15+
- uses: actions/stale@v10
1616
with:
1717
stale-issue-label: 'stale'
1818
stale-pr-label: 'stale'

‎ackermann_steering_controller/CHANGELOG.rst‎

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

5+
5.7.0 (2025-09-12)
6+
------------------
7+
58
5.6.1 (2025-08-30)
69
------------------
710

‎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.6.1</version>
5+
<version>5.7.0</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: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
Changelog for package admittance_controller
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
5.7.0 (2025-09-12)
6+
------------------
7+
* Fix temporary copies of other semantic components (`#1905 <https://github.com/ros-controls/ros2_controllers/issues/1905>`_)
8+
* Contributors: Christoph Fröhlich
9+
510
5.6.1 (2025-08-30)
611
------------------
712

‎admittance_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>admittance_controller</name>
5-
<version>5.6.1</version>
5+
<version>5.7.0</version>
66
<description>Implementation of admittance controllers for different input and output interface.</description>
77

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

‎admittance_controller/src/admittance_controller.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ controller_interface::CallbackReturn AdmittanceController::on_configure(
338338

339339
// Initialize FTS semantic semantic_component
340340
force_torque_sensor_ = std::make_unique<semantic_components::ForceTorqueSensor>(
341-
semantic_components::ForceTorqueSensor(admittance_->parameters_.ft_sensor.name));
341+
admittance_->parameters_.ft_sensor.name);
342342

343343
// configure admittance rule
344344
if (

‎bicycle_steering_controller/CHANGELOG.rst‎

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

5+
5.7.0 (2025-09-12)
6+
------------------
7+
58
5.6.1 (2025-08-30)
69
------------------
710

‎bicycle_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>bicycle_steering_controller</name>
5-
<version>5.6.1</version>
5+
<version>5.7.0</version>
66
<description>Steering controller with bicycle kinematics. Rear fixed wheel is powering the vehicle and front wheel is steering.</description>
77

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

‎chained_filter_controller/CHANGELOG.rst‎

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

5+
5.7.0 (2025-09-12)
6+
------------------
7+
58
5.6.1 (2025-08-30)
69
------------------
710

0 commit comments

Comments
 (0)