Diff: TCTM.cpp

Revision:

33:76f2b8735501

Parent:

27:61c856be467e

Child:

34:1b41c34b12ea

Child:

39:670133e7ffd8

--- a/TCTM.cpp	Sat Jul 02 14:06:34 2016 +0000
+++ b/TCTM.cpp	Mon Jul 04 04:29:59 2016 +0000
@@ -126,6 +126,8 @@
 extern uint8_t BCN_TMP;
 extern void F_BCN();
 extern void FCTN_BCN_TX_MAIN();
+extern uint8_t SHORT_HK_data[15];
+extern void FCTN_BCN_SPND_TX();
 
 
 //BAE
@@ -143,6 +145,7 @@
 //extern DigitalOut TRZ_SW_EN; //same as TRZ_SW
 extern uint32_t BAE_ENABLE;
 extern uint16_t BAE_I2C_COUNTER;
+extern uint8_t LONG_HK_data[2][134];
 //extern uint8_t BCN_FAIL_COUNT;
 
 
@@ -152,18 +155,19 @@
 extern uint8_t EPS_BATT_TEMP_LOW;
 extern uint8_t EPS_BATT_TEMP_HIGH;
 extern uint8_t EPS_BATT_TEMP_DEFAULT;
-extern DigitalOut EN_BTRY_HT;
+extern DigitalOut BTRY_HTR_ENABLE;
 extern uint8_t EPS_SOC_LEVEL_12;
 extern uint8_t EPS_SOC_LEVEL_23;
 extern uint8_t EPS_INIT_STATUS;
 extern uint8_t EPS_BATTERY_GAUGE_STATUS ;
 extern uint8_t EPS_MAIN_STATUS;
-extern uint8_t EPS_BATTERY_TEMP_STATUS ;
+extern uint8_t EPS_BTRY_TMP_STATUS ;
 extern uint8_t EPS_STATUS ;
 extern uint8_t EPS_BAT_TEMP_LOW;
 extern uint8_t EPS_BAT_TEMP_HIGH;
 extern uint8_t EPS_BAT_TEMP_DEFAULT;
 extern uint16_t EPS_MAIN_COUNTER;
+extern uint8_t EPS_BTRY_HTR;
 
 extern DigitalOut SelectLineb3; // MSB of Select Lines
 extern DigitalOut SelectLineb2;
@@ -187,7 +191,13 @@
 
 uint16_t crc_hk_data()//gencrc16_for_me()
 {
-    uint16_t crc = CRC::crc16_gen(BAE_HK_data,132);//BAE_chardata i.e char data type usesd earlier
+    uint16_t crc = CRC::crc16_gen(&LONG_HK_data[1][0],132);//BAE_chardata i.e char data type usesd earlier BAE_HK_data
+    return crc;
+}
+
+uint8_t crc8_short()
+{
+    uint8_t crc = CRC::crc8_gen(SHORT_HK_data,14);
     return crc;
 }
 
@@ -386,11 +396,12 @@
                                                                 
                                                                 telemetry[30] = EPS_BATTERY_GAUGE_STATUS;
                                                                 telemetry[30] = (telemetry[30]<<1) | EPS_MAIN_STATUS;
-                                                                telemetry[30] = (telemetry[30]<<1) | EPS_BATTERY_TEMP_STATUS;
+                                                                telemetry[30] = (telemetry[30]<<1) | EPS_BTRY_TMP_STATUS;
                                                                 telemetry[30] = (telemetry[30]<<3) | EPS_STATUS;
                                                                 telemetry[30] = (telemetry[30]<<2) | CDMS_SW_STATUS;
                                                         //        telemetry[30] = (telemetry[30]<<1) | EPS_BTRY_HTR_STATUS;//new to : implement
-                                                                //telemetry[31] = EPS_BTRY_HTR_STATUS;//new to : implement
+                                                                
+                                                                telemetry[31] = EPS_BTRY_HTR;   //new to : implement
                                                                 //spare 4
                                                                 telemetry[31] = (telemetry[31]<<7) | BAE_STANDBY;
                                                                 // 6 next telemetries value to be given by registers
@@ -1137,7 +1148,7 @@
                                                                     }
                                                                 else if(BCN_SPND_STATE==0x01)
                                                                     {
-                                                                        BCN_SPND_TX=1;
+                                                                        FCTN_BCN_SPND_TX();
                                                                         //stop BCN_STANDBY_TIMER.start();//create
                                                                         if(BCN_TX_MAIN_STATUS==0)
                                                                             {
@@ -1178,7 +1189,7 @@
                                                                         HTR_CYCLE_COUNTS  = tc[4];
                                                                         if(HTR_CYCLE_COUNTS==0x00)
                                                                             {
-                                                                                EN_BTRY_HT = 0;
+                                                                                BTRY_HTR_ENABLE = 0;
                                                                                 HTR_CYCLE->stop();
                                                                                 //clear EPS_BTRY_HTR is it
                                                                                 EPS_BTRY_HTR_AUTO = 0;