-
Notifications
You must be signed in to change notification settings - Fork 443
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
Improve spacemouse #561
Open
squarefk
wants to merge
9
commits into
ARISE-Initiative:master
Choose a base branch
from
squarefk:improve-spacemouse
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.
+189
−70
Open
Improve spacemouse #561
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
3e9e92f
Reduce waist movement, modify finger movement speed and remake sites
64d4e74
Add pinch spheres and tune mink
fdea8d5
SpaceMouse supports bimanual teleop
8a04241
Fix out-of-bound with single SpaceMouse
a2b74ed
Add missing comments
0f0a66a
Reformat files
7e7df3e
Adjust based on reviews
fc86b58
Revert unnecessary changes
e44486a
Revert changes in the inspire hands
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
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 |
---|---|---|
|
@@ -84,7 +84,7 @@ | |
<site name="ee_y" pos="0 0.1 0" size="0.005 .1" quat="0.707105 0.707108 0 0" rgba="0 1 0 0" type="cylinder" group="1"/> | ||
<site name="ee_z" pos="0 0 0.1" size="0.005 .1" quat="1 0 0 0" rgba="0 0 1 0" type="cylinder" group="1"/> | ||
<!-- This site was added for visualization. --> | ||
<site name="grip_site_cylinder" pos="0 0 0" quat="-0.5 -0.5 -0.5 0.5" size="0.005 0.5" rgba="0 1 0 0.3" type="cylinder" group="1"/> | ||
<site name="grip_site_cylinder" pos="0 0 0" quat="-0.5 -0.5 -0.5 0.5" size="0.005 0.5" rgba="0 1 0 0" type="cylinder" group="1"/> | ||
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. reason for change? 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. Make the long ray invisible. |
||
</body> | ||
|
||
|
||
|
@@ -94,7 +94,10 @@ | |
<geom name="l_palm_vis" type="mesh" mesh="l_palm_vis" material="l_base_material" group="1" contype="0" conaffinity="0"/> | ||
<!-- Palm Collision --> | ||
<geom name="l_palm_col" type="mesh" mesh="l_palm_col" mass="0.1" /> | ||
|
||
<site name="l_pinch_sphere_0" pos="-0.06 -0.12 0.03" size="0.01 0.01 0.01" rgba="1 0 0 1" type="sphere" group="1"/> | ||
<site name="r_pinch_sphere_1" pos="-0.06 -0.12 0.01" size="0.01 0.01 0.01" rgba="1 0.5 0.5 0.5" type="sphere" group="1"/> | ||
<site name="r_pinch_sphere_2" pos="-0.06 -0.12 -0.01" size="0.01 0.01 0.01" rgba="1 0.5 0.5 0.5" type="sphere" group="1"/> | ||
<site name="r_pinch_sphere_3" pos="-0.06 -0.12 -0.03" size="0.01 0.01 0.01" rgba="1 0.5 0.5 0.5" type="sphere" group="1"/> | ||
<!-- Thumb --> | ||
<body name="l_thumb" pos="0. 0. 0."> | ||
<!-- Thumb Proximal 1 --> | ||
|
@@ -124,6 +127,7 @@ | |
<geom name="l_thumb_distal_vis" type="mesh" mesh="l_thumb_distal_vis" material="l_thumb_distal_material" group="1" contype="0" conaffinity="0"> </geom> | ||
<geom name="l_thumb_distal_col" type="mesh" mesh="l_thumb_distal_col" mass="0.1" /> | ||
<site name="site_l_thumb_distal" size="0.01" material="site_left_hand"/> | ||
<site name="l_thumb_distal_site_cylinder" pos="0.04242 -0.04242 -0.006" quat="0.7071 0.5 0.5 0" size="0.002 0.06" rgba="0 1 0 0.3" type="cylinder" group="1"/> | ||
</body> | ||
<!-- End of Thumb Distal --> | ||
</body> | ||
|
@@ -149,6 +153,7 @@ | |
<site name="site_l_index_distal" size="0.01" material="site_left_hand"/> | ||
<geom name="l_index_distal_vis" type="mesh" mesh="l_index_distal_vis" material="l_index_material" group="1" contype="0" conaffinity="0"/> | ||
<geom name="l_index_distal_col" type="mesh" mesh="l_index_distal_col" mass="0.1" /> | ||
<site name="l_index_distal_site_cylinder" pos="0 -0.06 -0.005" quat="0.7071 0.7071 0 0" size="0.002 0.06" rgba="0 1 0 0.3" type="cylinder" group="1"/> | ||
</body> | ||
<!-- End of Index Distal --> | ||
</body> | ||
|
@@ -169,6 +174,7 @@ | |
<site name="site_l_middle_distal" size="0.01" material="site_left_hand"/> | ||
<geom name="l_middle_distal_vis" type="mesh" mesh="l_middle_distal_vis" material="l_middle_material" group="1" contype="0" conaffinity="0"/> | ||
<geom name="l_middle_distal_col" type="mesh" mesh="l_middle_distal_col" mass="0.1" /> | ||
<site name="l_middle_distal_site_cylinder" pos="0 -0.06 -0.005" quat="0.7071 0.7071 0 0" size="0.002 0.06" rgba="0 1 0 0.3" type="cylinder" group="1"/> | ||
</body> | ||
<!-- End of Middle Distal --> | ||
</body> | ||
|
@@ -190,6 +196,7 @@ | |
<site name="site_l_ring_distal" size="0.01" material="site_left_hand"/> | ||
<geom name="l_ring_distal_vis" type="mesh" mesh="l_ring_distal_vis" material="l_ring_material" group="1" contype="0" conaffinity="0"/> | ||
<geom name="l_ring_distal_col" type="mesh" mesh="l_ring_distal_col" mass="0.1" /> | ||
<site name="l_ring_distal_site_cylinder" pos="0 -0.06 -0.005" quat="0.7071 0.7071 0 0" size="0.002 0.06" rgba="0 1 0 0.3" type="cylinder" group="1"/> | ||
</body> | ||
<!-- End of Ring Distal --> | ||
</body> | ||
|
@@ -211,6 +218,7 @@ | |
<site name="site_l_pinky_distal" size="0.01" material="site_left_hand"/> | ||
<geom name="l_pinky_distal_vis" type="mesh" mesh="l_pinky_distal_vis" material="l_pinky_material" group="1" contype="0" conaffinity="0"/> | ||
<geom name="l_pinky_distal_col" type="mesh" mesh="l_pinky_distal_col" mass="0.1" /> | ||
<site name="l_pinky_distal_site_cylinder_5" pos="0 -0.06 -0.005" quat="0.7071 0.7071 0 0" size="0.002 0.06" rgba="0 1 0 0.3" type="cylinder" group="1"/> | ||
</body> | ||
<!-- End of Pinky Distal --> | ||
</body> | ||
|
Oops, something went wrong.
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.
can we add some red sites for when each of the other 3 fingers are closed? in a lighter shade of red than the current red color marker of the hand
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.
Done.