diff --git a/Inu/main_matlab/init28335.c b/Inu/main_matlab/init28335.c index eea15d9..92f74d3 100644 --- a/Inu/main_matlab/init28335.c +++ b/Inu/main_matlab/init28335.c @@ -100,7 +100,8 @@ void edrk_init_matlab(void) edrk.zadanie.iq_ZadanieU_Charge = _IQ(2500 / NORMA_ACP); edrk.temper_limit_koeffs.sum_limit = _IQ(1); simple_scalar1.fzad_add_max = _IQ(FZAD_ADD_MAX); - edrk.Mode_ScalarVectorUFConst = ALG_MODE_FOC_OBOROTS; + edrk.Mode_ScalarVectorUFConst = ALG_MODE_SCALAR_POWER; + //edrk.Mode_ScalarVectorUFConst = ALG_MODE_FOC_OBOROTS; edrk.zadanie.iq_power_zad = _IQ(1); edrk.zadanie.iq_oborots_zad_hz = _IQ(1); diff --git a/Inu/main_matlab/param.c b/Inu/main_matlab/param.c index 19844ad..bace6e2 100644 --- a/Inu/main_matlab/param.c +++ b/Inu/main_matlab/param.c @@ -102,16 +102,17 @@ void writeOutputParameters(real_T* xD) { // Только для просмотра xD[nn++] = xpwm_time.Ta0_0; xD[nn++] = xpwm_time.Ta0_1; + xD[nn++] = xpwm_time.Ta1_0; + xD[nn++] = xpwm_time.Ta1_1; + xD[nn++] = xpwm_time.Tb0_0; xD[nn++] = xpwm_time.Tb0_1; + xD[nn++] = xpwm_time.Tb1_0; + xD[nn++] = xpwm_time.Tb1_1; + xD[nn++] = xpwm_time.Tc0_0; xD[nn++] = xpwm_time.Tc0_1; - - xD[nn++] = _IQtoF(edrk.Iq_to_slave); - xD[nn++] = _IQtoF(0); - xD[nn++] = 0; - xD[nn++] = 0; - - xD[nn++] = _IQtoF(0); + xD[nn++] = xpwm_time.Tc1_0; + xD[nn++] = xpwm_time.Tc1_1; } \ No newline at end of file diff --git a/Inu/mcu_wrapper_conf.h b/Inu/mcu_wrapper_conf.h index 505e38f..1724f60 100644 --- a/Inu/mcu_wrapper_conf.h +++ b/Inu/mcu_wrapper_conf.h @@ -54,7 +54,7 @@ #define NPARAMS 1 ///< number of input parametrs (only Ts) #define IN_PORT_WIDTH 20 ///< width of input ports #define IN_PORT_NUMB 1 ///< number of input ports -#define OUT_PORT_WIDTH 49 ///< width of output ports +#define OUT_PORT_WIDTH 51 ///< width of output ports #define OUT_PORT_NUMB 1 ///< number of output ports #define DISC_STATES_WIDTH OUT_PORT_WIDTH*OUT_PORT_NUMB ///< width of discrete states array diff --git a/init.m b/init.m index 15e83d0..a686576 100644 --- a/init.m +++ b/init.m @@ -27,17 +27,17 @@ NP = 0.08; % номинальные величины ГЭД % ... мощность на валу, Вт -Pnom = 5000e3*2; +Pnom = 6300e3; % ... линейное напряжение, В (rms) -Unom = 3000; +Unom = 3300; % ... механическая скорость, об/мин -NmNom = 165; +NmNom = 180; % ... число пар полюсов Pp = 6; % ... коэффициент мощности CosFi = 0.87; % ... КПД -Eff = 0.962; +Eff = 0.968; % ... приведенный к валу момент инерции, кг*м^2 J = 87e3*0.5; % ... полная мощность, ВА @@ -62,8 +62,8 @@ Rs = 11.8e-3;% Xls = 72.7e-3;%72.7e-3;%Ом Rr = 11.1e-3*2.0;%*0.8;%Ом Xlr = 85.5e-3;%Ом -Xm = 2.87 * 1.5;%2.87;%Ом -Fe = 12;%Гц +Xm = 2.9322;%2.87;%Ом +Fe = 18;%Гц Lls = Xls/(Fe*PI2);%Гн Llr = Xlr/(Fe*PI2);%Гн Lm = Xm/(Fe*PI2);%Гн @@ -71,7 +71,7 @@ Lm = Xm/(Fe*PI2);% % ёмкость на входе INU, Ф Cdc = 50e-3; % снаберы в INU -Csn = Pnom/(1000*WeNom*Unom^2)/10*0.5;%Ф (0.5 - т.к. преобразователей два) +Csn = Pnom/(1000*WeNom*Unom^2)/10;%Ф (0.5 - т.к. преобразователей два) Rsn = 2*Ts/Csn*10;%Ом % постоянная времени фильтра для тока ГЭД, c diff --git a/inu_23550.slx b/inu_23550.slx index ac1ca62..d1fee4b 100644 Binary files a/inu_23550.slx and b/inu_23550.slx differ