Revision 211:77bee0cbebfe, committed 2016-06-18

Comitter:

aniruddhv

Date:

Sat Jun 18 09:07:28 2016 +0000

Parent:

180:ccc21cc163f8

Child:

212:3d13a06bcd3a

Commit message:

delete CDMS TC, update unknown TC_STATUS,

Changed in this revision

--- a/COM_MNG_TMTC.h	Wed May 25 15:28:32 2016 +0000
+++ b/COM_MNG_TMTC.h	Sat Jun 18 09:07:28 2016 +0000
@@ -63,6 +63,7 @@
                 temp8 = tm_ptr->TM_string[TM_ACK_CODE_INDEX];\
                 temp8 = temp8 & 0x0F;\
                 if( temp8 == CRC_FAIL_NACK_CODE ){\
+                    temp_ack = 0x02;
                     tm_ptr->TM_string[2] = tc_psc;\
                 }\
             }\
@@ -1138,6 +1139,11 @@
                                 uint16_t temp16 = TC_STATE_SUCCESSFULLY_EXECUTED;\
                                 PUTexec_status(current_TC, temp16);\
                             }\
+                            else if( temp83 == 0x02){\
+                                /*gPC.puts("TC_STATE_EXECUTION_UNKNOWN");*/\
+                                uint16_t temp16 = TC_STATE_EXECUTION_UNKNOWN;\
+                                PUTexec_status(current_TC, temp16);\
+                            }\
                             else{\
                                 /*gPC.puts("TC_STATE_EXECUTION_FAILED");*/\
                                 uint16_t temp16 = TC_STATE_EXECUTION_FAILED;\

--- a/COM_POWER_OFF_TX.h	Wed May 25 15:28:32 2016 +0000
+++ b/COM_POWER_OFF_TX.h	Sat Jun 18 09:07:28 2016 +0000
@@ -17,6 +17,7 @@
     RESET_tc->TC_string[9]  = (crc16 & 0xFF00)>>8;\
     RESET_tc->TC_string[10] = (crc16 & 0x00FF);\
     FCTN_CDMS_RLY_TMTC(RESET_tc);\
+    delete RESET_tc;\
 }
 
 #define power_on_bae {\
@@ -39,6 +40,7 @@
     power_on_BAE->TC_string[10] = (crc16 & 0x00FF);\
     Base_tm *tm_ptr = new Short_tm;\
     tm_ptr =  FCTN_CDMS_RLY_TMTC(power_on_BAE);\
+    delete power_on_BAE;\
     /*DELETE THE TM AFTER USE*/\
     Base_tm *del_tm = tm_ptr;\
     int overCount = 0;\
@@ -76,6 +78,7 @@
     beacon_tc->TC_string[10] = (crc16 & 0x00FF);\
     Base_tm *tm_ptr = new Short_tm;\
     tm_ptr =  FCTN_CDMS_RLY_TMTC(beacon_tc);\
+    delete beacon_tc;\
 }
 
 #define COM_POWER_OFF_TX {\

--- a/COM_POWER_ON_TX.h	Wed May 25 15:28:32 2016 +0000
+++ b/COM_POWER_ON_TX.h	Sat Jun 18 09:07:28 2016 +0000
@@ -17,6 +17,7 @@
     beacon_tc->TC_string[9]  = (crc16 & 0xFF00)>>8;\
     beacon_tc->TC_string[10] = (crc16 & 0x00FF);\
     tm_ptr =  FCTN_CDMS_RLY_TMTC(beacon_tc);\
+    delete beacon_tc;\
 }
 
 #define reset_bae {\
@@ -39,6 +40,7 @@
     reset_BAE->TC_string[10] = (crc16 & 0x00FF);\
     Base_tm *tm_ptr = new Short_tm;\
     tm_ptr =  FCTN_CDMS_RLY_TMTC(reset_BAE);\
+    delete reset_BAE;\
     /*DELETE THE TM AFTER USE*/\
     Base_tm *del_tm = tm_ptr;\
     int overCount = 0;\
@@ -76,6 +78,7 @@
     power_off_BAE->TC_string[10] = (crc16 & 0x00FF);\
     Base_tm *tm_ptr = new Short_tm;\
     tm_ptr =  FCTN_CDMS_RLY_TMTC(power_off_BAE);\
+    delete power_off_BAE;\
     /*DELETE THE TM AFTER USE*/\
     Base_tm *del_tm = tm_ptr;\
     int overCount = 0;\
@@ -113,6 +116,7 @@
     hk_main_ptr->TC_string[10] = (crc16 & 0x00FF);\
     Base_tm *tm_ptr = new Short_tm;\
     tm_ptr =  FCTN_CDMS_RLY_TMTC(hk_main_ptr);\
+    delete hk_main_ptr;\
     /*DELETE THE TM AFTER USE*/\
     Base_tm *del_tm = tm_ptr;\
     int overCount = 0;\
@@ -149,6 +153,7 @@
     bcn_tx_main_ptr->TC_string[9]  = (crc16 & 0xFF00)>>8;\
     bcn_tx_main_ptr->TC_string[10] = (crc16 & 0x00FF);\
     tm_ptr =  FCTN_CDMS_RLY_TMTC(bcn_tx_main_ptr);\
+    delete bcn_tx_main_ptr;\
 }
 
 void COM_POWER_ON_TX() {

--- a/DefinitionsAndGlobals.h	Wed May 25 15:28:32 2016 +0000
+++ b/DefinitionsAndGlobals.h	Sat Jun 18 09:07:28 2016 +0000
@@ -27,11 +27,10 @@
 
 // TC LIST
     #define TCL_STATE_INCOMPLETE 0x00
-    #define TCL_STATE_ABORTED 0x03
-    #define TCL_STATE_EXECUTING 0x04   
-    #define TCL_STATE_COMPLETED 0x05
-    #define TCL_STATE_EXCEEDED_LIMIT 0x06
-
+    #define TCL_STATE_ABORTED 0x01
+    #define TCL_STATE_EXECUTING 0x02   
+    #define TCL_STATE_COMPLETED 0x03
+    
 // LIST OF FLAGS
     #define UART_INT_FLAG 0x0001
     #define NEW_TC_RECEIVED 0x0002
@@ -41,6 +40,7 @@
     #define COM_SESSION_VALIDITY 0x0020
     #define ALL_CRC_PASS_FLAG 0x0040
     #define COM_PA_HOT_FLAG 0x0080
+    #define COM_PA_OC_FLAG 0x8000
     #define COM_TX_FLAG 0x0100
     #define COM_SESSION_TIMEOUT_FLAG 0x0200
     #define COM_AUTO_POWER_OFF_BAE_FLAG 0x0400

--- a/Structures.h	Wed May 25 15:28:32 2016 +0000
+++ b/Structures.h	Sat Jun 18 09:07:28 2016 +0000
@@ -27,8 +27,9 @@
 0: unexecuted
 1: successfully executed
 2: Execution Failed
-3: Disabled
-4: Marked For retry
+3: CRC error
+4: Disabled
+5: Marked For retry
 */
 #define TC_STATE_UNEXECUTED 0x00
 #define TC_STATE_SUCCESSFULLY_EXECUTED 0x01