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-torque-control
Commits
dbebb310
Commit
dbebb310
authored
Dec 11, 2017
by
Andrea Del Prete
Browse files
[balance-ctrl] Add multiplication times dt in force error integral
parent
ea029ba4
Changes
2
Hide whitespace changes
Inline
Side-by-side
include/sot/torque_control/inverse-dynamics-balance-controller.hh
View file @
dbebb310
...
...
@@ -266,7 +266,7 @@ namespace dynamicgraph {
tsid
::
math
::
Vector6
m_v_LF_int
;
unsigned
int
m_timeLast
;
RobotUtil
*
m_robot_util
;
RobotUtil
*
m_robot_util
;
};
// class InverseDynamicsBalanceController
}
// namespace torque_control
...
...
src/inverse-dynamics-balance-controller.cpp
View file @
dbebb310
...
...
@@ -891,7 +891,6 @@ namespace dynamicgraph
if
(
s
.
size
()
!=
m_robot_util
->
m_nbJoints
)
s
.
resize
(
m_robot_util
->
m_nbJoints
);
const
Eigen
::
Vector6d
&
f_des_RF
=
m_f_des_right_footSOUT
(
iter
);
const
Eigen
::
Vector6d
&
f_des_LF
=
m_f_des_left_footSOUT
(
iter
);
const
Eigen
::
Vector6d
&
f_RF
=
m_wrench_right_footSIN
(
iter
);
...
...
@@ -904,8 +903,8 @@ namespace dynamicgraph
Eigen
::
Vector6d
v_des_RF
=
kp
.
cwiseProduct
(
f_RF
-
f_des_RF
);
Eigen
::
Vector6d
v_des_LF
=
kp
.
cwiseProduct
(
f_LF
-
f_des_LF
);
m_v_RF_int
+=
ki
.
cwiseProduct
(
f_RF
-
f_des_RF
);
m_v_LF_int
+=
ki
.
cwiseProduct
(
f_LF
-
f_des_LF
);
m_v_RF_int
+=
m_dt
*
ki
.
cwiseProduct
(
f_RF
-
f_des_RF
);
m_v_LF_int
+=
m_dt
*
ki
.
cwiseProduct
(
f_LF
-
f_des_LF
);
m_robot
->
frameJacobianLocal
(
m_invDyn
->
data
(),
m_taskRF
->
frame_id
(),
m_J_RF
);
m_robot
->
frameJacobianLocal
(
m_invDyn
->
data
(),
m_taskLF
->
frame_id
(),
m_J_LF
);
...
...
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