Skip to content

Commit aebb8be

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 9d8bd04 + a01fd0b commit aebb8be

File tree

144 files changed

+6416
-972
lines changed

Some content is hidden

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

144 files changed

+6416
-972
lines changed

.github/workflows/humble-check-docs.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,14 @@ on:
88
paths:
99
- '**.rst'
1010
- '**.md'
11+
- '**.jpg'
12+
- '**.jpeg'
13+
- '**.png'
14+
- '**.svg'
15+
- '**.yml'
1116
- '**.yaml'
17+
- '!.github/**' # exclude yaml files in .github directory
18+
- '.github/workflows/humble-check-docs.yml'
1219

1320
concurrency:
1421
group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/humble-pre-commit.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
pull_request:
66
branches:
77
- humble
8+
push:
9+
branches:
10+
- humble
811

912
concurrency:
1013
group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/jazzy-check-docs.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,14 @@ on:
88
paths:
99
- '**.rst'
1010
- '**.md'
11+
- '**.jpg'
12+
- '**.jpeg'
13+
- '**.png'
14+
- '**.svg'
15+
- '**.yml'
1116
- '**.yaml'
17+
- '!.github/**' # exclude yaml files in .github directory
18+
- '.github/workflows/jazzy-check-docs.yml'
1219

1320
concurrency:
1421
group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/jazzy-pre-commit.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
pull_request:
66
branches:
77
- jazzy
8+
push:
9+
branches:
10+
- jazzy
811

912
concurrency:
1013
group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/rolling-check-docs.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@ on:
88
paths:
99
- '**.rst'
1010
- '**.md'
11+
- '**.jpg'
12+
- '**.jpeg'
13+
- '**.png'
14+
- '**.svg'
15+
- '**.yml'
1116
- '**.yaml'
17+
- '!.github/**' # exclude yaml files in .github directory
1218
- '.github/workflows/rolling-check-docs.yml'
1319

1420
concurrency:

.github/workflows/rolling-pre-commit.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
pull_request:
66
branches:
77
- master
8+
push:
9+
branches:
10+
- master
811

912
concurrency:
1013
group: ${{ github.workflow }}-${{ github.ref }}

.pre-commit-config.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ repos:
2929
args: ["--allow-multiple-documents"]
3030
- id: debug-statements
3131
- id: end-of-file-fixer
32+
exclude_types: [svg]
3233
- id: mixed-line-ending
3334
- id: trailing-whitespace
3435
exclude_types: [rst]
@@ -56,14 +57,14 @@ repos:
5657
args: ["--line-length=99"]
5758

5859
- repo: https://github.com/pycqa/flake8
59-
rev: 7.2.0
60+
rev: 7.3.0
6061
hooks:
6162
- id: flake8
6263
args: ["--extend-ignore=E501"]
6364

6465
# CPP hooks
6566
- repo: https://github.com/pre-commit/mirrors-clang-format
66-
rev: v20.1.5
67+
rev: v20.1.8
6768
hooks:
6869
- id: clang-format
6970
args: ['-fallback-style=none', '-i']
@@ -109,7 +110,7 @@ repos:
109110

110111
# Docs - RestructuredText hooks
111112
- repo: https://github.com/PyCQA/doc8
112-
rev: v1.1.2
113+
rev: v2.0.0
113114
hooks:
114115
- id: doc8
115116
args: ['--max-line-length=100', '--ignore=D001']
@@ -133,7 +134,7 @@ repos:
133134
exclude: CHANGELOG\.rst|\.(svg|pyc|drawio)$
134135

135136
- repo: https://github.com/python-jsonschema/check-jsonschema
136-
rev: 0.33.0
137+
rev: 0.33.2
137138
hooks:
138139
- id: check-github-workflows
139140
args: ["--verbose"]

ackermann_steering_controller/CHANGELOG.rst

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

5+
5.5.0 (2025-07-31)
6+
------------------
7+
8+
5.4.0 (2025-07-23)
9+
------------------
10+
* Use new handles API in ros2_controllers to fix deprecation warnings (`#1566 <https://github.com/ros-controls/ros2_controllers/issues/1566>`_)
11+
* Contributors: Sanjeev Kumar
12+
13+
5.3.0 (2025-07-14)
14+
------------------
15+
* Update realtime containers (`#1721 <https://github.com/ros-controls/ros2_controllers/issues/1721>`_)
16+
* Contributors: Christoph Fröhlich
17+
18+
5.2.0 (2025-06-23)
19+
------------------
20+
521
5.1.0 (2025-06-11)
622
------------------
723
* Remove deprecated parameters from steering_controllers_library (`#1684 <https://github.com/ros-controls/ros2_controllers/issues/1684>`_)

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.1.0</version>
5+
<version>5.5.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>

ackermann_steering_controller/src/ackermann_steering_controller.cpp

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,40 @@ controller_interface::CallbackReturn AckermannSteeringController::configure_odom
5555

5656
bool AckermannSteeringController::update_odometry(const rclcpp::Duration & period)
5757
{
58+
auto logger = get_node()->get_logger();
59+
5860
if (params_.open_loop)
5961
{
6062
odometry_.update_open_loop(
6163
last_linear_velocity_, last_angular_velocity_, period.seconds(), params_.use_twist_input);
6264
}
6365
else
6466
{
65-
const double traction_right_wheel_value =
66-
state_interfaces_[STATE_TRACTION_RIGHT_WHEEL].get_value();
67-
const double traction_left_wheel_value =
68-
state_interfaces_[STATE_TRACTION_LEFT_WHEEL].get_value();
69-
const double steering_right_position = state_interfaces_[STATE_STEER_RIGHT_WHEEL].get_value();
70-
const double steering_left_position = state_interfaces_[STATE_STEER_LEFT_WHEEL].get_value();
67+
const auto traction_right_wheel_value_op =
68+
state_interfaces_[STATE_TRACTION_RIGHT_WHEEL].get_optional();
69+
const auto traction_left_wheel_value_op =
70+
state_interfaces_[STATE_TRACTION_LEFT_WHEEL].get_optional();
71+
const auto steering_right_position_op =
72+
state_interfaces_[STATE_STEER_RIGHT_WHEEL].get_optional();
73+
const auto steering_left_position_op = state_interfaces_[STATE_STEER_LEFT_WHEEL].get_optional();
74+
75+
if (
76+
!traction_right_wheel_value_op.has_value() || !traction_left_wheel_value_op.has_value() ||
77+
!steering_right_position_op.has_value() || !steering_left_position_op.has_value())
78+
{
79+
RCLCPP_DEBUG(
80+
logger,
81+
"Unable to retrieve the data from right wheel or left wheel or right steering position or "
82+
"left steering position!");
83+
84+
return true;
85+
}
86+
87+
const double traction_right_wheel_value = traction_right_wheel_value_op.value();
88+
const double traction_left_wheel_value = traction_left_wheel_value_op.value();
89+
const double steering_right_position = steering_right_position_op.value();
90+
const double steering_left_position = steering_left_position_op.value();
91+
7192
if (
7293
std::isfinite(traction_right_wheel_value) && std::isfinite(traction_left_wheel_value) &&
7394
std::isfinite(steering_right_position) && std::isfinite(steering_left_position))

0 commit comments

Comments
 (0)