Changeset 871 for applications/pmsm/Barcelona

Timestamp:

03/19/10 11:23:05 (14 years ago)

Author:

mido

Message:

adaptation of /applications to new version of LOG_LEVEL
also, a cosmetic change made in enumerations: logub -> logubound, loglb -> loglbound

Location:

applications/pmsm/Barcelona

Files:

• MM.cfg (modified) (3 diffs)
• Mz.cfg (modified) (5 diffs)
• Mz.m (modified) (1 diff)
• Mz_mx.cfg (modified) (4 diffs)
• pwm.cfg (modified) (1 diff)
• pwm_mx.cfg (modified) (1 diff)
• real.cfg (modified) (1 diff)
• real_mx.cfg (modified) (2 diffs)

applications/pmsm/Barcelona/MM.cfg

@@ -26 +26 @@
          //drv = {type="rv"; names=["o_ia","o_ib","t_ua","t_ub"];}; // true u
          rv = {type="rv"; names=["EKF"]; sizes=[4];};
-         options="logll";
+         log_level="logevidence";
          };
 E2= {type="EKF";
@@ -41 +41 @@
          //drv = {type="rv"; names=["o_ia","o_ib","t_ua","t_ub"];}; // true u
          rv = {type="rv"; names=["EKFw"]; sizes=[4];};
-         options="logll";
+         log_level="logevidence";
          };
          
@@ -51 +51 @@
                 {type="internal";path="E1";},
                 {type="internal";path="E2";});
-                options="logll";
+                log_level="logevidence";
         });
         

applications/pmsm/Barcelona/Mz.cfg

@@ -11 +11 @@
         profileW = [0, 1, 5, 10, 10, 3, 0, 0, -3, -3, -10, -10, -4, 0, 0];
         profileM = [0, 10, 0, 0, 10, 0, 0, 0, 0, 0, 10, 0, 0];
-        options = "modelu";
+        log_level = "logvoltage";
 };
 
@@ -32 +32 @@
          //drv = {class="RV"; names=("o_ia","o_ib","t_ua","t_ub");}; // true u
          rv = {class="RV"; names=("EKFMz"); sizes=[5];};
-         options="logll,logbounds";
+         log_level="logevidence,logbounds";
          },
                                  //
@@ -47 +47 @@
          //drv = {class="RV"; names=("o_ia","o_ib","t_ua","t_ub");}; // true u
          rv = {class="RV"; names=("EKF"); sizes=[4];};
-         options="logll,logbounds";
+         log_level="logevidence,logbounds";
          },
                                                                  //
@@ -62 +62 @@
          //drv = {class="RV"; names=("o_ia","o_ib","t_ua","t_ub");}; // true u
          rv = {class="RV"; names=("EKFw"); sizes=[4];};
-         options="logll,logbounds";
+         log_level="logevidence,logbounds";
          },
 
@@ -78 +78 @@
          //drv = {class="RV"; names=("o_ia","o_ib","t_ua","t_ub");}; // true u
          rv = {class="RV"; names=("CRB"); sizes=[5];};
-         options="logll,logbounds";
+         log_level="logevidence,logbounds";
          }
 

applications/pmsm/Barcelona/Mz.m

@@ -30 +30 @@
     'drv', Orv,...
     'rv', struct('type','rv', 'names', {{'EKFMz'}},'sizes',[5]),...
-         'options','logll,logbounds')};
+         'log_level','logevidence,logbounds')};
         
 %S.logger= struct(      'type','mexlog','maxlen',32000);

applications/pmsm/Barcelona/Mz_mx.cfg

@@ -11 +11 @@
         profileW = [0, 3, 10, 10, 3, 0, 0, -3, -3, -3, -10, -10, -4, 0, 0];
         profileM = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-//      options = "modelu";
+//      log_level = "logvoltage";
 };
 
@@ -28 +28 @@
          //drv = {type="rv"; names=["o_ia","o_ib","t_ua","t_ub"];}; // true u
          rv = {type="rv"; names=["EKFMz"]; sizes=[5];};
-         options="logll,logbounds";
+         log_level="logevidence,logbounds";
          },
                                  //
@@ -45 +45 @@
          //drv = {type="rv"; names=["o_ia","o_ib","t_ua","t_ub"];}; // true u
          rv = {type="rv"; names=["CRB"]; sizes=[5];};
-         options="logll,logbounds";
+         log_level="logevidence,logbounds";
          },
 
@@ -61 +61 @@
          //drv = {type="rv"; names=["o_ia","o_ib","t_ua","t_ub"];}; // true u
          rv = {type="rv"; names=["CRB2"]; sizes=[4];};
-         options="logll,logbounds";
+         log_level="logevidence,logbounds";
          }
 

applications/pmsm/Barcelona/pwm.cfg

@@ -27 +27 @@
         //drv = {type="rv"; names=["o_ia","o_ib","t_ua","t_ub"];}; // true u
         rv = {type="rv"; names=["EKF"]; sizes=[4];};
-        options="logbounds";
+        log_level="logbounds";
         },
                 ///////////

applications/pmsm/Barcelona/pwm_mx.cfg

@@ -11 +11 @@
         profileW = [1, 5, 10, 100, 3, 3, 0, 0];
         //profileM = [0, 0, 10,  10, 10, 0, 10, 0];
-        options = "modelu";
+        log_level = "logvoltage";
 };
 

applications/pmsm/Barcelona/real.cfg

@@ -28 +28 @@
          //drv = {type="rv"; names=["o_ia","o_ib","t_ua","t_ub"];}; // true u
          rv = {type="rv"; names=["EKFMz"]; sizes=[5];};
-         options="logll,logbounds";
+         log_level="logevidence,logbounds";
          }
 );

applications/pmsm/Barcelona/real_mx.cfg

@@ -26 +26 @@
          drv = {type="rv"; names=["o_ia","o_ib","o_ua","o_ub"];};  // observed u
          rv = {type="rv"; names=["EKFMz"]; sizes=[5];};
-         options="logll,logbounds";
+         log_level="logevidence,logbounds";
          },
          {type="EKF";
@@ -41 +41 @@
          drv = {type="rv"; names=["o_ia","o_ib","o_ua","o_ub"];};  // observed u
          rv = {type="rv"; names=["EKF"]; sizes=[4];};
-         options="logll,logbounds";
+         log_level="logevidence,logbounds";
          }
 );