Diff: EPS.cpp

Revision:

27:61c856be467e

Parent:

20:949d13045431

Child:

33:76f2b8735501

diff -r 950dbe9fbeb8 -r 61c856be467e EPS.cpp
--- a/EPS.cpp	Fri Jul 01 18:14:34 2016 +0000
+++ b/EPS.cpp	Sat Jul 02 14:06:34 2016 +0000
@@ -522,14 +522,16 @@
     BAE_HK_data[4] = ACS_ATS_STATUS;
     BAE_HK_data[5] = ACS_TR_XY_SW_STATUS;
     BAE_HK_data[5] = (BAE_HK_data[5]<<2)| ACS_TR_Z_SW_STATUS;
-    BAE_HK_data[5] = (BAE_HK_data[5]<<1) | ACS_DETUMBLING_ALGO_TYPE;
-    BAE_HK_data[5] = (BAE_HK_data[5]<<3) | ACS_STATE;
-    BAE_HK_data[6] = BCN_TX_SW_STATUS;
+    BAE_HK_data[5] = (BAE_HK_data[5]<<4) | ACS_STATE;
+    
+    BAE_HK_data[6] = ACS_DETUMBLING_ALGO_TYPE;
+    BAE_HK_data[6] = (BAE_HK_data[6]<<2) | BCN_TX_SW_STATUS;
     BAE_HK_data[6] = (BAE_HK_data[6]<<1) | BCN_SPND_TX;
     BAE_HK_data[6] = (BAE_HK_data[6]<<1) | BCN_FEN;
     BAE_HK_data[6] = (BAE_HK_data[6]<<1) | BCN_LONG_MSG_TYPE;
     BAE_HK_data[6] = (BAE_HK_data[6]<<1) | EPS_BTRY_HTR_AUTO;//EPS_BATTERY_HEATER_ENABLE
-    //now two spares in BAE_HK_data[5]
+    BAE_HK_data[6] = (BAE_HK_data[6]<<1);
+    //now one spares in BAE_HK_data[5]
     BAE_HK_data[7] = BAE_RESET_COUNTER;
     BAE_HK_data[8] = EPS_SOC_LEVEL_12; 
     BAE_HK_data[9] = EPS_SOC_LEVEL_23;
@@ -569,18 +571,19 @@
                                                                 
     BAE_HK_data[30] = ACS_DATA_ACQ_STATUS;
     BAE_HK_data[30] = (BAE_HK_data[30]<<1) | ACS_MAIN_STATUS;
-    BAE_HK_data[30] = (BAE_HK_data[30]<<3) | ACS_STATUS;
+    BAE_HK_data[30] = (BAE_HK_data[30]<<4) | ACS_STATUS;
     BAE_HK_data[30] = (BAE_HK_data[30]<<1) | EPS_INIT_STATUS;
-    BAE_HK_data[30] = (BAE_HK_data[30]<<3) | EPS_BATTERY_GAUGE_STATUS;
-                                                                
-    BAE_HK_data[31] = EPS_MAIN_STATUS;
+    
+    BAE_HK_data[31] = EPS_BATTERY_GAUGE_STATUS;
+    BAE_HK_data[31] = (BAE_HK_data[31]<<1) | EPS_MAIN_STATUS;
     BAE_HK_data[31] = (BAE_HK_data[31]<<1) | EPS_BATTERY_TEMP_STATUS;
     BAE_HK_data[31] = (BAE_HK_data[31]<<3) | EPS_STATUS;
     BAE_HK_data[31] = (BAE_HK_data[31]<<2) | CDMS_SW_STATUS;
-    //BAE_HK_data[31] = (BAE_HK_data[31]<<1) | EPS_BTRY_HTR_STATUS;//new to : implement===========
-    //spare 1
-    //spare 5
-    BAE_HK_data[32] =  BAE_STANDBY;
+    ////BAE_HK_data[31] = (BAE_HK_data[31]<<1) | EPS_BTRY_HTR_STATUS;//new to : implement===========
+    
+    //BAE_HK_data[32] = EPS_BTRY_HTR_STATUS;
+    //spare 4
+    BAE_HK_data[32] = (BAE_HK_data[32]<<7) | BAE_STANDBY;
     // 6 next telemetries value to be given by registers
     BAE_HK_data[33] = ATS1_EVENT_STATUS_RGTR;
     BAE_HK_data[34] = ATS1_SENTRAL_STATUS_RGTR;
@@ -624,11 +627,12 @@
     BAE_HK_data[62] = (BAE_HK_data[62]<<1) | EPS_CHARGER_FAULT;
     BAE_HK_data[62] = (BAE_HK_data[62]<<1) | EPS_CHARGER_STATUS;
                                                                 
-    BAE_HK_data[63] = (BAE_HK_data[63]<<1) | EPS_BATTERY_GAUGE_ALERT;
+    BAE_HK_data[63] = EPS_BATTERY_GAUGE_ALERT;
     BAE_HK_data[63] = (BAE_HK_data[63]<<1) | CDMS_OC_FAULT;
     BAE_HK_data[63] = (BAE_HK_data[63]<<1) | ACS_ATS1_OC_FAULT;
     BAE_HK_data[63] = (BAE_HK_data[63]<<1) | ACS_ATS2_OC_FAULT;
     BAE_HK_data[63] = (BAE_HK_data[63]<<1) | ACS_TR_Z_FAULT;
+    BAE_HK_data[63] = (BAE_HK_data[63]<<3);
     //3 spare
                                                                 
     BAE_HK_data[64] = ACS_TR_X_PWM;
@@ -639,8 +643,9 @@
                                                                 
     //assign it b_scz_angle
     BAE_HK_data[67] = 0x00; 
-    BAE_HK_data[67] = (BAE_HK_data[65]<<1) | alarmmode;
-    BAE_HK_data[67] = (BAE_HK_data[65]<<1) | controlmode_mms;
+    BAE_HK_data[67] = (BAE_HK_data[67]<<1) | alarmmode;
+    BAE_HK_data[67] = (BAE_HK_data[67]<<1) | controlmode_mms;
+    BAE_HK_data[67] = (BAE_HK_data[67]<<2);
     //2 bit spare
                                                                 
     for(int i=0;i<9;i++)