mergify[bot]
commented
4 months ago Cherry-pick of d076ea2fe0555e8dc44cea1e3f9b4fc261ec4d1c has failed:
On branch mergify/bp/humble/pr-954
Your branch is up to date with 'origin/humble'.
You are currently cherry-picking commit d076ea2.
(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/doc/userdoc.rst
modified: doc/controllers_index.rst
new file: doc/images/.gitignore
new file: doc/images/ackermann_steering.drawio
new file: doc/images/ackermann_steering.svg
new file: doc/images/ackermann_steering_traction.drawio
new file: doc/images/ackermann_steering_traction.svg
new file: doc/images/car_like_robot.drawio
new file: doc/images/car_like_robot.svg
new file: doc/images/diff_drive.drawio
new file: doc/images/diff_drive.svg
new file: doc/images/double_traction.drawio
new file: doc/images/double_traction.svg
new file: doc/images/unicycle.drawio
new file: doc/images/unicycle.svg
new file: doc/mobile_robot_kinematics.rst
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: steering_controllers_library/doc/userdoc.rst
both modified: tricycle_controller/doc/userdoc.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
This is the first step of #931, but I focused only on steering on the front axle for now. Edit: I also added the diff-drive kinematics to have a complete documentation.
After peer-reviewing of the equations I'd start to rename the variables of the library to match the doc and fix possible bugs.
rendered docs (updated 5d6aee7)
This is an automatic backport of pull request #954 done by Mergify.