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
7536341a
Commit
7536341a
authored
4 years ago
by
Johannes Mey
Browse files
Options
Downloads
Patches
Plain Diff
make height of pre-grasp pose configurable
parent
61a8296d
No related branches found
No related tags found
1 merge request
!2
Feature/public grasp side
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/grasping/grasp_util.cpp
+2
-2
2 additions, 2 deletions
src/grasping/grasp_util.cpp
src/grasping/grasp_util.h
+2
-1
2 additions, 1 deletion
src/grasping/grasp_util.h
with
4 additions
and
3 deletions
src/grasping/grasp_util.cpp
+
2
−
2
View file @
7536341a
...
@@ -38,7 +38,7 @@ void GraspUtil::setupClosedGripper(trajectory_msgs::JointTrajectory &posture, do
...
@@ -38,7 +38,7 @@ void GraspUtil::setupClosedGripper(trajectory_msgs::JointTrajectory &posture, do
geometry_msgs
::
Pose
geometry_msgs
::
Pose
GraspUtil
::
getPickFromAbovePose
(
geometry_msgs
::
Pose
&
object_to_pick_pose
,
geometry_msgs
::
Vector3
dimensions
,
GraspUtil
::
getPickFromAbovePose
(
geometry_msgs
::
Pose
&
object_to_pick_pose
,
geometry_msgs
::
Vector3
dimensions
,
tf2
::
Quaternion
orientation_gripper
)
{
tf2
::
Quaternion
orientation_gripper
,
double
height
)
{
geometry_msgs
::
Pose
target_pose
;
geometry_msgs
::
Pose
target_pose
;
...
@@ -58,7 +58,7 @@ GraspUtil::getPickFromAbovePose(geometry_msgs::Pose &object_to_pick_pose, geomet
...
@@ -58,7 +58,7 @@ GraspUtil::getPickFromAbovePose(geometry_msgs::Pose &object_to_pick_pose, geomet
target_pose
.
orientation
=
tf2
::
toMsg
(
orientation
);
target_pose
.
orientation
=
tf2
::
toMsg
(
orientation
);
target_pose
.
position
.
x
=
object_to_pick_pose
.
position
.
x
;
target_pose
.
position
.
x
=
object_to_pick_pose
.
position
.
x
;
target_pose
.
position
.
y
=
object_to_pick_pose
.
position
.
y
;
target_pose
.
position
.
y
=
object_to_pick_pose
.
position
.
y
;
target_pose
.
position
.
z
=
object_to_pick_pose
.
position
.
z
+
0.5
*
dimensions
.
z
+
0.1
;
target_pose
.
position
.
z
=
object_to_pick_pose
.
position
.
z
+
0.5
*
dimensions
.
z
+
height
;
return
target_pose
;
return
target_pose
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/grasping/grasp_util.h
+
2
−
1
View file @
7536341a
...
@@ -42,11 +42,12 @@ public:
...
@@ -42,11 +42,12 @@ public:
* @param object_to_pick_pose pose of the object to pick (currently only vertically oriented objects are supported)
* @param object_to_pick_pose pose of the object to pick (currently only vertically oriented objects are supported)
* @param dimensions of the object
* @param dimensions of the object
* @param orientation_gripper current gripper orientation
* @param orientation_gripper current gripper orientation
* @param height specifies how much the pose is above the object
* @return the "pre-pick"-pose
* @return the "pre-pick"-pose
*/
*/
geometry_msgs
::
Pose
geometry_msgs
::
Pose
getPickFromAbovePose
(
geometry_msgs
::
Pose
&
object_to_pick_pose
,
geometry_msgs
::
Vector3
dimensions
,
getPickFromAbovePose
(
geometry_msgs
::
Pose
&
object_to_pick_pose
,
geometry_msgs
::
Vector3
dimensions
,
tf2
::
Quaternion
orientation_gripper
);
tf2
::
Quaternion
orientation_gripper
,
double
height
=
0.1
);
/**
/**
* Util method to pick an object from above.
* Util method to pick an object from above.
...
...
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