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

[tricycle_controller] Use generate_parameter_library (backport #957) #990

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 29, 2024

This is an automatic backport of pull request #957 done by Mergify.
Cherry-pick of 8d732f1 has failed:

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

You are currently cherry-picking commit 8d732f1.
  (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:   tricycle_controller/CMakeLists.txt
	modified:   tricycle_controller/doc/userdoc.rst
	modified:   tricycle_controller/include/tricycle_controller/tricycle_controller.hpp
	modified:   tricycle_controller/package.xml
	new file:   tricycle_controller/src/tricycle_controller_parameter.yaml
	modified:   tricycle_controller/test/test_load_tricycle_controller.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tricycle_controller/src/tricycle_controller.cpp
	both modified:   tricycle_controller/test/test_tricycle_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

christophfroehlich and others added 2 commits March 13, 2024 17:48
(cherry picked from commit 8d732f1)

# Conflicts:
#	tricycle_controller/src/tricycle_controller.cpp
#	tricycle_controller/test/test_tricycle_controller.cpp
@christophfroehlich christophfroehlich force-pushed the mergify/bp/humble/pr-957 branch from 9492e13 to eb88798 Compare March 13, 2024 16:48
Copy link

codecov bot commented Mar 13, 2024

Codecov Report

Attention: Patch coverage is 60.60606% with 13 lines in your changes are missing coverage. Please review.

Project coverage is 71.71%. Comparing base (468e030) to head (eb88798).

Additional details and impacted files
@@            Coverage Diff             @@
##           humble     #990      +/-   ##
==========================================
- Coverage   72.15%   71.71%   -0.45%     
==========================================
  Files          40       40              
  Lines        3555     3496      -59     
  Branches     1787     1730      -57     
==========================================
- Hits         2565     2507      -58     
- Misses        679      684       +5     
+ Partials      311      305       -6     
Flag Coverage Δ
unittests 71.71% <60.60%> (-0.45%) ⬇️

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

Files Coverage Δ
...nclude/tricycle_controller/tricycle_controller.hpp 100.00% <ø> (ø)
tricycle_controller/src/tricycle_controller.cpp 60.58% <60.60%> (-6.69%) ⬇️

... and 1 file with indirect coverage changes

@bmagyar
Copy link
Member

bmagyar commented Mar 13, 2024

I'd say too late.

@bmagyar bmagyar closed this Mar 13, 2024
@mergify mergify bot deleted the mergify/bp/humble/pr-957 branch March 13, 2024 19:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants