Skip to content

Commit

Permalink
BREAKiNG CHANGE: Moves 'resting_threshold' and 'consecutive_samples' to
Browse files Browse the repository at this point in the history
base ns

This commit mose the `resting_threshold` and `consecutive_samples` to
the base ns since they also apply to the `gripper_action` action server
(see frankaemika#172).
  • Loading branch information
rickstaa committed Oct 4, 2021
1 parent 0a9563c commit f66f503
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions franka_gazebo/src/franka_gripper_sim.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ bool FrankaGripperSim::init(hardware_interface::EffortJointInterface* hw, ros::N
nh.param<double>("gripper_action/width_tolerance", this->tolerance_gripper_action_,
kDefaultGripperActionWidthTolerance);
nh.param<double>("gripper_action/speed", this->speed_default_, kDefaultGripperActionSpeed);
nh.param<double>("grasp/resting_threshold", this->speed_threshold_, kGraspRestingThreshold);
nh.param<int>("grasp/consecutive_samples", this->speed_samples_, kGraspConsecutiveSamples);
nh.param<double>("resting_threshold", this->speed_threshold_, kGraspRestingThreshold);
nh.param<int>("consecutive_samples", this->speed_samples_, kGraspConsecutiveSamples);

try {
this->finger1_ = hw->getHandle(finger1);
Expand Down

0 comments on commit f66f503

Please sign in to comment.