-
Notifications
You must be signed in to change notification settings - Fork 15
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add the possibility to run the SkinRetargeting NN online #113
Open
GiulioRomualdi
wants to merge
21
commits into
master
Choose a base branch
from
frugally_rebased
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
bee3b10
Add parameter to add offsets on the human hand motion range
lrapetti 396fa6f
Update configuration file
lrapetti 06b9743
Add robot_to_human map parameter
lrapetti de2e127
Add timer to disable a finger if a taxel is activated for long time
lrapetti dad93ce
Test CNN for skin
GiulioRomualdi 6de390f
enable the vibration when the palm is active
GiulioRomualdi 4379fd6
Fix several bugs
GiulioRomualdi d3dd5a2
Minor changes on the vibrotactile
GiulioRomualdi c8e3ca2
Update Finger feedback vibration reset strategy
70973a2
Add temporary files before shipping the robot
GiulioRomualdi 971048b
Bugfix in RobotSkin::getPalmSkinMatrix()
GiulioRomualdi b775a1d
Add the possibility to get the calibrated skin in RobotSkin class
GiulioRomualdi 0e00cd9
Use alexnet32_25ep for inference
GiulioRomualdi 5dcf15b
Restore finger tactile long contact logic accordingly to LP
GiulioRomualdi 6a5e515
fix calibartion skin
07a22f1
Remove fingertip actuation
RiccardoGrieco a5a03f0
Avoid robot calibration
RiccardoGrieco e1d2b56
Install nlohmann json in GitHub CI
GiulioRomualdi e3920a2
Clean the code related to the rock roughness detection.
GiulioRomualdi 0f279e4
Use robotology-superbuild-dependencies-vcpk in GitHub CI
GiulioRomualdi 75d2f6d
Avoid to use integer as default value of a boolean variable in RobotS…
GiulioRomualdi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
name HapticGloveRetargeting | ||
|
||
|
||
[GENERAL] | ||
robot icub | ||
samplingTime 0.01 | ||
enableMoveRobot 1 | ||
enableLogger 0 | ||
useLeftHand 0 | ||
useRightHand 1 | ||
isMandatory 0 | ||
useSkin 1 | ||
#calibrationTimePeriod [sec] | ||
calibrationTimePeriod 8.0 | ||
#robotInitializationTime [sec] | ||
robotInitializationTime 3.0 | ||
getHumanMotionRange 1 | ||
# the counter to check if steady state is reached [steps] | ||
steadyStateCounterThreshold 5 | ||
# the threshold to check the error between the desired and feedback values for the steady state check [rad] | ||
steadyStateThreshold 0.05 | ||
# the time teleoperation should wait before running [sec] | ||
waitingDurationTime 5.0 | ||
# threshold in which an skin is considered as working fine [no units] | ||
tactileWorkingThreshold 0.0001 | ||
# threshold in which an skin data is considered updated [no units] | ||
tactileUpdateThreshold -1.0 | ||
|
||
# include fingers parameters | ||
[include LEFT_FINGERS_RETARGETING "leftFingersHapticRetargetingParams.ini"] | ||
[include RIGHT_FINGERS_RETARGETING "rightFingersHapticRetargetingParams.ini"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,8 +21,8 @@ joint_list ( "r_thumb_oppose", "r_thumb_proximal", "r_thumb_midd | |
|
||
# the custom axes home angle value [degrees] | ||
# By default it home values are set to min axis values | ||
# axis-name , axis value | ||
axes_custom_home_angle ( ( "r_thumb_oppose" , 30) ) | ||
# axis-name , axis value | ||
# axes_custom_home_angle ( ( ${AXES_NAME} , ${VAL}) ) | ||
|
||
# if a joint is not listed here, the sensory information is of encoder type. | ||
# notice that "r_thumb_oppose" and "r_hand_finger" is measured by joint encoders not the analog sensors | ||
|
@@ -64,12 +64,34 @@ wearable_data_actuator_ports_out "/WearableData/HapticGlove/RightHand/Actuators/ | |
|
||
wearable_data_actuator_ports_in "/WearableData/HapticGlove/RightHand/Actuators/input:i" | ||
|
||
# delta on human finger joint motion range | ||
motion_range_min_delta ( ( "r_thumb_oppose" , 30) ) | ||
|
||
############### | ||
### RETARGETING | ||
############### | ||
|
||
motorsJointsCoupled 1 | ||
|
||
# motion retargetin | ||
robot_to_human_map ( ("r_thumb_oppose", "r_thumb_oppose") | ||
("r_thumb_proximal", "r_thumb_proximal") | ||
("r_thumb_distal", "r_thumb_distal" ) | ||
("r_thumb_middle", "r_thumb_middle" ) | ||
("r_index_proximal", "r_index_proximal") | ||
("r_index_distal", "r_index_distal") | ||
("r_index_middle", "r_index_middle") | ||
("r_middle_proximal", "r_index_proximal") | ||
("r_middle_distal", "r_index_distal") | ||
("r_middle_middle", "r_index_middle") | ||
("r_ring_proximal", "r_ring_proximal") | ||
("r_ring_distal", "r_ring_distal") | ||
("r_ring_middle", "r_ring_middle") | ||
("r_pinky_proximal", "r_pinky_proximal") | ||
("r_pinky_distal", "r_pinky_distal") | ||
("r_pinky_middle", "r_pinky_middle") ) | ||
|
||
|
||
# haptic feedback retargeting from the robot axis groups to the human finger | ||
r_thumb_finger ( "r_thumb_oppose", "r_thumb_proximal", "r_thumb_distal" ) | ||
r_index_finger ( "r_hand_finger", "r_index_proximal", "r_index-distal" ) | ||
|
@@ -123,7 +145,7 @@ analog_sensors_raw_max_boundary ( 25.0 0.0 37.0 15.0 24.0 12.0 0.0 | |
# in case each joint does not have independant motor to actuate, they are coupled | ||
axesJointsCoupled 1 | ||
|
||
doCalibration 1 | ||
doCalibration 0 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here |
||
|
||
#robot controller exponential filter gain | ||
exponentialFilterGain 0.9 | ||
|
@@ -174,6 +196,9 @@ r_middle_finger_tactile_info ( 12 23 | |
r_ring_finger_tactile_info ( 24 35 0.14 1.0 200.0 0.5 3.0 40.0) | ||
r_little_finger_tactile_info ( 36 47 0.14 1.0 200.0 0.5 3.0 40.0) | ||
|
||
|
||
|
||
|
||
# absolute vibrotactile feedback nonlinear function parameters | ||
# 15.0 * std::log(2 * std::pow(x, 0.7) + 1) + 0.5 * std::pow(x, 1.1); | ||
# reference to https://github.com/ami-iit/element_retargeting-from-human/issues/182#issuecomment-1000472012 | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@RiccardoGrieco @lrapetti do you remember why this modification was necessary?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As far as I remember this should be a last-minute modification when we tried to remove the haptic force feedback. I would probably discard this change. (this code is not the one that is currently used in the robot right?)