Diff: COM_POWER_ON_TX.h

Revision:

155:ca7365c03fd7

Parent:

144:4c20fcc105ce

Child:

156:f661cf9e02d1

--- a/COM_POWER_ON_TX.h	Fri Apr 01 19:57:02 2016 +0000
+++ b/COM_POWER_ON_TX.h	Mon Apr 11 12:10:59 2016 +0000
@@ -50,7 +50,7 @@
             ++overCount;\
         }\
         else{\
-            /*PENDING: RESET CDMS: MEMORY LEAK FOUND*/\
+            RESET_CDMS;\
             break;\
         }\
     }\
@@ -87,7 +87,7 @@
             ++overCount;\
         }\
         else{\
-            /*PENDING: RESET CDMS: MEMORY LEAK FOUND*/\
+            RESET_CDMS;\
             break;\
         }\
     }\
@@ -112,8 +112,7 @@
     hk_main_ptr->TC_string[9]  = (crc16 & 0xFF00)>>8;\
     hk_main_ptr->TC_string[10] = (crc16 & 0x00FF);\
     Base_tm *tm_ptr = new Short_tm;\
-    /*PENDING*/\
-    /*tm_ptr =  FCTN_CDMS_RLY_TMTC(hk_main_ptr);*/\
+    tm_ptr =  FCTN_CDMS_RLY_TMTC(hk_main_ptr);\
     /*DELETE THE TM AFTER USE*/\
     Base_tm *del_tm = tm_ptr;\
     int overCount = 0;\
@@ -125,7 +124,7 @@
             ++overCount;\
         }\
         else{\
-            /*PENDING: RESET CDMS: MEMORY LEAK FOUND*/\
+            RESET_CDMS;\
             break;\
         }\
     }\
@@ -149,8 +148,7 @@
     uint16_t crc16 = crc16_gen(bcn_tx_main_ptr->TC_string, 9);\
     bcn_tx_main_ptr->TC_string[9]  = (crc16 & 0xFF00)>>8;\
     bcn_tx_main_ptr->TC_string[10] = (crc16 & 0x00FF);\
-    /*PENDING*/\
-    /*tm_ptr =  FCTN_CDMS_RLY_TMTC(bcn_tx_main_ptr);*/\
+    tm_ptr =  FCTN_CDMS_RLY_TMTC(bcn_tx_main_ptr);\
 }
 
 void COM_POWER_ON_TX() {
@@ -224,7 +222,7 @@
                             ++overCount;
                         }
                         else{
-                            /*PENDING: RESET CDMS: MEMORY LEAK FOUND*/
+                            RESET_CDMS;
                             break;
                         }
                     }
@@ -240,7 +238,7 @@
                         ++overCount;
                     }
                     else{
-                        /*PENDING: RESET CDMS: MEMORY LEAK FOUND*/
+                        RESET_CDMS;
                         break;
                     }
                 }
@@ -255,8 +253,7 @@
             gFLAGS = gFLAGS & (~RF_SW_STATUS_FLAG);
         }
     }
-    /*PENDING: POWER ON COM_TX*/
-    /*power_on_com_tx_pin = 1;*/
+    COM_TX_CNTRL = 1;
     uint8_t adfConfigPass = 0xFF;
     for( int i = 0 ; i < COM_TX_CONFIG_LIMIT ; ++i ){
         /*PENDING: CONFIGURE ADF*/
@@ -266,6 +263,7 @@
     }
     if( adfConfigPass == 0xFF ){
         /*adf successfully configured*/
+        gFLAGS = gFLAGS | COM_TX_STATUS_FLAG;
         /*CALL SIGN*/
         Base_tm *power_on_tm = NULL;
         Base_tm *power_on_tm_head = NULL;
@@ -280,7 +278,7 @@
                 ++overFlowCountADF;
             }
             else{
-                /*PENDING: RESET CDMS*/
+                RESET_CDMS;
                 break;
             }
         }
@@ -299,7 +297,7 @@
                 ++overFlowCountADF;
             }
             else{
-                /*PENDING: RESET CDMS*/
+                RESET_CDMS;
                 break;
             }
         }
@@ -311,10 +309,10 @@
             P_BCN_TX_MAIN(tm_ptr);
             if( ackReceived == 0xFF ){
                 Thread::wait(5000);
-                /*PENDING: RESET CDMS*/
+                RESET_CDMS;
             }
             else{
-                /*PENDING: RESET CDMS*/
+                RESET_CDMS;
             }
             /*DELETE THE TM AFTER USE*/
             Base_tm *del_tm = tm_ptr;
@@ -327,13 +325,15 @@
                     ++overCount;
                 }
                 else{
-                    /*PENDING: RESET CDMS: MEMORY LEAK FOUND*/
+                    RESET_CDMS;
                     break;
                 }
             }
         }
     }
     else{
+        /*ADF not configured*/
+        gFLAGS = gFLAGS & (~COM_TX_STATUS_FLAG);
         COM_POWER_OFF_TX;
         P_CDMS_HK_MAIN;
         uint8_t ackReceived = 0x00;
@@ -341,10 +341,10 @@
         P_BCN_TX_MAIN(tm_ptr);
         if( ackReceived == 0xFF ){
             Thread::wait(5000);
-            /*PENDING: RESET CDMS*/
+            RESET_CDMS;
         }
         else{
-            /*PENDING: RESET CDMS*/
+            RESET_CDMS;
         }
         /*DELETE THE TM AFTER USE*/
         Base_tm *del_tm = tm_ptr;
@@ -357,7 +357,7 @@
                 ++overCount;
             }
             else{
-                /*PENDING: RESET CDMS: MEMORY LEAK FOUND*/
+                RESET_CDMS;
                 break;
             }
         }