Inu/Src/main/v_pwm24_v2.h

@@ -54,7 +54,7 @@ typedef struct 	{ //  _iq  Gain;						// Input: reference gain voltage (pu)
 //					_iq delta_t;
 					//int16 Periodmax;
 					//int16 PeriodMin;
-					int XilinxFreq;	// Xilinx freq in TIC
+					unsigned int XilinxFreq;	// Xilinx freq in TIC
 
 					unsigned int pwm_minimal_impuls_zero_plus;
 					unsigned int pwm_minimal_impuls_zero;

Inu/Src/main_matlab/init28335.c

@@ -13,7 +13,6 @@
 #define FREQ_TIMER_3    (FREQ_PWM*2)
 
 void init28335(void) {
-    init_simple_scalar();
 
 	edrk.flag_second_PCH = 0;
 
@@ -22,13 +21,9 @@ void init28335(void) {
 
     Init_Adc_Variables();
 
-    svgen_pwm24_1.phase_sequence = SIMULINK_SEQUENCE;
-    svgen_pwm24_2.phase_sequence = SIMULINK_SEQUENCE;
+    //svgen_pwm24_1.phase_sequence = SIMULINK_SEQUENCE;
+    //svgen_pwm24_2.phase_sequence = SIMULINK_SEQUENCE;
 
-    edrk.zadanie.iq_Izad = _IQ(0.5);
-    edrk.disable_alg_u_disbalance = 1;
-    //analog_zero.iqU_1 = 2048;
-    //analog_zero.iqU_2 = 2048;
 } //void init28335(void)
 
 void edrk_init_variables_matlab(void)

Inu/Src/main_matlab/main_matlab.c

@@ -50,7 +50,6 @@ void mcu_simulate_step(void)
 	}
 
 
-	ramp_all_zadanie(0);  // ňóň âńĺ ďî řňŕňíîěó
 
 	calc_norm_ADC_0(0);
 

Inu/Src/main_matlab/param.c

@@ -31,10 +31,11 @@ void readInputParameters(const real_T *u) {
 	edrk.Go = u[nn++];
 
 	u[nn++];
+
 	edrk.Mode_ScalarVectorUFConst = ALG_MODE_FOC_OBOROTS;
 
-	edrk.zadanie.iq_power_zad = _IQ(0.5);
-	edrk.zadanie.iq_oborots_zad_hz = _IQ(0.5);
+	edrk.zadanie.iq_power_zad_rmp = _IQ(u[nn++]);
+	edrk.zadanie.iq_oborots_zad_hz_rmp = _IQ(u[nn++]);
 
 	edrk.MasterSlave = MODE_MASTER;
 	edrk.master_theta;
@@ -83,18 +84,33 @@ void writeOutputParameters(real_T* xD) {
 	xD[nn++] = t12sim.ciB;
 
 	// Òîëüêî äëÿ ïðîñìîòðà
+	xD[nn++] = _IQtoF(0);
+	xD[nn++] = _IQtoF(0);
+
+	xD[nn++] = 0;
+	xD[nn++] = 0;
+	xD[nn++] = 0;
+
+	xD[nn++] = 0;
+	xD[nn++] = 0;
+
+	xD[nn++] = 0;
+	xD[nn++] = _IQtoF(0);//rs.wmZ;
+	xD[nn++] = _IQtoF(0) * NORMA_FROTOR * 60.0 / N_BAZ;//csp.wmLimZi;
+
+	xD[nn++] = 0;///P_NOM;
+	xD[nn++] = 0;///P_NOM;
+	xD[nn++] = 0;///P_NOM;
+
+	xD[nn++] = _IQtoF(vect_control.iqId2);//_IQtoF(vect_control.iqPzad);
+	xD[nn++] = _IQtoF(vect_control.iqIq2);// * NORMA_ACP;
+	xD[nn++] = _IQtoF(vect_control.iqId1);//_IQtoF(vect_control.iqUqCompensation1);//
+	xD[nn++] = _IQtoF(vect_control.iqIq1);
+	xD[nn++] = _IQtoF(vect_control.Iq_zad1);
+	xD[nn++] = _IQtoF(vect_control.Id_zad1);//iqZ;
+
+	xD[nn++] = 0;
+
 	xD[nn++] = xpwm_time.Ta0_0;
 	xD[nn++] = xpwm_time.Ta0_1;
-	xD[nn++] = xpwm_time.Tb0_0;
-	xD[nn++] = xpwm_time.Tb0_1;
-	xD[nn++] = xpwm_time.Tc0_0;
-	xD[nn++] = xpwm_time.Tc0_1;
-
-	xD[nn++] = _IQtoF(edrk.Iq_to_slave);
-	xD[nn++] = _IQtoF(WRotor.iqWRotorSumFilter);
-	xD[nn++] = 0;
-	xD[nn++] = 0;
-
-	xD[nn++] = _IQtoF(WRotor.iqWRotorSumFilter);
-
 }

Inu/controller.c

@@ -245,4 +245,5 @@ void controller(SimStruct *S, const real_T *u, real_T *xD, real_T *rW, int_T *iW
 
 	writeOutputParameters(xD);
 
+	mcu_simulate_step();
 } //void controller(SimStruct ...

Inu/def.h

@@ -11,13 +11,13 @@
 // раскомментировать, если есть сдвиг между обмотками ГЭД (30 град.)
 #define SHIFT
 
-#define SIMULINK_SEQUENCE	V_PWM24_PHASE_SEQ_NORMAL_BCA
-/*		V_PWM24_PHASE_SEQ_NORMAL_ABC, - íĺ ňî
-        V_PWM24_PHASE_SEQ_NORMAL_BCA, - ďîőîćĺ íŕ ďđŕâäó
-        V_PWM24_PHASE_SEQ_NORMAL_CAB, - ćîďŕ
-        V_PWM24_PHASE_SEQ_REVERS_ACB, - ćîďŕ
-        V_PWM24_PHASE_SEQ_REVERS_CBA, - ćîďŕ
-        V_PWM24_PHASE_SEQ_REVERS_BAC  - ćîďŕ
+#define SIMULINK_SEQUENCE	V_PWM24_PHASE_SEQ_REVERS_BAC
+/*		V_PWM24_PHASE_SEQ_NORMAL_ABC,
+        V_PWM24_PHASE_SEQ_NORMAL_BCA,
+        V_PWM24_PHASE_SEQ_NORMAL_CAB,
+        V_PWM24_PHASE_SEQ_REVERS_ACB,
+        V_PWM24_PHASE_SEQ_REVERS_CBA,
+        V_PWM24_PHASE_SEQ_REVERS_BAC
 		*/
 
 // режимы работы (для state)

Inu/pwm_sim.c

@@ -74,10 +74,10 @@ void SimulatePWM(TimerSimHandle* tsim, int compare)
 {
 	simulateTimAndGetCompare(tsim, compare);
 	simulateActionActionQualifierSubmodule(tsim);
-	//tsim->ciA = tsim->dtsim.ciA_DT;
-	//tsim->ciB = tsim->dtsim.ciB_DT;
-	simulateDeadBendSubmodule(tsim);
-	simulateTripZoneSubmodule(tsim);
+	tsim->ciA = tsim->dtsim.ciA_DT;
+	tsim->ciB = tsim->dtsim.ciB_DT;
+	//simulateDeadBendSubmodule(tsim);
+	//simulateTripZoneSubmodule(tsim);
 }