Skip to content

Commit

Permalink
Allow desired twists in velocity/CartesianAdmittance
Browse files Browse the repository at this point in the history
This was not possible before due to overwriting of desired twists by the force feedback
  • Loading branch information
Volksfest committed Aug 1, 2024
1 parent 78588f9 commit d92c6a7
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/tasks/velocity/CartesianAdmittance.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ void CartesianAdmittance::_update()
_wrench_filt = Eigen::Vector6d::Map(_filter.process(_tmp).data(), CHANNELS);


_desiredTwist = _C.asDiagonal()*_wrench_filt;
// Adding to the desired twist allows to still use a desired twist additionally
// given by Cartesian::setReference(..., const Eigen::Vector6d& desiredTwist)
_desiredTwist += _C.asDiagonal()*_wrench_filt;

Cartesian::_update();
}
Expand Down

0 comments on commit d92c6a7

Please sign in to comment.