Merge pull request #7 from LTaoist/master

"loadRobotGraspData" code in "simple pick place"
davetcoleman · Jun 20, 2014 · ce75fb5 · ce75fb5
2 parents f22841c + 5250b8b
commit ce75fb5
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/clam_pick_place/config/clam_grasp_data.yaml b/clam_pick_place/config/clam_grasp_data.yaml
@@ -0,0 +1,11 @@
+base_link: 'base_link'
+
+gripper_group:
+  end_effector_name: 'gripper_group'
+  joints : ['gripper_finger_joint']
+  pregrasp_posture : [0.0]
+  grasp_posture : [1.0]
+  end_effector_parent_link : 'gripper_roll_link'
+  pregrasp_time_from_start : 4.0
+  grasp_time_from_start : 4.0
+  grasp_pose_to_eef : [0,0,0]
diff --git a/clam_pick_place/launch/pick_place.launch b/clam_pick_place/launch/pick_place.launch
@@ -0,0 +1,11 @@
+<launch>
+
+  <arg name="debug" default="true"/>
+  <rosparam command="load" file="$(find clam_pick_place)/config/clam_grasp_data.yaml"/>
+
+  <group>
+    <node name="$(anon simple_pick_place)" type="simple_pick_place" pkg="clam_pick_place">
+    </node>   
+  </group>
+
+</launch>
diff --git a/clam_pick_place/src/simple_pick_place.cpp b/clam_pick_place/src/simple_pick_place.cpp
@@ -269,8 +269,12 @@ int main(int argc, char **argv)
   // ---------------------------------------------------------------------------------------------
   // Load the Robot Viz Tools for publishing to Rviz
   rviz_tools_.reset(new moveit_visual_tools::VisualTools( BASE_LINK, RVIZ_MARKER_TOPIC));
-
 
+  if(!grasp_data_.loadRobotGraspData(nh, EE_GROUP))
+  {
+      ROS_ERROR_STREAM_NAMED("simple_pick_place", "Cannot load end_effector data");
+      return 1;
+  }
   // ---------------------------------------------------------------------------------------------
   // Load grasp generator
   moveit_simple_grasps_.reset(new moveit_simple_grasps::SimpleGrasps(rviz_tools_));