Revision 23:c89376564196, committed 2016-01-06

Comitter:

rohit3342

Date:

Wed Jan 06 13:24:24 2016 +0000

Parent:

22:5febef18443d

Child:

37:c9a739750806

Child:

70:c4a9b78d1c89

Commit message:

Removed debugging printf statements. Modified apid check-values for OBOSC and OBSRS. Modified TC_EXEC status for disabled and retry.

Changed in this revision

--- a/COM_MNG_TMTC.h	Tue Jan 05 10:59:56 2016 +0000
+++ b/COM_MNG_TMTC.h	Wed Jan 06 13:24:24 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:\
@@ -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;\
@@ -671,7 +672,7 @@
                                 /*SKIP EXECUTION OF OBOSC HERE*/\
                             }\
                             else{\
-                                gPC.printf("cdms relay tmtc at %u\r\n", execute_psc);\
+                                /*gPC.printf("cdms relay tmtc at %u\r\n", execute_psc);*/\
                                 /*call CDMS_RLY_TMTC*/\
                                 /*CDMS_RLY_TMTC(current_TC, put_tm_here);*/\
                             }\
@@ -684,7 +685,7 @@
                                 PUTexec_status(current_TC, temp16);\
                             }\
                             else{\
-                                gPC.puts("TC_STATE_EXECUTION_FAILED");\
+                                /*gPC.puts("TC_STATE_EXECUTION_FAILED");*/\
                                 uint16_t temp16 = TC_STATE_EXECUTION_FAILED;\
                                 PUTexec_status(current_TC, temp16);\
                             }\
@@ -740,7 +741,7 @@
                                 else{\
                                     length = TM_LONG_SIZE;\
                                 }\
-                                gPC.puts("Printing Call Sign, ACK_L1, TM list");\
+                                /*gPC.puts("Printing Call Sign, ACK_L1, TM list");*/\
                                 for(int i = 0 ; i < length ; ++i){\
                                     gPC.putc(tm_ptr->TM_string[i]);\
                                 }\

--- a/COM_POWER_ON_TX.h	Tue Jan 05 10:59:56 2016 +0000
+++ b/COM_POWER_ON_TX.h	Wed Jan 06 13:24:24 2016 +0000
@@ -79,7 +79,7 @@
             else{\
                 length = TM_LONG_SIZE;\
             }\
-            gPC.puts("Printing Call Sign, ACK_L1, TC_LIST inside COM_POWER_ON\r\n");\
+            /*gPC.puts("Printing Call Sign, ACK_L1, TC_LIST inside COM_POWER_ON\r\n");*/\
             for(int i = 0 ; i < length ; ++i){\
                 gPC.putc(power_on_tm->TM_string[i]);\
             }\

--- a/Structures.h	Tue Jan 05 10:59:56 2016 +0000
+++ b/Structures.h	Wed Jan 06 13:24:24 2016 +0000
@@ -33,8 +33,8 @@
 #define TC_STATE_UNEXECUTED 0x00
 #define TC_STATE_SUCCESSFULLY_EXECUTED 0x01
 #define TC_STATE_EXECUTION_FAILED 0x02
-#define TC_STATE_DISABLED 0x03
-#define TC_STATE_MARKED_RETRY 0x04
+#define TC_STATE_DISABLED 0x04
+#define TC_STATE_MARKED_RETRY 0x05
 
 //MASKS
 #define SHORT_LONG_TC_MASK 0x10