Diff: CalculateData.h

Revision:

5:62994bb9fff9

Parent:

4:7d13076ecece

diff -r 7d13076ecece -r 62994bb9fff9 CalculateData.h
--- a/CalculateData.h	Fri Apr 24 15:10:06 2020 +0000
+++ b/CalculateData.h	Wed Apr 29 10:54:59 2020 +0000
@@ -49,12 +49,12 @@
 private:
 
     
-    void                        integrate(double *x, double *x_old, double *y, double t, double t_old);
-    //void                        transform(int *acc, int *angle);
-    void                        filterAcc(int array[3][30],int index, double *target);
-    void                        filterGyro(int array[3][30],int index, double *target);
-    void                        filterSpeed(double *array, double *target);
+    void                        integrate(float *x, float *x_old, float *y, float t, float t_old);
+    void                        transform(int old_val[3][100], int index, float *new_val, int roll, int pitch, int yaw);
+    void                        filterAcc(float *array);
+    void                        filterSpeed(float *array);
     void                        run();
+    void                        calibrationMag(int x,int y,int z, float *buff);
 
     
     
@@ -69,16 +69,13 @@
     bool                        periodic_task;          //boolean periodic condition
     
     
-    double                      acc[3];         
-    double                      gyro[3];
-    double                      acc_old[3];
-    double                      gyro_old[3];
-    double                      speed[3];
-    double                      speed_old[3];
-    double                      angle[3];
-    double                      pos[3];
-    double                      t[30];
-    double                      t_old;
+    float                       acc[3];
+    float                       acc_old[3];
+    float                       speed[3];
+    float                       speed_old[3];
+    float                       pos[3];
+    float                       t[100];
+    float                       t_old;
   
     
 };