Skip to content

Parking planner integration#203

Merged
krishauser merged 12 commits intos2025from
parking-planning-merge
May 15, 2025
Merged

Parking planner integration#203
krishauser merged 12 commits intos2025from
parking-planning-merge

Conversation

@AadarshHegde123
Copy link
Collaborator

This PR builds atop the recently merged Parking + Perception PR: #174

We add our planning logic on top of this PR to support the full end to end pipeline of perpendicular parking.

Copy link
Owner

@krishauser krishauser left a comment

Choose a reason for hiding this comment

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

Can you explain why you took out goal and added parking_goal? This seems to conflict with summoning / inspection

@AadarshHegde123
Copy link
Collaborator Author

Can you explain why you took out goal and added parking_goal? This seems to conflict with summoning / inspection

Oh, I did not realize they also make use of the same goal variable. The rename was just for clarity on our end. I can change this back.

@AadarshHegde123
Copy link
Collaborator Author

Changed parking_goal back to goal to avoid conflicts.

@AadarshHegde123
Copy link
Collaborator Author

@krishauser All good on our end for re-review. I see that there are a couple merge conflicts so I will note the differences and give explanations here:

gem_e4_dynamics.yaml: The gem e4 dynamics model we chose is selected because it prevents some obscure behavior in both simulator and on-board for our tests.

longitudinal_planning: The code is largely the same, but we have refactored such that hard-coding has been eliminated so you can now specify different arguments via the launch file.

route_planning_component.py: This conflict seemed pretty trivial since it was mainly complaining about a difference in imports and some helper functions from inspection team that were missing in our file. I fixed this in the web editor and marked as resolved.

Copy link
Owner

@krishauser krishauser left a comment

Choose a reason for hiding this comment

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

Need coordination with control team. Either @Jugthegreat can comment or message me to approve these changes.

Copy link
Owner

Choose a reason for hiding this comment

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

Was this cleared with the control team?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I spoke with Jugal. We had an out outdated pid_p value that we have now updated to match Controls. We do however need crosstrack_gain set to 0.5 and @Jugthegreat has agreed that this is an acceptable change.

Copy link
Owner

Choose a reason for hiding this comment

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

Was this cleared with the control team?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Control Team is using kris model so this may create some conflicts. I am talking with parking team to sort this out

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It seemed we had an outdated pid_p value that seemed to affect the kris model. We have re-tested with the kris_v1 model and performance is as expected. We have changed this file to match control team, so there should no longer be any issue.

Copy link
Owner

Choose a reason for hiding this comment

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

Did you clear this with the control team?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, I spoke with Jugal and he has said that Controls is fine with the changes made here.

@AadarshHegde123
Copy link
Collaborator Author

AadarshHegde123 commented May 15, 2025

@krishauser This should be ready again for re-review, we have talked everything over with controls team. In regards to the merge conflicts, I have resolved resolve parking_detection.py and route_planning_component.py, but the existing longitudinal_planning.py on s2025 from my tests seems non-functional (see attached video).

I propose having two separate motion_planning files, the current existing one on s2025 since I am guessing this is what worked for inspection team if they merged it, and this parking_motion_planning file that I have created. These files have diverged significantly to the point where I think its reasonable to have them separate. I have made this change to this branch.

Let me know if you have any concerns with this.

long_unfunctional.MOV

@sonarqubecloud
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
10.4% Duplication on New Code (required ≤ 3%)
C Reliability Rating on New Code (required ≥ A)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

Copy link
Owner

@krishauser krishauser left a comment

Choose a reason for hiding this comment

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

LGTM

@krishauser krishauser merged commit 39bcd62 into s2025 May 15, 2025
2 of 4 checks passed
@krishauser krishauser deleted the parking-planning-merge branch May 15, 2025 18:42
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.

7 participants