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

RSDK-9587 generate series of waypoints to cover surface given a pcd mesh #4719

Prev Previous commit
Next Next commit
Merge branch 'main' into 20241220_RSDK-9587-generate-series-of-waypoi…
…nts-to-cover-surface-given-a-pcd-mesh
biotinker committed Jan 27, 2025
commit 21960ed6e1934ed2612c8dd0a3f3d130c8151ecf
4 changes: 2 additions & 2 deletions motionplan/plan.go
Original file line number Diff line number Diff line change
@@ -372,8 +372,8 @@ func (p *PlanState) Configuration() referenceframe.FrameSystemInputs {
}

// ComputePoses returns the poses of a PlanState if they are populated, or computes them using the given FrameSystem if not.
func (p *PlanState) ComputePoses(fs referenceframe.FrameSystem) (PathState, error) {
if len(p.poses) > 0 {
func (p *PlanState) ComputePoses(fs referenceframe.FrameSystem) (referenceframe.FrameSystemPoses, error) {
if p.poses != nil {
return p.poses, nil
}

2 changes: 1 addition & 1 deletion motionplan/planManager.go
Original file line number Diff line number Diff line change
@@ -211,7 +211,7 @@ func (pm *planManager) planSingleAtomicWaypoint(
ctx context.Context,
wp atomicWaypoint,
maps *rrtMaps,
) (map[string][]referenceframe.Input, *resultPromise, error) {
) (referenceframe.FrameSystemInputs, *resultPromise, error) {
fromPoses, err := wp.startState.ComputePoses(pm.fs)
if err != nil {
return nil, nil, err
2 changes: 1 addition & 1 deletion motionplan/plannerOptions.go
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ const (
defaultRobotCollisionConstraintDesc = "Collision between a robot component that is moving and one that is stationary"

// When breaking down a path into smaller waypoints, add a waypoint every this many mm of movement.
defaultPathStateSize = 15
defaultStepSizeMM = 10

// This is commented out due to Go compiler bug. See comment in newBasicPlannerOptions for explanation.
// var defaultPlanner = newCBiRRTMotionPlanner.
You are viewing a condensed version of this merge commit. You can view the full changes here.