Skip to content

Fixes from ros 2 main#1

Merged
ErikOrjehag merged 2 commits intoreloxfrom
fixes-from-ros-2-main
Jun 3, 2024
Merged

Fixes from ros 2 main#1
ErikOrjehag merged 2 commits intoreloxfrom
fixes-from-ros-2-main

Conversation

@ErikOrjehag
Copy link
Copy Markdown

Tried to separate out all of relox own modifications. It was possible to do for the nav2_controller package and
nav2_regulated_pure_pursuit_controller package. Also disabled the linter and auto formatter to not get a bunch of noop diff changes which are difficult to review.

But for the smac planner package we have here a mix of relox own modifications and changes coming from upstream when we once updated the package to get some upstream fixes to avoid costly areas better. That made it too difficult to separate things out so i just copied the entire folder from ros-2-main which also brought in a lot of linting and auto-formatting diffs, I don't think it's worth trying to undo the formatting. This PR branches out from the upstream galactic branch. When we move to humble, we need to try to rebase these changes on the humble branch, which will probably involve some manual labor and additional testing.

Here are all of our PRs relating to modifications in nav2 that I could find in ros-2-main:

=== nav2_controller ===

=== nav2_smac_planner ===

=== nav2_regulated_pure_pursuit_controller ===
blame: https://github.com/relox-robotics/ros-2-main/blame/main/src/nav2_regulated_pure_pursuit_controller/src/regulated_pure_pursuit_controller.cpp#L364

@ErikOrjehag ErikOrjehag self-assigned this May 22, 2024
@ErikOrjehag ErikOrjehag requested a review from isactornberg May 22, 2024 05:13
Copy link
Copy Markdown
Collaborator

@isactornberg isactornberg left a comment

Choose a reason for hiding this comment

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

As long as it's tested I trust it has the changes we need 😄

@ErikOrjehag ErikOrjehag merged commit c7a911f into relox Jun 3, 2024
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