Show
Ignore:
Timestamp:
12/16/12 23:05:25 (11 years ago)
Author:
smidl
Message:

uprava generatoru

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • applications/pmsm/simulator_zdenek/ekf_example/ekf_mm.cpp

    r1466 r1468  
    55 
    66 
    7 void ekfCh2(ekf_data *E, int16 ux, int16 uy, int16 isx, int16 isy, int16 *detS, int16 *rem) 
     7void ekfCh2(ekf_data *E, int16 ux, int16 uy, int16 isx, int16 isy, int32 *detS, int16 *rem) 
    88{ 
    99        int16 t_sin,t_cos; 
    … …  
    4545        E->y_old[1] = isy; 
    4646         
    47         *detS = 32767; *rem=0; 
    4847        carlson_fastC(E->difz,E->x_est,E->Chf,E->C,E->dR,2,2, detS, rem); 
    4948} 
    … …  
    8483void ekfmm(ekf_data* E1, ekf_data* E2, int16 ux, int16 uy, int16 isx, int16 isy) 
    8584{ 
    86         int16 det1, det2, rem1, rem2; 
     85        int32 det1, det2; 
     86        int16 rem1, rem2; 
    8787        ekfCh2(E1, ux,uy,isx,isy,&det1,&rem1); 
    8888        ekfCh2(E2, ux,uy,isx,isy,&det2,&rem2);