Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
S
sot-talos-balance
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
loco-3d
sot-talos-balance
Commits
8ff60747
Unverified
Commit
8ff60747
authored
4 years ago
by
Guilhem Saurel
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #6 from nim65s/devel
fix compatibility with pinocchio v2.4.5
parents
e296becb
61d5bd1d
Branches
Branches containing commit
Tags
v1.9.1
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/sot/talos_balance/robot/robot-wrapper.hh
+2
-2
2 additions, 2 deletions
include/sot/talos_balance/robot/robot-wrapper.hh
src/robot/robot-wrapper.cpp
+2
-2
2 additions, 2 deletions
src/robot/robot-wrapper.cpp
with
4 additions
and
4 deletions
include/sot/talos_balance/robot/robot-wrapper.hh
+
2
−
2
View file @
8ff60747
...
...
@@ -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
();
...
...
This diff is collapsed.
Click to expand it.
src/robot/robot-wrapper.cpp
+
2
−
2
View file @
8ff60747
...
...
@@ -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
);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment