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

Auton overtake feature, as well as pylint fixes #39

Merged
merged 12 commits into from
Feb 14, 2024
Merged

Conversation

Jackack
Copy link
Collaborator

@Jackack Jackack commented Feb 3, 2024

What type of PR is this? (check all applicable)

  • Refactor
  • Feature
  • Bug Fix
  • Optimization
  • Documentation Update

Description

  • Added path planner.
  • Refactored autonsystem to run path planning.
  • Extended trajectory.py, world.py with methods required by path planner.
  • Added the ability to initialize new trajectory from a numpy array.
  • Fixed bug in path projection and vectorized the code.
  • Added command line options to autonsystem and integrated these options into the sim launch files.
  • Modified topic names so that NAND/SC topics do not conflict.
  • Added half-plane constraints to MPC code (this is not used for now, but might be interfaced with path planning later)
  • Adjusted Stanley controller heading error weight to reduce oscillation
  • Cleaned up code to conform to pylint

Related Tickets & Documents

  • Related Issue #
  • Closes #

QA Instructions, Screenshots, Recordings

To test auton overtaking in sim: run sim_2d_2buggies.launch
You will be able to visualize the movements of the 2 simulated buggies in Foxglove.

What you should see on the map visualization are 2 buggies. One will move faster and overtake another, staying 2 meters away at the closest.

Here's the ROSbag of the demo run: https://drive.google.com/file/d/1913GAiZg_PoAF8P0pv_pyOv-dJqz8pLd/view?usp=drive_link

Added/updated tests?

We encourage you to keep the code coverage percentage at 80% and above.

  • Yes
  • No, and this is why: please replace this line with details on why tests
    have not been included
  • I need help with writing tests

@Jackack
Copy link
Collaborator Author

Jackack commented Feb 3, 2024

Due to my git rebase skill issue, the CI commit, which was merged into this branch from main, got rebased :/

A lot of the delta should be due to fixing pylint errors (trailing whitespace, import orders, etc)

Copy link
Collaborator

@christianvluu christianvluu left a comment

Choose a reason for hiding this comment

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

We talked offline about adding documentation (function headers/file headers/etc.) at a later point right? Since we're rushing this out for now?

Otherwise, please see comments. I'll run it once it's fixed on my computer to validate.

Please update a screenshot or description of what I should expect during testing in the appropriate location in the PR template.

rb_ws/src/buggy/scripts/auton/autonsystem.py Outdated Show resolved Hide resolved
rb_ws/src/buggy/scripts/auton/path_planner.py Outdated Show resolved Hide resolved
rb_ws/src/buggy/scripts/auton/path_planner.py Outdated Show resolved Hide resolved
rb_ws/src/buggy/scripts/auton/path_planner.py Show resolved Hide resolved
rb_ws/src/buggy/scripts/auton/autonsystem.py Outdated Show resolved Hide resolved
rb_ws/src/buggy/scripts/auton/path_planner.py Outdated Show resolved Hide resolved
Copy link
Collaborator

@christianvluu christianvluu left a comment

Choose a reason for hiding this comment

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

Looks good, just please update the PR template as it includes information needed for people to actually PR this. Once that's updated, I will know how to run these tests and what I should expect.

@Jackack
Copy link
Collaborator Author

Jackack commented Feb 7, 2024

Updated PR template, feel free to check out the demo ROSbag and/or testing this code for yourself.

@christianvluu
Copy link
Collaborator

Tested this with a few scenarios on my own computer - looks good.

Added exec permission to velocity_ui.py
added if statement for selecting velocity source in launch config
Copy link
Collaborator

@christianvluu christianvluu left a comment

Choose a reason for hiding this comment

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

Under pressure to approve, but looks good

@Jackack Jackack merged commit 65677d0 into main Feb 14, 2024
3 checks passed
@Jackack Jackack deleted the AutonOvertake branch February 14, 2024 02:04
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.

None yet

2 participants