Diff: main.cpp

Revision:

63:55d32e7dcad7

Parent:

61:9348606edee2

Child:

65:d1b12729fcdc

diff -r 9348606edee2 -r 55d32e7dcad7 main.cpp
--- a/main.cpp	Fri Oct 28 10:02:40 2016 +0000
+++ b/main.cpp	Fri Oct 28 11:47:20 2016 +0000
@@ -401,6 +401,7 @@
 
 //================================================================================
 //default flash array some filler bits added (detail in MMS file)
+//uint32_t ARR_INITIAL_VAL[8]={0x73532600,0x505A4141,0x1A1A1400,0x00000000,0x00000000,0x00000000,0xCBA20000,0x00000000};//to be done
 uint32_t ARR_INITIAL_VAL[8]={0x73532600,0x505A4141,0x1A1A1400,0x001E0028,0x001E0028,0x00320032,0xCBA2010A,0x00000000};//to be done
 
 void FLASH_INI()
@@ -636,7 +637,7 @@
             pc.printf("\n\r Z only \n\r");              
             DRV_Z_EN = 1;
             DRV_XY_EN = 0;
-            ACS_TR_Z_ENABLE = 1;
+             ACS_TR_Z_ENABLE = 1;
     ACS_TR_XY_ENABLE = 0;
             ACS_STATUS = 3;                 // set ACS_STAUS = ACS_TRXY_DISABLED , Z axis only
             moment[0] = 0;
@@ -656,7 +657,7 @@
             pc.printf("\n\r Z only no data \n\r");
             DRV_Z_EN = 1;
             DRV_XY_EN = 0;
-            ACS_TR_Z_ENABLE = 1;
+             ACS_TR_Z_ENABLE = 1;
     ACS_TR_XY_ENABLE = 0;
             ACS_STATUS = 3;                 // set Set ACS_STATUS = ACS_DATA_ACQN_FAILURE , Z axis only
             
@@ -677,7 +678,7 @@
             pc.printf("\n\r Z only by state \n\r");
             DRV_Z_EN = 1;
             DRV_XY_EN = 0;
-            ACS_TR_Z_ENABLE = 1;
+             ACS_TR_Z_ENABLE = 1;
     ACS_TR_XY_ENABLE = 0;
             ACS_STATUS = 3;                 // set ACS_STAUS = ACS_TRXY_DISABLED by ACS_STATE i.e Z axis only
             
@@ -694,7 +695,7 @@
             pc.printf("\n\r MM only BDOT \n\r");
             DRV_Z_EN = 1;
             DRV_XY_EN = 1;
-            ACS_TR_Z_ENABLE = 1;
+             ACS_TR_Z_ENABLE = 1;
     ACS_TR_XY_ENABLE = 1;
                               
             ACS_STATUS = 4;                 // set Set ACS_STATUS = ACS_BDOT_CONTROL
@@ -718,9 +719,9 @@
                 pc.printf("\n\r Nominal mode \n");
             #endif
             DRV_Z_EN = 1;
-            DRV_XY_EN = 1;  
+            DRV_XY_EN = 1;            
             ACS_TR_Z_ENABLE = 1;
-    ACS_TR_XY_ENABLE = 1;          
+    ACS_TR_XY_ENABLE = 1;
             
             //timer_FCTN_ACS_CNTRLALGO.start();   
             FCTN_ACS_CNTRLALGO(moment,mag_data,gyro_data,0x01,0x00,ACS_DETUMBLING_ALGO_TYPE);
@@ -750,10 +751,9 @@
                 pc.printf("\n\r Auto control mode \n");
             #endif 
             DRV_Z_EN = 1;
-            DRV_XY_EN = 1;     
-            
+            DRV_XY_EN = 1;
             ACS_TR_Z_ENABLE = 1;
-    ACS_TR_XY_ENABLE = 1;         
+    ACS_TR_XY_ENABLE = 1;              
             
             timer_FCTN_ACS_CNTRLALGO.start();   
             FCTN_ACS_CNTRLALGO(moment,mag_data,gyro_data,0x00,0x00,ACS_DETUMBLING_ALGO_TYPE);
@@ -781,11 +781,9 @@
         {
             pc.printf("\n\r Detumbling \n\r");
             DRV_Z_EN = 1;
-            DRV_XY_EN = 1; 
-            
+            DRV_XY_EN = 1;
             ACS_TR_Z_ENABLE = 1;
-    ACS_TR_XY_ENABLE = 1;
-          
+    ACS_TR_XY_ENABLE = 1;       
             FCTN_ACS_CNTRLALGO(moment,mag_data,gyro_data,0x00,0x01,ACS_DETUMBLING_ALGO_TYPE);
             controlmode_mms = 0x00;
             FCTN_ACS_GENPWM_MAIN(moment) ;  
@@ -794,9 +792,9 @@
         }
     ACS_STATUS = 7;                    //INVALID_STATE
     DRV_Z_EN = 0;
-    DRV_XY_EN = 0;    
     ACS_TR_Z_ENABLE = 0;
     ACS_TR_XY_ENABLE = 0;
+    DRV_XY_EN = 0;    
     ACS_MAIN_STATUS = 0; //clear ACS_MAIN_STATUS flag 
 }