Broadcaster parameters (backport #650)

[mergify]

This is an automatic backport of pull request #650 done by Mergify.
Cherry-pick of f059022 has failed:

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

You are currently cherry-picking commit f059022.
  (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/CMakeLists.txt
	modified:   force_torque_sensor_broadcaster/src/force_torque_sensor_broadcaster.cpp
	modified:   force_torque_sensor_broadcaster/src/force_torque_sensor_broadcaster_parameters.yaml
	new file:   force_torque_sensor_broadcaster/test/force_torque_sensor_broadcaster_params.yaml
	modified:   force_torque_sensor_broadcaster/test/test_force_torque_sensor_broadcaster.cpp
	modified:   imu_sensor_broadcaster/CMakeLists.txt
	modified:   imu_sensor_broadcaster/src/imu_sensor_broadcaster.cpp
	modified:   imu_sensor_broadcaster/src/imu_sensor_broadcaster_parameters.yaml
	new file:   imu_sensor_broadcaster/test/imu_sensor_broadcaster_params.yaml
	modified:   imu_sensor_broadcaster/test/test_imu_sensor_broadcaster.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   force_torque_sensor_broadcaster/test/test_load_force_torque_sensor_broadcaster.cpp
	both modified:   imu_sensor_broadcaster/test/test_load_imu_sensor_broadcaster.cpp

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

---

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

• @Mergifyio refresh will re-evaluate the rules
• @Mergifyio rebase will rebase this PR on its base branch
• @Mergifyio update will merge the base branch into this PR
• @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

• look at your merge queues
• generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

[mergify]

This pull request is in conflict. Could you fix it @mergify[bot]?

[bmagyar]

@mergify rebase

[mergify]

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/1)
Auto-merging force_torque_sensor_broadcaster/test/test_load_force_torque_sensor_broadcaster.cpp
CONFLICT (content): Merge conflict in force_torque_sensor_broadcaster/test/test_load_force_torque_sensor_broadcaster.cpp
Auto-merging imu_sensor_broadcaster/test/test_load_imu_sensor_broadcaster.cpp
CONFLICT (content): Merge conflict in imu_sensor_broadcaster/test/test_load_imu_sensor_broadcaster.cpp
error: could not apply 20dfc0b... Broadcaster parameters (#650)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 20dfc0b... Broadcaster parameters (#650)

err-code: 24B1F

[bmagyar]

@Mergifyio rebase humble

[mergify]

rebase humble

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/1)
Auto-merging force_torque_sensor_broadcaster/test/test_load_force_torque_sensor_broadcaster.cpp
CONFLICT (content): Merge conflict in force_torque_sensor_broadcaster/test/test_load_force_torque_sensor_broadcaster.cpp
Auto-merging imu_sensor_broadcaster/test/test_load_imu_sensor_broadcaster.cpp
CONFLICT (content): Merge conflict in imu_sensor_broadcaster/test/test_load_imu_sensor_broadcaster.cpp
error: could not apply 20dfc0b... Broadcaster parameters (#650)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 20dfc0b... Broadcaster parameters (#650)

err-code: 108C2

[christophfroehlich]

Thanks, then I'll do a manual merge.