-
Notifications
You must be signed in to change notification settings - Fork 43
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
improvements in velocity controller #104
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
# Momentum Based Velocity Control | ||
|
||
This library implements the velocity based momentum controller. | ||
|
||
## :hammer: Dependencies | ||
|
||
This simulink library depends on Casadi. | ||
Please download Casadi by following this [link](https://web.casadi.org/get/) and add the related folder to your matlab path. | ||
|
||
## How to run | ||
|
||
Add this folder to your matlab path, the momentum velocity control library will be available in the simulink library browser. | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
function [J_c, J_c_dot_nu] = ComputeContactJacobianWithFeetContactFCN(J_L, J_R, J_dot_nu_L, J_dot_nu_R, feet_contact_status) | ||
|
||
NDOF = length(J_L(1,7:end)); | ||
|
||
J_c = zeros(12,6+NDOF); | ||
J_c_dot_nu = zeros(12,1); | ||
|
||
% if left foot in contact | ||
if(feet_contact_status(1)) | ||
J_c (1:6,:) = J_L; | ||
J_c_dot_nu(1:6) = J_dot_nu_L; | ||
end | ||
|
||
% if right foot in contact | ||
if(feet_contact_status(2)) | ||
J_c(7:end,:) = J_R; | ||
J_c_dot_nu(7:end) = J_dot_nu_R; | ||
end | ||
|
||
end | ||
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,12 @@ | ||
function [L_star, s_dot_star_k_1] = ComputeReferences(x_com, x_d_com, Ld, int_L_angular, s_dot_des_k_1, s_des_k, s_k, Gains) | ||
function [L_star, L_dot_star, s_dot_star_k_1] = ComputeReferences(x_com, x_d_com, L, L_dot_d, Ld, int_L_angular, s_dot_des_k_1, s_des_k, s_k, totalMass,Gains) | ||
|
||
L_int_lin = Gains.KP_CoM* (x_com- x_d_com); | ||
L_int_ang = Gains.KI_ang* (int_L_angular); | ||
L_int = [L_int_lin; L_int_ang]; | ||
L_star = Ld - L_int; | ||
L_int_lin = Gains.KP_CoM*totalMass*(x_com - x_d_com); | ||
L_int_ang = Gains.KI_ang*(int_L_angular); | ||
L_int = [L_int_lin; L_int_ang]; | ||
L_star = Ld-L_int; | ||
|
||
s_dot_star_k_1 = s_dot_des_k_1 - Gains.KP_Postural*(s_k- s_des_k); | ||
end | ||
L_dot_star = L_dot_d -blkdiag(Gains.KD_CoM, Gains.KP_ang)*(L-Ld) -L_int; | ||
|
||
s_dot_star_k_1 = s_dot_des_k_1 - Gains.KP_Postural*(s_k-s_des_k); | ||
|
||
end | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. also here missing newline There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. done in 6c3d28f |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
function [L_d, L_dot_d, int_L_ang, x_com_des, s_des_k, s_dot_des_k] = ComputeReferencesController(M,L,desired_pos_vel_COM, joint_pos, joint_pos_desired, L_ang_des,L_d) | ||
|
||
persistent L_0; | ||
|
||
if(isempty(L_0)) | ||
L_0 = L; | ||
end | ||
|
||
persistent joint_pos_0; | ||
|
||
if(isempty(joint_pos_0)) | ||
joint_pos_0 = joint_pos; | ||
end | ||
|
||
|
||
%% for balancing | ||
%L_d = L_0; | ||
|
||
% L_d = zeros(6,1); | ||
%L_d(4:6)= L_ang_des; | ||
L_dot_d = zeros(6,1); | ||
L_d(1:3) = M(1,1)*desired_pos_vel_COM(:,2)'; | ||
int_L_ang = zeros(3,1); | ||
x_com_des = desired_pos_vel_COM(:,1); | ||
s_des_k = joint_pos_desired; | ||
s_dot_des_k = zeros(size(s_des_k)); | ||
|
||
|
||
end | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same comment There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. done in 6c3d28f |
This file was deleted.
This file was deleted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing newline
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done in 6c3d28f