Diff: main.cpp

Revision:

4:12fe853d8bcf

Parent:

2:7aede71f4c22

diff -r 3d9e5f48b0c1 -r 12fe853d8bcf main.cpp
--- a/main.cpp	Wed Dec 17 09:52:27 2014 +0000
+++ b/main.cpp	Wed Dec 17 10:15:38 2014 +0000
@@ -6,6 +6,7 @@
 #include "ACS.h"
 #include "fault.h"
 #include "slave.h"
+#include "pin_config.h" 
 
 Serial pc(USBTX, USBRX);
 
@@ -57,6 +58,7 @@
 //--------------------------------------------------------------------------------------------------------------------------------------------------
 
 char hk_data[25];
+extern SensorData Sensor;
 extern SensorDataQuantised SensorQuantised;
 void t_hk_acq(void const *args)
 {
@@ -96,8 +98,13 @@
         t.start();
         mag_field= FUNC_ACS_MAG_EXEC();                              //actual execution
         omega = FUNC_ACS_EXEC_GYR();
+        Sensor.AngularSpeed[0]= omega[0];
+        Sensor.AngularSpeed[1]= omega[1];
+        Sensor.AngularSpeed[2]= omega[2];
         
-        
+        Sensor.Bnewvalue[0] = mag_field[0];
+        Sensor.Bnewvalue[1] = mag_field[1];
+        Sensor.Bnewvalue[2] = mag_field[2];
         
         if(acs_pflag == 1)
         {