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
loco-3d
sot-talos-balance
Commits
61d5bd1d
Commit
61d5bd1d
authored
May 26, 2020
by
Guilhem Saurel
Browse files
fix compatibility with pinocchio v2.4.5
ref
https://github.com/stack-of-tasks/pinocchio/pull/1220
parent
e296becb
Changes
2
Hide whitespace changes
Inline
Side-by-side
include/sot/talos_balance/robot/robot-wrapper.hh
View file @
61d5bd1d
...
...
@@ -116,9 +116,9 @@ class RobotWrapper {
void
frameClassicAcceleration
(
const
Data
&
data
,
const
Model
::
FrameIndex
index
,
Motion
&
frameAcceleration
)
const
;
void
frameJacobianWorld
(
const
Data
&
data
,
const
Model
::
FrameIndex
index
,
Data
::
Matrix6x
&
J
)
const
;
void
frameJacobianWorld
(
Data
&
data
,
const
Model
::
FrameIndex
index
,
Data
::
Matrix6x
&
J
)
const
;
void
frameJacobianLocal
(
const
Data
&
data
,
const
Model
::
FrameIndex
index
,
Data
::
Matrix6x
&
J
)
const
;
void
frameJacobianLocal
(
Data
&
data
,
const
Model
::
FrameIndex
index
,
Data
::
Matrix6x
&
J
)
const
;
protected:
void
updateMd
();
...
...
src/robot/robot-wrapper.cpp
View file @
61d5bd1d
...
...
@@ -166,11 +166,11 @@ void RobotWrapper::frameClassicAcceleration(const Data& data, const Model::Frame
frameAcceleration
.
linear
()
+=
v
.
angular
().
cross
(
v
.
linear
());
}
void
RobotWrapper
::
frameJacobianWorld
(
const
Data
&
data
,
const
Model
::
FrameIndex
index
,
Data
::
Matrix6x
&
J
)
const
{
void
RobotWrapper
::
frameJacobianWorld
(
Data
&
data
,
const
Model
::
FrameIndex
index
,
Data
::
Matrix6x
&
J
)
const
{
return
pinocchio
::
getFrameJacobian
(
m_model
,
data
,
index
,
pinocchio
::
WORLD
,
J
);
}
void
RobotWrapper
::
frameJacobianLocal
(
const
Data
&
data
,
const
Model
::
FrameIndex
index
,
Data
::
Matrix6x
&
J
)
const
{
void
RobotWrapper
::
frameJacobianLocal
(
Data
&
data
,
const
Model
::
FrameIndex
index
,
Data
::
Matrix6x
&
J
)
const
{
return
pinocchio
::
getFrameJacobian
(
m_model
,
data
,
index
,
pinocchio
::
LOCAL
,
J
);
}
...
...
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