Diff: COM_MNG_TMTC.h

Revision:

34:f0b518523381

Parent:

25:60964ad4f13b

Child:

35:3beac900a034

diff -r 8f5a4ce4ba4a -r f0b518523381 COM_MNG_TMTC.h
--- a/COM_MNG_TMTC.h	Wed Jan 06 14:52:12 2016 +0000
+++ b/COM_MNG_TMTC.h	Wed Jan 06 21:23:42 2016 +0000
@@ -81,7 +81,7 @@
 
 #define isit_obosc(tc_ptr, temp_obosc) {\
     temp_obosc = 0x00;\
-    if( GETapid(tc_ptr) == 2 ){\
+    if( GETapid(tc_ptr) == 0 ){\
         if( ((tc_ptr->TC_string[2]) >> 4) == 0xB ){\
             switch( (tc_ptr->TC_string[2]) & 0xf ){\
                 case 1:\
@@ -97,7 +97,7 @@
 
 #define isit_sdcard(tc_ptr, temp_sdcard) {\
     temp_sdcard = 0x00;\
-    if( GETapid(tc_ptr) == 2 ){\
+    if( GETapid(tc_ptr) == 0 ){\
         if( ( (tc_ptr->TC_string[2]) >> 4) == 0xF ){\
             switch( (tc_ptr->TC_string[2]) & 0xf ){\
                 case 0:\
@@ -613,7 +613,7 @@
         obosc_tm_current = obosc_tm_current->next_TM;\
     }\
     /*snd_tm.head_pointer(obosc_tm_head);*/\
-    /*adf_not_SDcard;*/\
+    /*adf_not_SDcard();*/\
     /*DELETE THE TM AFTER USE*/\
     obosc_tm_current = obosc_tm_head;\
     int overCount = 0;\
@@ -633,8 +633,9 @@
 
 #define EXECUTE_TC {\
     gMASTER_STATE = TCL_STATE_EXECUTING;\
+    /*gPC.printf("%u\r\n", gTOTAL_VALID_TC);*/\
     for(uint8_t execute_psc = PSC_START_VALUE ; execute_psc < gTOTAL_VALID_TC ; ++execute_psc ){\
-        gPC.printf("executing normal %u\r\n", execute_psc);\
+        /*gPC.printf("executing normal %u\r\n", execute_psc);*/\
         /*gLEDG = !gLEDG;*/\
         /*gLEDR = !gLEDR;*/\
         Base_tc* current_TC = gHEAD_NODE_TCL;\
@@ -684,6 +685,7 @@
                                 PUTexec_status(current_TC, temp16);\
                             }\
                             else{\
+                                /*gPC.puts("TC_STATE_EXECUTION_FAILED");*/\
                                 uint16_t temp16 = TC_STATE_EXECUTION_FAILED;\
                                 PUTexec_status(current_TC, temp16);\
                             }\
@@ -739,6 +741,7 @@
                                 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]);\
                                 }\
@@ -746,7 +749,7 @@
                             }\
                             /*SEND DATA TO GS*/\
                             /*snd_tm.head_pointer(tm_ptr_head);*/\
-                            /*adf_not_SDcard;*/\
+                            /*adf_not_SDcard();*/\
                             /*DELETE THE TM AFTER USE*/\
                             tm_ptr = tm_ptr_head;\
                             overflowCountExecute = 0;\