diff --git a/controllers/sunny360vfe_dummy_io.slx b/controllers/sunny360vfe_dummy_io.slx index 9db9dde..e644786 100644 Binary files a/controllers/sunny360vfe_dummy_io.slx and b/controllers/sunny360vfe_dummy_io.slx differ diff --git a/mainModels/sunny360vfe_an.slx b/mainModels/sunny360vfe_an.slx index b17a18e..abbd278 100644 Binary files a/mainModels/sunny360vfe_an.slx and b/mainModels/sunny360vfe_an.slx differ diff --git a/mainModels/sunny360vfe_sim_csas.sldd b/mainModels/sunny360vfe_sim_csas.sldd index 386cb64..1ae4bd8 100644 Binary files a/mainModels/sunny360vfe_sim_csas.sldd and b/mainModels/sunny360vfe_sim_csas.sldd differ diff --git a/mainModels/sunny360vfe_sim_csas.slx b/mainModels/sunny360vfe_sim_csas.slx index ddfc433..eb3cbf4 100644 Binary files a/mainModels/sunny360vfe_sim_csas.slx and b/mainModels/sunny360vfe_sim_csas.slx differ diff --git a/tasks/ctrl/LHS_PITCH_SHOOTS.m b/tasks/ctrl/LHS_PITCH_SHOOTS.m index 0f1032a..13a9e5d 100644 --- a/tasks/ctrl/LHS_PITCH_SHOOTS.m +++ b/tasks/ctrl/LHS_PITCH_SHOOTS.m @@ -2,13 +2,10 @@ function LHS_PITCH_SHOOTS() close all -H_lst = [1000 1000 1000 1000 1000 1000]; -CAS_lst = [35 40 45 35 40 45]; -mass_lst = [305 305 305 350 350 350]; +H_lst = [120]; +CAS_lst = [37]; +mass_lst = [315]; -% H_lst = [1000]; -% CAS_lst = [40]; -% mass_lst = [305]; %% RMS.tht(1,1) = 0; @@ -193,7 +190,7 @@ for idx = 2:n para.IxzUncertVal(idx-1) = (rand_p(idx,36)-0.5)*2*0.1; para.ThrustUncertGain(idx-1) = 1.0+(rand_p(idx,37)-0.5)*2*0.1; para.delayLen(idx-1) = 4; % max_delaylen = 6 - % para.wn_act(idx-1) = 43; %ceil((rand()-0.5)*2*20 + 56); % act bandwidth (40~60 rad/s) + para.wn_act(idx-1) = 20; %ceil((rand()-0.5)*2*20 + 56); % act bandwidth (40~60 rad/s) cg_x = para.cg_xUncertGain(idx-1)*0.655; @@ -236,10 +233,7 @@ for idx = 2:n 'CnpUncertGain', para.CnpUncertGain(idx-1), ... % ᵼ 'CnrUncertGain', para.CnrUncertGain(idx-1), ... 'ThrustUncertGain', para.ThrustUncertGain(idx-1), ... - 'deadband_dal',0.2/57.3,... - 'deadband_dar',0.2/57.3,... - 'deadband_del',0.2/57.3,... - 'deadband_der',0.2/57.3,... + 'deadband',1/57.3,... 'wind_able',0 ... ); pid = 1; diff --git a/tasks/ctrl/LHS_ROLL_SHOOTS.m b/tasks/ctrl/LHS_ROLL_SHOOTS.m index bbf8dc7..1639581 100644 --- a/tasks/ctrl/LHS_ROLL_SHOOTS.m +++ b/tasks/ctrl/LHS_ROLL_SHOOTS.m @@ -3,9 +3,9 @@ close all %% mission profile -H_lst = [1000 1000 1000 1000 1000 1000]; -CAS_lst = [35 40 45 35 40 45]; -mass_lst = [305 305 305 350 350 350]; +H_lst = [120]; +CAS_lst = [37]; +mass_lst = [315]; df_lst = 0; @@ -192,7 +192,7 @@ for idx = 2:n para.IxzUncertVal(idx-1) = (rand_p(idx,36)-0.5)*2*0.1; para.ThrustUncertGain(idx-1) = 1.0+(rand_p(idx,37)-0.5)*2*0.1; para.delayLen(idx-1) = 4; % max_delaylen = 6 -% para.wn_act(idx-1) = 43; %ceil((rand()-0.5)*2*20 + 56); % act bandwidth (40~60 rad/s) + para.wn_act(idx-1) = 20; %ceil((rand()-0.5)*2*20 + 56); % act bandwidth (40~60 rad/s) cg_x = para.cg_xUncertGain(idx-1)*0.655; cg_y = para.cg_yUncertGain(idx-1)*0.655; @@ -235,10 +235,7 @@ for idx = 2:n 'CnrUncertGain', para.CnrUncertGain(idx-1), ... 'ThrustUncertGain', para.ThrustUncertGain(idx-1), ... 'delayLen', para.delayLen(idx-1) , ... - 'deadband_dal',0.2/57.3,... - 'deadband_dar',0.2/57.3,... - 'deadband_del',0.2/57.3,... - 'deadband_der',0.2/57.3,... + 'deadband',1/57.3,... 'wind_able',0 ... ); pid = 1;