Changeset 236

Timestamp:

01/15/09 16:33:18 (16 years ago)

Author:

peroutka

Message:

 

Files:

• pmsm/simulator_zdenek/simulator.cpp (modified) (2 diffs)

pmsm/simulator_zdenek/simulator.cpp

@@ -76 +76 @@
 // stator voltage components in alfa beta (inluding impact of the real dc-link voltage)
 static double ualfa=0., ubeta=0.;
+
+
+/////////////////// POMOCNE FUNKCE //////////////////////////////////
+double uhel(double x, double y)
+{
+  double th;
+
+  if (x==0)
+    if (y==0) th=0.;
+        else if (y>0) th=M_PI/2.;
+             else th=-M_PI/2.;
+  else
+    th=atan(y/x);
+
+  if (x<0) th+=M_PI;
+
+  return th;
+}
+/////////////////////////////////////////////////////////////////////
+
 
 void pmsmsim_set_parameters(double Rs0, double Ls0, double Fmag0, double Bf0, double p0, double kp0, double J0, double Uc0, double DT0, double dt0)
@@ -368 +388 @@
 void pmsmsim_noreg_step(double ua, double ub)            // you must link array KalmanObs[] to EKF modul
 {
-                *us=ua;
-                *(us+1)=ub;
-//              pwm(modulace);
-                pmsm_model(5);
-
+  double kor_Uc;
+
+  *u=sqrt(ua*ua+ub*ub);
+  *(u+1)=uhel(ua,ub);
+
+  // uprava velikosti vzhledem k Uc!=Ucn
+  kor_Uc=230./Ucn;
+  *u*=kor_Uc;
+
+  pwm(modulace);
+  pmsm_model(5);
 }
 //////////////////////////////////////////////////////////////////////////////////////////////////////