Skip to content

Add calibrated skin#114

Merged
S-Dafarra merged 11 commits intofrugally_rebasedfrom
add_calibrated_skin
Jan 19, 2023
Merged

Add calibrated skin#114
S-Dafarra merged 11 commits intofrugally_rebasedfrom
add_calibrated_skin

Conversation

@GiulioRomualdi
Copy link
Copy Markdown
Collaborator

@GiulioRomualdi GiulioRomualdi commented Oct 20, 2022

⚠️ This PR needs to be merged before #113

Thanks to this PR it will be possible to use the calibrated skin provided by the skin manager to detect the roughness of an object.
The network model was provided at c33ecc7. The code used to generate the model can be found in paolo-viceconte/rock_classifier@381fcf4 (@paolo-viceconte)

Moreover this PR remove the fingertip actuation (@RiccardoGrieco) in 63aff82

Last but not least fixes the CI

@GiulioRomualdi GiulioRomualdi changed the base branch from master to frugally_rebased October 20, 2022 09:55
@GiulioRomualdi GiulioRomualdi force-pushed the add_calibrated_skin branch 2 times, most recently from c311614 to 7ffdb67 Compare October 24, 2022 17:48
@GiulioRomualdi GiulioRomualdi marked this pull request as ready for review January 19, 2023 09:41
# in case a calibration phase necessary before starting teleoperating the robot,
# otherwise read the calibration matrix from the config file
doCalibration 1
doCalibration 0
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you remember why this change is needed? (@RiccardoGrieco @lrapetti)

axesJointsCoupled 1

doCalibration 1
doCalibration 0
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above


bool GloveWearableImpl::setFingertipForceFeedbackValues(const std::vector<int>& values)
{
return true;
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed F2F, it would be nice to have a parameter to turn this on and off, rather than exiting prematurely. @RiccardoGrieco @lrapetti do you remember why this was needed?


bool GloveWearableImpl::setFingertipVibrotactileValues(const std::vector<int>& values)
{
return true;
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As above

m_Bias = Eigen::MatrixXd::Zero(m_numActuatedJoints, 1);

if (!m_doCalibration)
if (false && !m_doCalibration)
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably this false can be removed. @RiccardoGrieco @lrapetti, do you remember why it was needed?

@GiulioRomualdi
Copy link
Copy Markdown
Collaborator Author

The CI is failing but @S-Dafarra already fixed it in #118. I would merge the PR even if the CI fails and then rebase frugally_rebased on top of master

@S-Dafarra
Copy link
Copy Markdown
Collaborator

If you prefer, we can merge this as is and apply the comments above in frugally_rebased

@GiulioRomualdi
Copy link
Copy Markdown
Collaborator Author

GiulioRomualdi commented Jan 19, 2023

This would simplify the merging procedure :)

Let me apply #114 (comment)

…kin.cpp

Co-authored-by: Stefano Dafarra <stefano.dafarra@gmail.com>
@S-Dafarra S-Dafarra merged commit d4466b0 into frugally_rebased Jan 19, 2023
@GiulioRomualdi GiulioRomualdi deleted the add_calibrated_skin branch January 19, 2023 14:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants