Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
panda_grasping
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CeTI
ROS
ROS Packages
panda_grasping
Commits
ecbd9ea1
Commit
ecbd9ea1
authored
4 years ago
by
Sebastian Ebert
Browse files
Options
Downloads
Patches
Plain Diff
fixed some typos
parent
e6e2b28d
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/grasping/environment_util.h
+1
-1
1 addition, 1 deletion
src/grasping/environment_util.h
src/grasping/grasp_service.cpp
+3
-4
3 additions, 4 deletions
src/grasping/grasp_service.cpp
src/grasping/grasp_util.h
+2
-2
2 additions, 2 deletions
src/grasping/grasp_util.h
with
6 additions
and
7 deletions
src/grasping/environment_util.h
+
1
−
1
View file @
ecbd9ea1
...
...
@@ -32,7 +32,7 @@ public:
double
y_dimension
);
/**
* Adds a support surfac
c
e to the planning scene (with ID "bin).
* Adds a support surface to the planning scene (with ID "bin
"
).
* @param collision_objects current collision objects in the planning scene
* @param id id of the support surface to create
* @param object_x_dimension x dimension object to be picked
...
...
This diff is collapsed.
Click to expand it.
src/grasping/grasp_service.cpp
+
3
−
4
View file @
ecbd9ea1
...
...
@@ -29,12 +29,11 @@ tf2_ros::Buffer tfBuffer;
/**
* Move the robot to a pose between different pick/place-actions.
* Solves currently the problem of the wrong eef-to-object orientation.
* @param planning_scene_interface a valid PlanningSceneInterface instance
* @param group a initialized MoveGroupInterface instance
* @return true on success
*/
bool
movetoInitPose
(
moveit
::
planning_interface
::
PlanningSceneInterface
&
planning_scene_interface
,
moveit
::
planning_interface
::
MoveGroupInterface
&
group
)
{
bool
movetoInitPose
(
moveit
::
planning_interface
::
MoveGroupInterface
&
group
)
{
geometry_msgs
::
Pose
another_pose
;
another_pose
.
orientation
.
w
=
0
;
another_pose
.
orientation
.
x
=
0.981
;
...
...
@@ -100,7 +99,7 @@ bool pickObject(panda_grasping::PickObject::Request &req,
}
ROS_INFO
(
"Moving to initial pose."
);
if
(
!
movetoInitPose
(
planning_scene_interface
,
group
))
{
if
(
!
movetoInitPose
(
group
))
{
res
.
success
=
false
;
return
false
;
}
...
...
This diff is collapsed.
Click to expand it.
src/grasping/grasp_util.h
+
2
−
2
View file @
ecbd9ea1
...
...
@@ -50,7 +50,7 @@ public:
/**
* Util method to pick an object from above.
* @param move_group a initialized MoveGroupInterface instance
* @param move_group a
n
initialized MoveGroupInterface instance
* @param pick_pose via getPickFromAbovePose-method computed pre-pick-pose
* @param close_amount total close amount (space between "forks")
* @param open_amount total opening amount (space between "forks")
...
...
@@ -64,7 +64,7 @@ public:
/**
* Util method to place an object from above.
* @param move_group a initialized MoveGroupInterface instance
* @param move_group a
n
initialized MoveGroupInterface instance
* @param place_pose target place pose for the object
* @param close_amount total close amount (space between "forks")
* @param open_amount total opening amount (space between "forks")
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment