Diff: ACS.cpp

Revision:

2:3c6c33509772

Parent:

1:7185136654ce

diff -r 7185136654ce -r 3c6c33509772 ACS.cpp
--- a/ACS.cpp	Mon Jul 06 07:34:00 2015 +0000
+++ b/ACS.cpp	Fri Jul 10 10:09:56 2015 +0000
@@ -41,7 +41,7 @@
 
 void  FCTN_ACS_INIT()
 {
-    BAE_STATUS |= 0x00000080;             //set ACS_INIT_STATUS flag to 1
+    BAE_STATUS = (BAE_STATUS & 0xFFFFFF7F) +0x00000080;             //set ACS_INIT_STATUS flag to 1
     FCTN_ATS_SWITCH(1);
     char store;
     g_cmd[0]=RESETREQ;
@@ -97,8 +97,8 @@
 
 void FCTN_ACS_DATA_ACQ(float g_gyro_data[3],float g_mag_data[3])
 {
-    BAE_STATUS |= 0x00000020;     //set ACS_DATA_ACQ_STATUS flag to 1
-    if(BAE_ENABLE & 0x00000010 == 0x00000010)       // check ACS_ATS_ENABLE = 1?
+    BAE_STATUS =(BAE_STATUS & 0xFFFFFEFF)  0x00000100;     //set ACS_DATA_ACQ_STATUS flag to 1
+    if(BAE_ENABLE & 0x00000004 == 0x00000004)       // check ACS_ATS_ENABLE = 1?
     {
         char status;
         g_toflag=1; //toFlag is set to 1 so that it enters while loop
@@ -135,14 +135,14 @@
                 FCTN_ATS_SWITCH(0);
             }
         }
-        BAE_STATUS |= 0x00000100;            //set ACS_ATS_STATUS = ACS_ATS_OPERATIONAL 
+      //  BAE_STATUS |= 0x00000000;            //set ACS_ATS_STATUS = ACS_ATS_OPERATIONAL 
     }
     else
     {
-        BAE_STATUS |= 0x000000C0;             //set ACS_DATA_ACQ_ATS = ACS_ATS_DISABLED // ACS_DATA_ACQ_STATUS = ACS_DATA_ACQ_FAILURE
+        BAE_STATUS =(BAE_STATUS & 0xFFFFFEFF)+ 0x00000200;             //set ACS_DATA_ACQ_ATS = ACS_ATS_DISABLED // ACS_DATA_ACQ_STATUS = ACS_DATA_ACQ_FAILURE
     }
        
-    BAE_STATUS &= 0xFFFFFFDF;     //clear ACS_DATA_ACQ_STATUS flag to 1
+    BAE_STATUS &= 0xFFFFFEFF;     //clear ACS_DATA_ACQ_STATUS flag to 1
 }
 
 void FCTN_GET_DATA(float g_gyro_data[3],float g_mag_data[3])