Skip to content

Commit

Permalink
Make adding mesh optional to motion planning
Browse files Browse the repository at this point in the history
  • Loading branch information
marrts authored and marip8 committed May 29, 2024
1 parent ae91234 commit d85d2a6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
6 changes: 4 additions & 2 deletions snp_motion_planning/src/planning_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,8 @@ class PlanningServer
tesseract_planning::CompositeInstruction program = createProgram(manip_info, fromMsg(req->tool_paths));

// Add the scan link to the planning environment
addScanLink(req->mesh_filename, req->mesh_frame);
if (!req->mesh_filename.empty())
addScanLink(req->mesh_filename, req->mesh_frame);

// Invoke the planner
auto pd = createProfileDictionary();
Expand Down Expand Up @@ -649,7 +650,8 @@ class PlanningServer
tesseract_planning::MoveInstructionType::FREESPACE, PROFILE, manip_info));

// Add the scan link to the planning environment
addScanLink(req->mesh_filename, req->mesh_frame);
if (!req->mesh_filename.empty())
addScanLink(req->mesh_filename, req->mesh_frame);

// Invoke the planner
auto pd = createProfileDictionary();
Expand Down
2 changes: 1 addition & 1 deletion snp_msgs/srv/GenerateFreespaceMotionPlan.srv
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ sensor_msgs/JointState js2

# Mesh - this is the scanned mesh which toolpaths were generated on. Any path generated should be
# checked for collision against this mesh to ensure we don't hit it by mistake.
string mesh_filename
string mesh_filename # Optional - If left empty then no mesh will be added
string mesh_frame

---
Expand Down
2 changes: 1 addition & 1 deletion snp_msgs/srv/GenerateMotionPlan.srv
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ string tcp_frame

# Mesh - this is the scanned mesh which toolpaths were generated on. Any path generated should be
# checked for collision against this mesh to ensure we don't hit it by mistake.
string mesh_filename
string mesh_filename # Optional - If left empty then no mesh will be added
string mesh_frame

---
Expand Down

0 comments on commit d85d2a6

Please sign in to comment.