Skip to content

Simplify on_set_chained_mode avoiding cpplint warnings (backport #1564)#1687

Merged
christophfroehlich merged 3 commits intohumblefrom
mergify/bp/humble/pr-1564
May 17, 2025
Merged

Simplify on_set_chained_mode avoiding cpplint warnings (backport #1564)#1687
christophfroehlich merged 3 commits intohumblefrom
mergify/bp/humble/pr-1564

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented May 17, 2025

Fixed warnings generated by cpplint/cpplint#131 on some of the controllers that implement the chained mode.


This is an automatic backport of pull request #1564 done by Mergify.

…ngs (#1564)

(cherry picked from commit d8dc4b1)

# Conflicts:
#	diff_drive_controller/src/diff_drive_controller.cpp
#	pid_controller/src/pid_controller.cpp
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented May 17, 2025

Cherry-pick of d8dc4b1 has failed:

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

You are currently cherry-picking commit d8dc4b1.
  (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:   mecanum_drive_controller/src/mecanum_drive_controller.cpp
	modified:   steering_controllers_library/src/steering_controllers_library.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   diff_drive_controller/src/diff_drive_controller.cpp
	both modified:   pid_controller/src/pid_controller.cpp

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

@mergify mergify bot added the conflicts label May 17, 2025
@christophfroehlich christophfroehlich changed the title fixed on_set_chained_mode implementations to avoid cpplint warnings (backport #1564) Simplify on_set_chained_mode avoiding cpplint warnings (backport #1564) May 17, 2025
@christophfroehlich christophfroehlich merged commit f182e41 into humble May 17, 2025
10 of 13 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-1564 branch May 17, 2025 17:00
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