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
Commits
0eec5461
Commit
0eec5461
authored
Jun 03, 2014
by
Mehdi Benallegue
Browse files
Correct computations of the X component of the ZMP
Correct also the linear force part of the Y component of the ZMP.
parent
1f05be49
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/zmp-from-forces.cpp
View file @
0eec5461
...
...
@@ -97,10 +97,9 @@ namespace sot {
const
MatrixHomogeneous
&
M
=
sensorPositionsSIN_
[
i
]
->
access
(
time
);
fz
[
i
]
=
M
(
2
,
0
)
*
f
(
0
)
+
M
(
2
,
1
)
*
f
(
1
)
+
M
(
2
,
2
)
*
f
(
2
);
if
(
fz
[
i
]
>
0
)
{
double
Mx
=
M
(
0
,
0
)
*
f
(
3
)
+
M
(
0
,
1
)
*
f
(
4
)
+
M
(
0
,
2
)
*
f
(
5
)
+
M
(
1
,
3
)
*
(
M
(
2
,
0
)
*
f
(
0
)
+
M
(
2
,
1
)
*
f
(
1
)
+
M
(
2
,
2
)
*
f
(
2
));
double
My
=
M
(
1
,
0
)
*
f
(
3
)
+
M
(
1
,
1
)
*
f
(
4
)
+
M
(
1
,
2
)
*
f
(
5
)
-
M
(
1
,
3
)
*
(
M
(
1
,
0
)
*
f
(
0
)
+
M
(
1
,
1
)
*
f
(
1
)
+
M
(
1
,
2
)
*
f
(
2
));
/// we assume M (2,3)==0 for moments computations
double
Mx
=
M
(
0
,
0
)
*
f
(
3
)
+
M
(
0
,
1
)
*
f
(
4
)
+
M
(
0
,
2
)
*
f
(
5
)
+
M
(
1
,
3
)
*
(
fz
[
i
]);
double
My
=
M
(
1
,
0
)
*
f
(
3
)
+
M
(
1
,
1
)
*
f
(
4
)
+
M
(
1
,
2
)
*
f
(
5
)
-
M
(
0
,
3
)
*
(
fz
[
i
]);
fnormal
+=
fz
[
i
];
sumZmpx
-=
My
;
sumZmpy
+=
Mx
;
...
...
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