Changeset 1380 for applications/pmsm/simulator_zdenek/pmsm_sim.cpp

Timestamp:

08/01/11 22:11:09 (13 years ago)

Author:

smidl

Message:

MPF v C

Files:

• applications/pmsm/simulator_zdenek/pmsm_sim.cpp (modified) (1 diff)

applications/pmsm/simulator_zdenek/pmsm_sim.cpp

@@ -10 +10 @@
                          usa = *mxGetPr(input[0]);
                          usb = *mxGetPr(input[1]);
-        pmsmsim_noreg_step(usa,usb);
+                        pmsmsim_noreg_step(usa,usb);
       } 
     if ( n_input==1 ) {
-        double Ww = *mxGetPr(input[0]);
-        for (int i=0;i<125; i++){
-          pmsmsim_step(Ww,0.0);
+                double Ww = *mxGetPr(input[0]);
+                for (int i=0;i<125; i++){
+                pmsmsim_step(Ww,0.0);
+                }
         }
-    }
-    if (n_input==0){
-      pmsmsim_set_parameters ( 0.28,0.003465,0.1989,0.0,4,1.5,0.04, 200., 3e-6, 1e-6 );
-    }
 
-      output[0]= mxCreateDoubleMatrix(9, 1, mxREAL); 
+   output[0]= mxCreateDoubleMatrix(9, 1, mxREAL); 
         x_out= mxGetPr(output[0]);
         
-        for (int i=0; i<9; i++){
-            x_out[i]=x[i];
-        }
-
-      output[1]= mxCreateDoubleMatrix(6, 1, mxREAL); 
+        output[1]= mxCreateDoubleMatrix(6, 1, mxREAL); 
         y_out= mxGetPr(output[1]);
         
-        for (int i=0; i<5; i++){
-            y_out[i]=KalmanObs[i];
-        }
-
+        pmsmsim_fill_xy(x_out,y_out);
   
 }