Diff: main.cpp

Revision:

1:446a959e36ce

Parent:

0:7b4c00e3912f

Child:

3:07e15677a75c

--- a/main.cpp	Thu Dec 24 19:15:43 2015 +0000
+++ b/main.cpp	Thu Dec 24 20:01:31 2015 +0000
@@ -50,8 +50,11 @@
 float data[6];
 
 extern float moment[3];
-extern SensorData Sensor; 
 extern uint8_t BCN_FEN;
+extern BAE_HK_actual actual_data;
+extern BAE_HK_quant quant_data;
+extern BAE_HK_min_max bae_HK_minmax;
+extern BAE_HK_arch arch_data;
 
 bool write_ack = 1;
 bool read_ack = 1;
@@ -140,7 +143,7 @@
     }
     else
     {
-            if(Sensor.power_mode>1)
+            if(actual_data.power_mode>1)
             
             {
                 if(ACS_STATE == '2')   // check ACS_STATE = ACS_ZAXIS_MOMENT_ONLY 
@@ -244,7 +247,7 @@
         //FCTN_READ_HK();
         //FCTN_APPEND_HKDATA();
         FCTN_BATTERYGAUGE_MAIN(actual_data.Batt_gauge_actual);
-        if (actual_data.Battery_gauge_actual[1] == 200)   //data not received
+        if (actual_data.Batt_gauge_actual[1] == 200)   //data not received
         {
           actual_data.power_mode = 1;
           EPS_BATTERY_GAUGE_STATUS = 'c';           //clear EPS_BATTERY_GAUGE_STATUS
@@ -252,7 +255,7 @@
         }
         else
         {
-          FCTN_EPS_POWERMODE(actual_data.Battery_gauge_actual[1]);            //updating power level 
+          FCTN_EPS_POWERMODE(actual_data.Batt_gauge_actual[1]);            //updating power level 
           EPS_BATTERY_GAUGE_STATUS = 's';           //set EPS_BATTERY_GAUGE_STATUS
         }
        /* if( Temperature data received)
@@ -360,12 +363,12 @@
     }
     if(schedcount%1==0)
     {
-        ptr_t_acs -> signal_set(0x1);
+        //ptr_t_acs -> signal_set(0x1);
     }
     
     if(schedcount%2==0)
     {
-       // ptr_t_eps -> signal_set(0x2);
+        ptr_t_eps -> signal_set(0x2);
         
     }
     if(schedcount%3==0)
@@ -451,7 +454,7 @@
 void FCTN_BAE_INIT()
 {
     printf("\n\r Initialising BAE ");
-    FCTN_ACS_INIT();
+   // FCTN_ACS_INIT();
     FCTN_EPS_INIT();
     //P_BCN_INIT();
     FLAG();