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
Pierre Fernbach
tsid
Commits
8cef8ccc
Commit
8cef8ccc
authored
Jan 17, 2018
by
Carlos Mastalli
Browse files
[upd] Updated tsid with the latest version of pinocchio
parent
d84c536d
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/robots/robot-wrapper.cpp
View file @
8cef8ccc
...
...
@@ -170,14 +170,14 @@ namespace tsid
const
Model
::
JointIndex
index
,
Data
::
Matrix6x
&
J
)
const
{
return
se3
::
getJacobian
<
false
>
(
m_model
,
data
,
index
,
J
);
return
se3
::
getJacobian
<
se3
::
WORLD
>
(
m_model
,
data
,
index
,
J
);
}
void
RobotWrapper
::
jacobianLocal
(
const
Data
&
data
,
const
Model
::
JointIndex
index
,
Data
::
Matrix6x
&
J
)
const
{
return
se3
::
getJacobian
<
true
>
(
m_model
,
data
,
index
,
J
);
return
se3
::
getJacobian
<
se3
::
LOCAL
>
(
m_model
,
data
,
index
,
J
);
}
SE3
RobotWrapper
::
framePosition
(
const
Data
&
data
,
...
...
@@ -249,14 +249,15 @@ namespace tsid
const
Model
::
FrameIndex
index
,
Data
::
Matrix6x
&
J
)
const
{
return
se3
::
getFrameJacobian
<
false
>
(
m_model
,
data
,
index
,
J
);
return
se3
::
getFrameJacobian
(
m_model
,
data
,
index
,
J
);
}
void
RobotWrapper
::
frameJacobianLocal
(
const
Data
&
data
,
const
Model
::
FrameIndex
index
,
Data
::
Matrix6x
&
J
)
const
{
return
se3
::
getFrameJacobian
<
true
>
(
m_model
,
data
,
index
,
J
);
//se3::framesForwardKinematics(*m_model, data);//TODO ask Andrea if we need this
return
se3
::
getFrameJacobian
(
m_model
,
data
,
index
,
J
);
}
// const Vector3 & com(Data & data,const Vector & q,
...
...
Write
Preview
Markdown
is supported
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