Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DiffDriveController] Optional tf namespace prefixes instead of using node namespace (backport #533) #726

Merged
merged 4 commits into from
Dec 6, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 1, 2023

This is an automatic backport of pull request #533 done by Mergify.
Cherry-pick of 5c0327d has failed:

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

You are currently cherry-picking commit 5c0327d.
  (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:   diff_drive_controller/src/diff_drive_controller_parameter.yaml
	modified:   diff_drive_controller/test/test_diff_drive_controller.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   diff_drive_controller/src/diff_drive_controller.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 mergify bot added the conflicts label Aug 1, 2023
@bobbleballs
Copy link
Contributor

@bmagyar Any chance this could get merged in?

@bmagyar
Copy link
Member

bmagyar commented Oct 17, 2023

Not with the current conflict in place... Wanna fix it via comments? I can commit those (from the phone, at roscon) and see if the CI is happy.

@bobbleballs
Copy link
Contributor

Not with the current conflict in place... Wanna fix it via comments? I can commit those (from the phone, at roscon) and see if the CI is happy.

We can try!
I think I've done it correctly... Got it mixed up the first time 😆

Copy link
Contributor

@christophfroehlich christophfroehlich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Failing tests come from JTC tests having hiccups

bobbleballs and others added 4 commits December 6, 2023 11:28
… node namespace (#533)

* [DiffDiveController] Changed the namespace appending from '/' to '_' with optional tf_frame_prefix parameter. If not set it will not append anything.
* [DiffDriveController] Add option to enable/disable TF prefix. On by default. If prefix not set and is enabled then namespace is used by default.

(cherry picked from commit 5c0327d)

# Conflicts:
#	diff_drive_controller/src/diff_drive_controller.cpp
Co-authored-by: Ben Holden <94607409+bobbleballs@users.noreply.github.com>
Copy link

codecov bot commented Dec 6, 2023

Codecov Report

Merging #726 (b84fe03) into humble (df59eec) will decrease coverage by 0.38%.
The diff coverage is 20.00%.

Additional details and impacted files
@@            Coverage Diff             @@
##           humble     #726      +/-   ##
==========================================
- Coverage   45.21%   44.84%   -0.38%     
==========================================
  Files          40       40              
  Lines        3709     3713       +4     
  Branches     1765     1769       +4     
==========================================
- Hits         1677     1665      -12     
- Misses        821      835      +14     
- Partials     1211     1213       +2     
Flag Coverage Δ
unittests 44.84% <20.00%> (-0.38%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
...iff_drive_controller/src/diff_drive_controller.cpp 41.07% <20.00%> (-3.64%) ⬇️

... and 2 files with indirect coverage changes

Copy link
Member

@bmagyar bmagyar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@bmagyar bmagyar merged commit 6ca4026 into humble Dec 6, 2023
12 of 14 checks passed
@bmagyar bmagyar deleted the mergify/bp/humble/pr-533 branch December 6, 2023 17:14
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.

3 participants