Diff: ACS.cpp

Revision:

6:036d08b62785

Parent:

3:07e15677a75c

Child:

8:82250e41da81

diff -r bb592f3185cc -r 036d08b62785 ACS.cpp
--- a/ACS.cpp	Thu Dec 31 17:12:52 2015 +0000
+++ b/ACS.cpp	Fri Jan 22 19:51:50 2016 +0000
@@ -6,7 +6,7 @@
 #include "pni.h" //pni header file
 #include "pin_config.h"
 #include "ACS.h"
-
+#include "EPS.h"
 
 //********************************flags******************************************//
 extern uint32_t BAE_STATUS;
@@ -34,6 +34,7 @@
 int g_err_flag_TR_z=0;       // setting z-flag to zero
 
 extern float data[6];
+extern BAE_HK_actual actual_data;
 
 
 //DigitalOut gpo1(PTC0); // enable of att sens2 switch
@@ -291,8 +292,10 @@
       //          pc_acs.printf("%f\t",mag_data[i]);
             }
             for(int i=0; i<3; i++) {
-                data[i]=gyro_data[i];
-                data[i+3]=mag_data[i];
+               // data[i]=gyro_data[i];
+                actual_data.AngularSpeed_actual[i] = gyro_data[i];
+                actual_data.Bvalue_actual[i] = mag_data[i];
+                //data[i+3]=mag_data[i];
             }
           //  return(combined_values); //returning poiter combined values
         }