Skip to content

Commit 812ebea

Browse files
authored
Merge branch 'master' into fix/gpio-issue-1970-clean
2 parents f1403c5 + 2391cc8 commit 812ebea

File tree

5 files changed

+18
-11
lines changed

5 files changed

+18
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ jobs:
2727
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-win-build.yml@master
2828
with:
2929
ros_distro: rolling
30-
pixi_dependencies: typeguard jinja2 boost compilers
30+
pixi_dependencies: typeguard jinja2 boost compilers octomap
3131
ninja_packages: rsl
3232
target_cmake_args: -DBUILD_TESTING=OFF

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ repos:
5151
args: ["--ignore=D100,D101,D102,D103,D104,D105,D106,D107,D203,D212,D404"]
5252

5353
- repo: https://github.com/psf/black
54-
rev: 25.12.0
54+
rev: 26.1.0
5555
hooks:
5656
- id: black
5757
args: ["--line-length=99"]
@@ -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.36.0
141+
rev: 0.36.1
142142
hooks:
143143
- id: check-github-workflows
144144
args: ["--verbose"]

doc/migration.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ Migration Guides: Kilted Kaiju to Lyrical Luth
44
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
55
This list summarizes important changes between Kilted Kaiju (previous) and Lyrical Luth (current) releases, where changes to user code might be necessary.
66

7+
joint_state_broadcaster
8+
*****************************
9+
* Removed interfaces with other data types than double for publishing to ``dynamic_joint_states``. (`#2115 <https://github.com/ros-controls/ros2_controllers/pull/2115>`_).
10+
Use a custom controller for publishing non-double interfaces.
11+
712
effort_controllers
813
*****************************
914
* ``effort_controllers/JointGroupEffortController`` is deprecated. Use :ref:`forward_command_controller <forward_command_controller_userdoc>` instead by adding the ``interface_name`` parameter and set it to ``effort``. (`#1913 <https://github.com/ros-controls/ros2_controllers/pull/1913>`_).

doc/release_notes.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ joint_state_broadcaster
2727
************************
2828
* Make all parameters read-only (the never got re-evaluated after initialization anyways). (`#2064 <https://github.com/ros-controls/ros2_controllers/pull/2064>`_)
2929
* Added parameter ``publish_dynamic_joint_states`` to enable/disable publishing of dynamic joint states. (`#2064 <https://github.com/ros-controls/ros2_controllers/pull/2064>`_)
30+
* Removed interfaces with other data types than double for publishing to ``dynamic_joint_states``. (`#2115 <https://github.com/ros-controls/ros2_controllers/pull/2115>`_)
3031

3132
omni_wheel_drive_controller
3233
*****************************

steering_controllers_library/src/steering_controllers_library.cpp

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -290,14 +290,15 @@ controller_interface::CallbackReturn SteeringControllersLibrary::on_configure(
290290
odom_state_msg_.child_frame_id = base_frame_id;
291291
odom_state_msg_.pose.pose.position.z = 0;
292292

293-
auto & covariance = odom_state_msg_.twist.covariance;
294-
constexpr size_t NUM_DIMENSIONS = 6;
295-
for (size_t index = 0; index < 6; ++index)
296-
{
297-
// 0, 7, 14, 21, 28, 35
298-
const size_t diagonal_index = NUM_DIMENSIONS * index + index;
299-
covariance[diagonal_index] = params_.pose_covariance_diagonal[index];
300-
covariance[diagonal_index] = params_.twist_covariance_diagonal[index];
293+
const size_t NUM_DIMENSIONS = 6;
294+
auto & pose_cov = odom_state_msg_.pose.covariance;
295+
auto & twist_cov = odom_state_msg_.twist.covariance;
296+
for (size_t i = 0; i < NUM_DIMENSIONS; ++i)
297+
{
298+
// indices of the diagonal: 0, 7, 14, 21, 28, 35
299+
const size_t index = (NUM_DIMENSIONS + 1) * i;
300+
pose_cov[index] = params_.pose_covariance_diagonal[i];
301+
twist_cov[index] = params_.twist_covariance_diagonal[i];
301302
}
302303

303304
try

0 commit comments

Comments
 (0)