Diff: COM_MNG_TMTC.h

Revision:

44:b9b067d0559f

Parent:

37:c9a739750806

Child:

45:4c10559cd886

--- a/COM_MNG_TMTC.h	Sat Jan 09 09:56:01 2016 +0000
+++ b/COM_MNG_TMTC.h	Sat Jan 09 13:59:01 2016 +0000
@@ -641,6 +641,26 @@
                     else if( (current_exec_status == TC_STATE_EXECUTION_FAILED) && (GETabort_on_nack(current_TC) == 1) ){\
                         /*gPC.printf("abort on nack at %u psc\r\n", execute_psc);*/\
                         gMASTER_STATE = TCL_STATE_ABORTED;\
+                        Base_tm *tm_ptr_head = NULL;\
+                        get_call_sign(tm_ptr_head);\
+                        Base_tm *tm_ptr = tm_ptr_head;\
+                        get_ack_l1(tm_ptr->next_TM);\
+                        tm_ptr = tm_ptr_head;\
+                        while( tm_ptr != NULL ){\
+                            int length = TM_SHORT_SIZE;\
+                            if( GETshort_or_long_tm(tm_ptr->fields) == SHORT_TM_CODE ){\
+                                length = TM_SHORT_SIZE;\
+                            }\
+                            else{\
+                                length = TM_LONG_SIZE;\
+                            }\
+                            /*gPC.puts("Printing Call Sign, ACK_L1, TM list");*/\
+                            for(int i = 0 ; i < length ; ++i){\
+                                gPC.putc(tm_ptr->TM_string[i]);\
+                            }\
+                            tm_ptr = tm_ptr->next_TM;\
+                        }\
+                        /*snd_tm.head_pointer(tm_ptr_head);*/\
                         break;\
                     }\
                     else if( (current_exec_status == TC_STATE_UNEXECUTED) || (current_exec_status == TC_STATE_MARKED_RETRY) ){\
@@ -783,27 +803,6 @@
                             get_call_sign(tm_ptr_head);\
                             Base_tm *put_tm_here = NULL;\
                             /*execute_obsrs(current_TC, put_tm_here)*/\
-                            /*PENDING: APPEND ACK L1*/\
-                            Base_tm *tm_ptr = tm_ptr_head;\
-                            get_ack_l1(tm_ptr->next_TM);\
-                            int overflowCountExecute = 0;\
-                            while( tm_ptr->next_TM != NULL ){\
-                                if( overflowCountExecute < TM_OVERFLOW_CONSTANT ){\
-                                    tm_ptr = tm_ptr->next_TM;\
-                                    ++overflowCountExecute;\
-                                }\
-                                else{\
-                                    /*PENDING: RESET CDMS*/\
-                                    break;\
-                                }\
-                            }\
-                            tm_ptr->next_TM = put_tm_here;\
-                            /*CHECK FOR HOT PA*/\
-                            uint8_t tempPAhot = 0x00;\
-                            isPAhot(tempPAhot);\
-                            if( tempPAhot == 0x00 ){\
-                                gFLAGS = gFLAGS | COM_PA_HOT_FLAG;\
-                            }\
                             /*read_TC(current_TC);*/\
                             uint8_t tempExec = TC_STATE_SUCCESSFULLY_EXECUTED;\
                             PUTexec_status(current_TC, tempExec);\
@@ -833,6 +832,27 @@
                                     gMASTER_STATE = TCL_STATE_COMPLETED;\
                                 }\
                             }\
+                            /*PENDING: APPEND ACK L1*/\
+                            Base_tm *tm_ptr = tm_ptr_head;\
+                            get_ack_l1(tm_ptr->next_TM);\
+                            int overflowCountExecute = 0;\
+                            while( tm_ptr->next_TM != NULL ){\
+                                if( overflowCountExecute < TM_OVERFLOW_CONSTANT ){\
+                                    tm_ptr = tm_ptr->next_TM;\
+                                    ++overflowCountExecute;\
+                                }\
+                                else{\
+                                    /*PENDING: RESET CDMS*/\
+                                    break;\
+                                }\
+                            }\
+                            tm_ptr->next_TM = put_tm_here;\
+                            /*CHECK FOR HOT PA*/\
+                            uint8_t tempPAhot = 0x00;\
+                            isPAhot(tempPAhot);\
+                            if( tempPAhot == 0x00 ){\
+                                gFLAGS = gFLAGS | COM_PA_HOT_FLAG;\
+                            }\
                             tm_ptr = tm_ptr_head;\
                             while( tm_ptr != NULL ){\
                                 int length = TM_SHORT_SIZE;\