Skip to content

Commit efa4443

Browse files
Fix left-overs from latest rebase
1 parent 55252d9 commit efa4443

File tree

2 files changed

+0
-32
lines changed

2 files changed

+0
-32
lines changed

cartesian_compliance_controller/src/cartesian_compliance_controller.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,6 @@ rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn Cartes
110110
return TYPE::ERROR;
111111
}
112112

113-
// Make sure sensor wrenches are interpreted correctly
114-
ForceBase::setFtSensorReferenceFrame(m_compliance_ref_link);
115-
116113
return TYPE::SUCCESS;
117114
}
118115

cartesian_force_controller/src/cartesian_force_controller.cpp

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,6 @@ rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn Cartes
9797
return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::ERROR;
9898
}
9999

100-
// Make sure sensor wrenches are interpreted correctly
101-
setFtSensorReferenceFrame(Base::m_end_effector_link);
102-
103100
m_target_wrench_subscriber = get_node()->create_subscription<geometry_msgs::msg::WrenchStamped>(
104101
"target_wrench", 10, std::bind(&CartesianForceController::targetWrenchCallback, this, std::placeholders::_1));
105102

@@ -171,32 +168,6 @@ ctrl::Vector6D CartesianForceController::computeForceError()
171168
}
172169

173170
return m_ft_sensor_wrench + target_wrench;
174-
#endif
175-
}
176-
177-
void CartesianForceController::setFtSensorReferenceFrame(const std::string& new_ref)
178-
{
179-
// Compute static transform from the force torque sensor to the new reference
180-
// frame of interest.
181-
m_new_ft_sensor_ref = new_ref;
182-
183-
// Joint positions should cancel out, i.e. it doesn't matter as long as they
184-
// are the same for both transformations.
185-
KDL::JntArray jnts(Base::m_ik_solver->getPositions());
186-
187-
KDL::Frame sensor_ref;
188-
Base::m_forward_kinematics_solver->JntToCart(
189-
jnts,
190-
sensor_ref,
191-
m_ft_sensor_ref_link);
192-
193-
KDL::Frame new_sensor_ref;
194-
Base::m_forward_kinematics_solver->JntToCart(
195-
jnts,
196-
new_sensor_ref,
197-
m_new_ft_sensor_ref);
198-
199-
m_ft_sensor_transform = new_sensor_ref.Inverse() * sensor_ref;
200171
}
201172

202173
void CartesianForceController::computeFtSensorTransform(const std::string& sensor_ref,

0 commit comments

Comments
 (0)