Changeset 366 for applications

Timestamp:

06/08/09 18:02:02 (16 years ago)

Author:

smidl

Message:

pmsm fixes

Location:

applications/pmsm

Files:

• pmsm.h (modified) (1 diff)
• pmsmDS.h (modified) (2 diffs)
• pmsm_estim.cpp (modified) (1 diff)

applications/pmsm/pmsm.h

@@ -98 +98 @@
         void from_setting( const Setting &root )
         {       
-                set_parameters ( root["params"]["Rs"], root["params"]["Ls"], 125e-6, root["params"]["Fmag"], \
-                        root["params"]["kp"],  root["params"]["p"], root["params"]["J"], 0.0 );
+                UI::SettingsResolver params_exp(root["params"]);
+                const Setting& params=params_exp.root();
+
+                set_parameters ( params["Rs"], params["Ls"], 125e-6, params["Fmag"], \
+                         params["kp"], params["p"], params["J"], 0.0);
+
+/*              set_parameters ( root["params"]["Rs"], root["params"]["Ls"], 125e-6, root["params"]["Fmag"], \
+                        root["params"]["kp"],  root["params"]["p"], root["params"]["J"], 0.0 );*/
         };
 

applications/pmsm/pmsmDS.h

@@ -15 +15 @@
 #include "simulator_zdenek/simulator.h"
 #include "pmsm.h"
+
+using namespace bdm;
 
 //! Simulator of PMSM machine with predefined profile on omega
@@ -165 +167 @@
     void from_setting( const Setting &root )
     {
-        set_parameters ( root["params"]["Rs"], root["params"]["Ls"], root["params"]["Fmag"], \
-                         root["params"]["Bf"], root["params"]["p"], root["params"]["kp"], \
-                         root["params"]["J"], root["params"]["Uc"], root["params"]["DT"], 1.0e-6 );
+                UI::SettingsResolver params_exp(root["params"]);
+                const Setting& params=params_exp.root();
+
+        set_parameters ( params["Rs"], params["Ls"], params["Fmag"], \
+                         params["Bf"], params["p"], params["kp"], \
+                         params["J"], params["Uc"], params["DT"], 1.0e-6 );
 
         // Default values of profiles for omega and Mz

applications/pmsm/pmsm_estim.cpp

@@ -9 +9 @@
 #include "user_info.h"
 #include "stat/loggers.h"
+#include "estim/libKF.h"
+#include "pmsmDS.h"
+
 
 using namespace bdm;