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

chore: sync upstream #585

Merged
merged 2 commits into from
Jun 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@ repos:
args: [--quiet]
exclude: .cu

- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.23.2
hooks:
- id: check-metaschema
files: ^.+/schema/.*schema\.json$

- repo: local
hooks:
- id: prettier-svg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,6 @@ bool GeometricParallelParking::planPullOut(
// set pull_out velocity to arc paths and 0 velocity to end point
constexpr bool set_stop_end = false;
setVelocityToArcPaths(arc_paths, parameters_.pull_out_velocity, set_stop_end);
arc_paths.back().points.front().point.longitudinal_velocity_mps = 0.0;

// combine the road center line path with the second arc path
auto paths = arc_paths;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,10 @@ boost::optional<PullOutPath> GeometricPullOut::plan(Pose start_pose, Pose goal_p

if (parameters_.divide_pull_out_path) {
output.partial_paths = planner_.getPaths();
// insert stop velocity to first arc path end
output.partial_paths.front().points.back().point.longitudinal_velocity_mps = 0.0;
} else {
auto partial_paths = planner_.getPaths();
// remove stop velocity of first arc path
partial_paths.front().points.back().point.longitudinal_velocity_mps =
parallel_parking_parameters_.pull_out_velocity;
const auto combined_path = combineReferencePath(partial_paths.at(0), partial_paths.at(1));
output.partial_paths.push_back(combined_path);
}
Expand Down