From 0635e31d0634a80b68b11b3c3bb468bfb1af99a2 Mon Sep 17 00:00:00 2001 From: Florian Walch <florian.walch@franka.de> Date: Mon, 29 Jan 2018 14:31:19 +0100 Subject: [PATCH] Remove gripper epsilon --- CHANGELOG.md | 1 - franka_gripper/CMakeLists.txt | 7 +------ franka_gripper/action/Grasp.action | 1 - franka_gripper/config/gripper_node_config.yaml | 3 --- .../include/franka_gripper/franka_gripper.h | 7 ++----- franka_gripper/msg/GraspEpsilon.msg | 2 -- franka_gripper/src/franka_gripper.cpp | 7 ++----- franka_gripper/src/franka_gripper_node.cpp | 16 ++-------------- 8 files changed, 7 insertions(+), 37 deletions(-) delete mode 100644 franka_gripper/msg/GraspEpsilon.msg diff --git a/CHANGELOG.md b/CHANGELOG.md index d1d879a..3ac9632 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,6 @@ ## 0.2.0 - UNRELEASED * Added missing run-time dependencies to `franka_description` and `franka_control` - * Added epsilon to grasp action * Added `m_ee`, `F_x_Cee`, `I_ee`, `m_total`, `F_x_Ctotal` and `I_total` to the robot state * Updated and improved examples diff --git a/franka_gripper/CMakeLists.txt b/franka_gripper/CMakeLists.txt index 04331c4..d0113f2 100644 --- a/franka_gripper/CMakeLists.txt +++ b/franka_gripper/CMakeLists.txt @@ -24,11 +24,6 @@ add_action_files( Move.action ) -add_message_files( - DIRECTORY msg - FILES GraspEpsilon.msg -) - generate_messages(DEPENDENCIES actionlib_msgs) catkin_package( @@ -45,7 +40,7 @@ catkin_package( ) add_library(franka_gripper -src/franka_gripper.cpp + src/franka_gripper.cpp ) add_dependencies(franka_gripper diff --git a/franka_gripper/action/Grasp.action b/franka_gripper/action/Grasp.action index a02b952..97fa832 100644 --- a/franka_gripper/action/Grasp.action +++ b/franka_gripper/action/Grasp.action @@ -1,5 +1,4 @@ float64 width # [m] -GraspEpsilon epsilon float64 speed # [m/s] float64 force # [N] --- diff --git a/franka_gripper/config/gripper_node_config.yaml b/franka_gripper/config/gripper_node_config.yaml index 8799cbd..f7546fd 100644 --- a/franka_gripper/config/gripper_node_config.yaml +++ b/franka_gripper/config/gripper_node_config.yaml @@ -3,6 +3,3 @@ joint_names: - panda_finger_joint1 - panda_finger_joint2 default_speed: 0.1 # [m/s] -default_grasp_epsilon: - inner: 0.005 # [m] - outer: 0.005 # [m] \ No newline at end of file diff --git a/franka_gripper/include/franka_gripper/franka_gripper.h b/franka_gripper/include/franka_gripper/franka_gripper.h index 6a80dc2..5b9d0b1 100644 --- a/franka_gripper/include/franka_gripper/franka_gripper.h +++ b/franka_gripper/include/franka_gripper/franka_gripper.h @@ -35,13 +35,11 @@ bool updateGripperState(const franka::Gripper& gripper, franka::GripperState* st * * @param[in] gripper A pointer to a franka gripper * @param[in] default_speed The default speed for a gripper action - * @param[in] grasp_epsilon The epsilon window of the grasp. * @param[in] action_server A pointer to a gripper action server * @param[in] goal A gripper action goal */ void gripperCommandExecuteCallback( const franka::Gripper& gripper, - const GraspEpsilon& grasp_epsilon, double default_speed, actionlib::SimpleActionServer<control_msgs::GripperCommandAction>* action_server, const control_msgs::GripperCommandGoalConstPtr& goal); @@ -78,10 +76,9 @@ bool stop(const franka::Gripper& gripper, const StopGoalConstPtr& /*goal*/); * Calls the libfranka grasp service of the gripper * * @param[in] gripper A gripper instance to execute the command - * @param[in] goal A grasp goal with target width, epsilon_inner, epsilon_outer, velocity and effort + * @param[in] goal A grasp goal with target width, velocity and effort * - * @return True if an object has been grasped, i.e.: the distance between the gripper fingers is - * (width - epsilon_inner) < distance < (width + epsilon_outer), false otherwise. + * @return True if an object has been grasped, false otherwise. */ bool grasp(const franka::Gripper& gripper, const GraspGoalConstPtr& goal); diff --git a/franka_gripper/msg/GraspEpsilon.msg b/franka_gripper/msg/GraspEpsilon.msg deleted file mode 100644 index b750cf6..0000000 --- a/franka_gripper/msg/GraspEpsilon.msg +++ /dev/null @@ -1,2 +0,0 @@ -float64 inner # [m] -float64 outer # [m] diff --git a/franka_gripper/src/franka_gripper.cpp b/franka_gripper/src/franka_gripper.cpp index a58493d..5f7ffc6 100644 --- a/franka_gripper/src/franka_gripper.cpp +++ b/franka_gripper/src/franka_gripper.cpp @@ -29,7 +29,6 @@ bool updateGripperState(const franka::Gripper& gripper, franka::GripperState* st void gripperCommandExecuteCallback( const franka::Gripper& gripper, - const GraspEpsilon& grasp_epsilon, double default_speed, actionlib::SimpleActionServer<control_msgs::GripperCommandAction>* action_server, const control_msgs::GripperCommandGoalConstPtr& goal) { @@ -43,8 +42,7 @@ void gripperCommandExecuteCallback( if (goal->command.position >= state.width) { return gripper.move(goal->command.position, default_speed); } - return gripper.grasp(goal->command.position, default_speed, goal->command.max_effort, - grasp_epsilon.inner, grasp_epsilon.outer); + return gripper.grasp(goal->command.position, default_speed, goal->command.max_effort); }; try { @@ -79,8 +77,7 @@ bool stop(const franka::Gripper& gripper, const StopGoalConstPtr& /*goal*/) { } bool grasp(const franka::Gripper& gripper, const GraspGoalConstPtr& goal) { - return gripper.grasp(goal->width, goal->speed, goal->force, goal->epsilon.inner, - goal->epsilon.outer); + return gripper.grasp(goal->width, goal->speed, goal->force); } } // namespace franka_gripper diff --git a/franka_gripper/src/franka_gripper_node.cpp b/franka_gripper/src/franka_gripper_node.cpp index 8b5b5ea..31ed7c2 100644 --- a/franka_gripper/src/franka_gripper_node.cpp +++ b/franka_gripper/src/franka_gripper_node.cpp @@ -38,7 +38,6 @@ void handleErrors(actionlib::SimpleActionServer<T_action>* server, using actionlib::SimpleActionServer; using control_msgs::GripperCommandAction; using franka_gripper::GraspAction; -using franka_gripper::GraspEpsilon; using franka_gripper::GraspGoalConstPtr; using franka_gripper::GraspResult; using franka_gripper::HomingAction; @@ -71,17 +70,6 @@ int main(int argc, char** argv) { ROS_INFO_STREAM("franka_gripper_node: Found default_speed " << default_speed); } - GraspEpsilon default_grasp_epsilon; - default_grasp_epsilon.inner = 0.005; - default_grasp_epsilon.outer = 0.005; - std::map<std::string, double> epsilon_map; - if (node_handle.getParam("default_grasp_epsilon", epsilon_map)) { - ROS_INFO_STREAM("franka_gripper_node: Found default_grasp_epsilon " - << "inner: " << epsilon_map["inner"] << ", outer: " << epsilon_map["outer"]); - default_grasp_epsilon.inner = epsilon_map["inner"]; - default_grasp_epsilon.outer = epsilon_map["outer"]; - } - franka::Gripper gripper(robot_ip); std::function<bool(const HomingGoalConstPtr&)> homing_handler = @@ -116,8 +104,8 @@ int main(int argc, char** argv) { SimpleActionServer<GripperCommandAction> gripper_command_action_server( node_handle, "gripper_action", - std::bind(&gripperCommandExecuteCallback, std::cref(gripper), default_grasp_epsilon, - default_speed, &gripper_command_action_server, std::placeholders::_1), + std::bind(&gripperCommandExecuteCallback, std::cref(gripper), default_speed, + &gripper_command_action_server, std::placeholders::_1), false); homing_action_server_.start(); -- GitLab