Changeset 1387 for applications/pmsm/pmsm_ctrl.h

Timestamp:

09/09/11 12:50:56 (13 years ago)

Author:

smidl

Message:

oprava simulator + log do bic3

Files:

• applications/pmsm/pmsm_ctrl.h (modified) (8 diffs)

applications/pmsm/pmsm_ctrl.h

@@ -129 +129 @@
                         return vec_1(tmp);
         }
+        void set_params(double Pd0, double Pi0){
+                Pd=Pd0;
+                Pi=Pi0;
+        }
+        void get_params(double &Pd0, double &Pi0){
+                Pd0=Pd;
+                Pi0=Pi;
+        }
 };
 
@@ -160 +168 @@
         PMSMCtrl():Controller() {
                 rv = RV("{ua ub }");
-                rvc = RV("{o_ia o_ib t_ua t_ub o_om o_th Ww }");
+                rvc = RV("{o_ia o_ib o_ua o_ub o_om o_th Ww }");
         }
         
@@ -1360 +1368 @@
 
 class PMSM_LQCtrl_bic3: public PMSMCtrl{
+        LOG_LEVEL(PMSM_LQCtrl_bic3, logModel);
 public:
+        
 /*
 PMSMCtrl:
@@ -1431 +1441 @@
 // inj
         double injkon, injome, injphi;
-        
+        int minindex;
                 
         PMSM_LQCtrl_bic3():PMSMCtrl(), a(0.9898), b(0.0072), c(0.0361), d(1.0), e(0.0149),
@@ -1574 +1584 @@
                         varPth(2) = Pt5(1,1);
                                 
-                        int minindex = 0;
+                        minindex = 0;
                         for(int i = 1; i < 3; i++){
                                 if(varPth(i) < varPth(minindex)){                               
@@ -1673 +1683 @@
                         varPth(4) = Pt5(1,1);
                                 
-                        int minindex = 0;
+                        minindex = 0;
                         for(int i = 1; i < 5; i++){
                                 if(varPth(i) < varPth(minindex)){                               
@@ -1751 +1761 @@
                 UI::get(injome,set, "injome", UI::optional);
                 UI::get(injphi,set, "injphi", UI::optional);
+                
+                double Pi,Pd;
+                Cwq.get_params(Pd,Pi);
+                UI::get(Pi,set,"PIw_Pi",UI::optional);
+                UI::get(Pd,set,"PIw_Pd",UI::optional);
+                Cwq.set_params(Pd,Pi);
+                
+                Cud.get_params(Pd,Pi);
+                UI::get(Pi,set,"PIu_Pi",UI::optional);
+                UI::get(Pd,set,"PIu_Pd",UI::optional);
+                Cud.set_params(Pd,Pi);
+                Cuq.set_params(Pd,Pi);
+
         }
 
@@ -1804 +1827 @@
                 lq.redesign();
         }
+        
+        void log_register ( logger &L, const string &prefix ) {
+                PMSMCtrl::log_register(L,prefix);
+                L.add_vector ( log_level, logModel, RV ( 1), prefix );
+        }
+        void log_write() const{
+                PMSMCtrl::log_write();
+                log_level.store( logModel , double(minindex)); 
+                
+        }
+
 };
 UIREGISTER(PMSM_LQCtrl_bic3);