Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stack Of Tasks
sot-dynamic-pinocchio
Commits
f7271a3f
Commit
f7271a3f
authored
Jan 24, 2014
by
François Keith
Browse files
Merge pull request #6 from francois-keith/master
Add gripper frames and correct the initialization of the hand frames
parents
5d031641
88edc12f
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/dynamic_graph/sot/dynamics/humanoid_robot.py
View file @
f7271a3f
...
...
@@ -296,21 +296,18 @@ class AbstractHumanoidRobot (object):
# --- additional frames ---
self
.
frames
=
dict
()
frameName
=
'rightHand'
hp
=
self
.
dynamic
.
getHandParameter
(
True
)
transformation
=
list
(
map
(
list
,
I4
))
for
i
in
range
(
3
):
transformation
[
i
][
3
]
=
hp
[
i
][
3
]
transformation
=
tuple
(
map
(
tuple
,
transformation
))
self
.
frames
[
frameName
]
=
self
.
createFrame
(
"{0}_{1}"
.
format
(
self
.
name
,
frameName
),
transformation
,
"right-wrist"
)
self
.
dynamic
.
getHandParameter
(
True
),
"right-wrist"
)
# rightGripper is an alias for the rightHand:
self
.
frames
[
'rightGripper'
]
=
self
.
frames
[
frameName
]
frameName
=
'leftHand'
hp
=
self
.
dynamic
.
getHandParameter
(
False
)
transformation
=
list
(
map
(
list
,
I4
))
for
i
in
range
(
3
):
transformation
[
i
][
3
]
=
hp
[
i
][
3
]
transformation
=
tuple
(
map
(
tuple
,
transformation
))
self
.
frames
[
frameName
]
=
self
.
createFrame
(
"{0}_{1}"
.
format
(
self
.
name
,
frameName
),
self
.
dynamic
.
getHandParameter
(
False
),
"left-wrist"
)
# leftGripper is an alias for the leftHand:
self
.
frames
[
"leftGripper"
]
=
self
.
frames
[
frameName
]
for
(
frameName
,
transformation
,
signalName
)
in
self
.
AdditionalFrames
:
self
.
frames
[
frameName
]
=
self
.
createFrame
(
...
...
src/sot-dynamic.cpp
View file @
f7271a3f
...
...
@@ -436,7 +436,7 @@ Dynamic( const std::string & name, bool build )
" Get geometric parameters of hand.
\n
"
"
\n
"
" Input
\n
"
" - a boolean: whether right
foot
or not,
\n
"
" - a boolean: whether right
hand
or not,
\n
"
" Return
\n
"
" - a matrix 4 by 4 the columns of which respectively represent
\n
"
" - the thumb axis,
\n
"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment