Changeset 654 for applications/pmsm/pmsm.h

Timestamp:

10/12/09 19:38:57 (15 years ago)

Author:

smidl

Message:

PMSM compiles again

Files:

• applications/pmsm/pmsm.h (modified) (2 diffs)

applications/pmsm/pmsm.h

@@ -2 +2 @@
 #define PMSM_H
 
-#include <stat/functions.h>
-#include "user_info.h"
+#include <math/functions.h>
+#include "base/user_info.h"
 
 /*! \defgroup PMSM 
@@ -98 +98 @@
         void from_setting( const Setting &root )
         {       
-                UI::SettingResolver params_exp(root["params"]);
-                const Setting& params=params_exp.result;
-
-                set_parameters ( params["Rs"], params["Ls"], 125e-6, params["Fmag"], \
+
+                const SettingResolver& params_b=root["params"];
+                const Setting& params=params_b.result;
+                
+                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 );*/
         };