Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented May 17, 2025

Summary:
This PR introduces a new multiplier parameter set for the force_torque_sensor_broadcaster controller. Users can now specify per–axis scaling factors for both force and torque readings, applied after the existing offset logic. This feature enables dynamic unit conversions or gain adjustments without modifying downstream code.

Changes:

  • Extended the auto‑generated Params to include multiplier.force.{x,y,z} and multiplier.torque.{x,y,z}
  • Implemented apply_sensor_multiplier(...) and invoked it in the publish loop immediately after offset application
  • Added a new gtest (SensorName_Publish_Success_with_Multipliers) mirroring the offset test to verify correct scaling in both the published message and exported state interfaces

Pipeline Status:
✅ All existing and new tests pass locally (colcon test --packages-select force_torque_sensor_broadcaster)
pre-commit run shows no formatting errors

Testing:

Signed-off-by: Edward <[email protected]>
(cherry picked from commit b06cd33)

# Conflicts:
#	doc/release_notes.rst
@mergify mergify bot added the conflicts label May 17, 2025
@mergify
Copy link
Contributor Author

mergify bot commented May 17, 2025

Cherry-pick of b06cd33 has failed:

On branch mergify/bp/jazzy/pr-1647
Your branch is up to date with 'origin/jazzy'.

You are currently cherry-picking commit b06cd33.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   force_torque_sensor_broadcaster/include/force_torque_sensor_broadcaster/force_torque_sensor_broadcaster.hpp
	modified:   force_torque_sensor_broadcaster/src/force_torque_sensor_broadcaster.cpp
	modified:   force_torque_sensor_broadcaster/src/force_torque_sensor_broadcaster_parameters.yaml
	modified:   force_torque_sensor_broadcaster/test/test_force_torque_sensor_broadcaster.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   doc/release_notes.rst

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@christophfroehlich christophfroehlich merged commit 2d4359c into jazzy May 17, 2025
11 of 13 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/jazzy/pr-1647 branch May 17, 2025 16:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants