Changeset 198 in flair-src for trunk/lib/FlairFilter/src

Timestamp:

09/14/17 15:52:29 (7 years ago)

Author:

Sanahuja Guillaume

Message:

modifs imu

Location:

trunk/lib/FlairFilter/src

Files:

• AhrsComplementaryFilter.cpp (modified) (3 diffs)
• AhrsComplementaryFilter.h (modified) (2 diffs)

trunk/lib/FlairFilter/src/AhrsComplementaryFilter.cpp

@@ -20 +20 @@
 #include <Imu.h>
 #include <DoubleSpinBox.h>
+#include <Vector3DSpinBox.h>
 #include <GridLayout.h>
 #include <ImuData.h>
@@ -36 +37 @@
 AhrsComplementaryFilter::AhrsComplementaryFilter(const Imu* parent,string name): isInit(false), Ahrs(parent,name) {
 
-    QHat.q0=1;
-    QHat.q1=0;
-    QHat.q2=0;
-    QHat.q3=0;
-    BHat.x=0;
-    BHat.y=0;
-    BHat.z=0;
+  QHat.q0=1;
+  QHat.q1=0;
+  QHat.q2=0;
+  QHat.q3=0;
+  BHat.x=0;
+  BHat.y=0;
+  BHat.z=0;
 
-    ka[0]=new DoubleSpinBox(parent->GetLayout()->NewRow(),"ka[0]:",0.,10,0.1,2,0.5);
-    ka[1]=new DoubleSpinBox(parent->GetLayout()->LastRowLastCol(),"ka[1]:",0.,10,0.1,2,0.5);
-    ka[2]=new DoubleSpinBox(parent->GetLayout()->LastRowLastCol(),"ka[2]:",0.,10.,0.1,2,0.);
+  ka[0]=new DoubleSpinBox(parent->GetLayout()->NewRow(),"ka[0]:",0.,10,0.1,2,0.5);
+  ka[1]=new DoubleSpinBox(parent->GetLayout()->LastRowLastCol(),"ka[1]:",0.,10,0.1,2,0.5);
+  ka[2]=new DoubleSpinBox(parent->GetLayout()->LastRowLastCol(),"ka[2]:",0.,10.,0.1,2,0.);
 
-    kb[0]=new DoubleSpinBox(parent->GetLayout()->NewRow(),"kb[0]:",0.,10,0.1,2,0.01);
-    kb[1]=new DoubleSpinBox(parent->GetLayout()->LastRowLastCol(),"kb[1]:",0.,10,0.1,2,0.01);
-    kb[2]=new DoubleSpinBox(parent->GetLayout()->LastRowLastCol(),"kb[2]:",0.,10,0.1,2,0.01);
-    
-    km[0]=new DoubleSpinBox(parent->GetLayout()->NewRow(),"km[0]:",0.,10,0.1,2,0.01);
-    km[1]=new DoubleSpinBox(parent->GetLayout()->LastRowLastCol(),"km[1]:",0.,10,0.1,2,0.01);
-    km[2]=new DoubleSpinBox(parent->GetLayout()->LastRowLastCol(),"km[2]:",0.,10,0.1,2,0.01);
+  kb[0]=new DoubleSpinBox(parent->GetLayout()->NewRow(),"kb[0]:",0.,10,0.1,2,0.01);
+  kb[1]=new DoubleSpinBox(parent->GetLayout()->LastRowLastCol(),"kb[1]:",0.,10,0.1,2,0.01);
+  kb[2]=new DoubleSpinBox(parent->GetLayout()->LastRowLastCol(),"kb[2]:",0.,10,0.1,2,0.01);
+
+  //put km to [0,0,0] to disable magnetometers
+  km[0]=new DoubleSpinBox(parent->GetLayout()->NewRow(),"km[0]:",0.,50,0.1,2,0.01);
+  km[1]=new DoubleSpinBox(parent->GetLayout()->LastRowLastCol(),"km[1]:",0.,50,0.1,2,0.01);
+  km[2]=new DoubleSpinBox(parent->GetLayout()->LastRowLastCol(),"km[2]:",0.,50,0.1,2,0.01);
   
+  magRef=new Vector3DSpinBox(parent->GetLayout()->NewRow(),"ref magnetic field (uT)",
+                                 0, 100, 1,
+                                 3,Vector3Df(20.5324,.2367,43.6682)); //Compiegne, France
   SetIsReady(true);
 }
@@ -82 +87 @@
     //float kb[3]={0.01,0.01,0.01};
     //float k_m[3]= {0,0,0};
-magRef.x=20.8296;
-magRef.y=.2095;
-magRef.z=43.3333;
+    magRef=this->magRef->Value();
 
     if(isInit==true) {

trunk/lib/FlairFilter/src/AhrsComplementaryFilter.h

@@ -24 +24 @@
     namespace gui {
         class DoubleSpinBox;
+        class Vector3DSpinBox;
     }
 }
@@ -70 +71 @@
             gui::DoubleSpinBox *kb[3];
             gui::DoubleSpinBox *km[3];
+            gui::Vector3DSpinBox *magRef;
     };
 } // end namespace filter