Changeset 1400 for applications

Show
Ignore:
Timestamp:
10/04/11 16:45:04 (13 years ago)
Author:
smidl
Message:

noreg accepts Mz

Location:
applications/pmsm
Files:
2 added
4 modified

Legend:

Unmodified
Added
Removed
  • applications/pmsm/experiments/ctrl_lq_dq2.cfg

    r1399 r1400  
    1414//      profileW = [0, 500, 1000, 1500, 2000, 2500, 3000 ];      
    1515//      profileW = [0, -10, 30, 60, 90, 60, 30, 0, -30, -60, -30]; 
    16         profileW = [0, -1, 3, 6, 9, 6, 3, 0, 0, 0, 0, 0,0,-3, -6, -3]; 
    17 //      profileW = [1, 10, 50, 200, 200, 30, 0, 0, -30, -30, -100, -100, -40, 0, 0]; 
     16//      profileW = [0, -1, 3, 6, 9, 6, 3, 0, 0, 0, 0, 0,0,-3, -6, -3]; 
     17        profileW = [1, 10, 50, 200, 200, 30, 0, 0, -30, -30, -100, -100, -40, 0, 0]; 
    1818//      profileW = [1, 10, 50, 200, 200, 30, 1, 1, -1, -10, -50, -200, -200, -30, 0]; 
    1919//      profileW = [250, 500, 750, 1000, 1250, 1500, 1750, 2000, 2250, 2500, 2750, 3000, 3000]; 
    20 //      profileM = [0, 30, 0, 0, 30, 0, 0, 0, 0, 0, 10, 0, 0]; 
     20//      profileM = [0, 3, 0, 0, 3, 0, 0, 0, 0, 0, 1, 0, 0]; 
    2121        profileM = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; 
    2222}; 
    2323 
    2424UD = {class="EKF_UD"; 
    25          IM = {class="IMpmsmStat"; 
     25         IM = {class="IMpmsm"; 
    2626                params = "pmsm107@./cfg/zcu.cfg"; 
     27                compensate = 1; 
    2728         }; 
    2829         OM = {class="OMpmsm";}; 
    2930//      dQ=[0.1, 0.1, 0.1, 0.001]; ///??????????????? 
    3031//      dQ=[0.1, 0.1, 10.01, 10.01]; 
    31 //      dQ=[0.1, 0.1, 0.005, 0.001]; 
    32         dQ=[0.1, 0.1, 0.1, 0.00001]; 
    33 //      dR=[0.05, 0.05]; 
    34         dR=[0.00001, 0.00001]; 
     32        dQ=[0.1, 0.1, 0.005, 0.001];//, 0.0000000000000000001]; 
     33//      dQ=[0.1, 0.1, 0.1, 0.00001]; 
     34        dR=[0.05, 0.05]; 
     35//      dR=[0.00001, 0.00001]; 
    3536         //connect 
    3637         log_level="logmean,logU,logD,logC"; 
     
    105106                bcbv = 6.0;                                                     // 11 - injektaz albe round sin resp. cos 
    106107                //bcbv = 0.0;                                                    
    107                 biver = 12;//40; 
     108                biver = 40; 
    108109                injkon = 6.0; 
    109110                injome = 16000.0; 
  • applications/pmsm/pmsmDS.h

    r1387 r1400  
    256256                        for ( int i=0; i<Dt; i++ ) 
    257257                        { 
    258                                 pmsmsim_noreg_step (ua , ub); 
     258                                pmsmsim_noreg_step (ua , ub, Mz); 
    259259                        } 
    260260        }; 
  • applications/pmsm/simulator_zdenek/simulator.cpp

    r1387 r1400  
    465465} 
    466466 
    467 void pmsmsim_noreg_step(double ua, double ub)            // you must link array KalmanObs[] to EKF modul 
     467void pmsmsim_noreg_step(double ua, double ub, double Mz)            // you must link array KalmanObs[] to EKF modul 
    468468{ 
    469469  double kor_Uc; 
     
    479479 
    480480  pwm(modulace); 
     481   
     482  x[8] = Mz; 
    481483 
    482484//  *us=*u*cos(*(u+1)); 
  • applications/pmsm/simulator_zdenek/simulator.h

    r1380 r1400  
    1919extern void pmsmsim_set_parameters(double Rs0, double Ls0, double Fmag0, double Bf0, double p0, double kp0, double J0, double Uc0, double DT0, double dt0); 
    2020extern void pmsmsim_step(double Ww, double Mz=0.0); 
    21 extern void pmsmsim_noreg_step(double ua, double ub); 
     21extern void pmsmsim_noreg_step(double ua, double ub, double Mz=0.0); 
    2222extern void pmsmsim_fill_parameters(double P[10]); 
    2323extern void pmsmsim_fill_xy(double xout[9], double yout[6]);