Revision 134:4694fc291ce1, committed 2016-03-01

Comitter:

ee12b079

Date:

Tue Mar 01 17:42:30 2016 +0000

Parent:

133:56d37aa8a011

Child:

135:522f7d73d04f

Commit message:

testing

Changed in this revision

--- a/COM_MNG_TMTC.h	Tue Mar 01 12:35:49 2016 +0000
+++ b/COM_MNG_TMTC.h	Tue Mar 01 17:42:30 2016 +0000
@@ -954,7 +954,8 @@
                         if( (current_exec_status == TC_STATE_SUCCESSFULLY_EXECUTED) || (current_exec_status == TC_STATE_DISABLED) )\
                             break;\
                         else if( (current_exec_status == TC_STATE_UNEXECUTED) || (current_exec_status == TC_STATE_MARKED_RETRY) ){\
-                            /*gPC.printf("It is obosc: %u\r\n", execute_psc);*/\
+                            if (DEBUG)\
+                                gPC.printf("It is obosc: %u\r\n", execute_psc);\
                             /*EXECUTION OF OBOSC TC*/\
                             /*WARNING: LARGE MEMORY UTILIZATION FOR TC-LIST-REPORT */\
                             Base_tm *obosc_tm_head = NULL;\
@@ -1030,7 +1031,8 @@
     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);*/\
+        if (DEBUG)\
+            gPC.printf("executing normal %u\r\n", execute_psc);\
         /*gLEDG = !gLEDG;*/\
         /*gLEDR = !gLEDR;*/\
         Base_tc* current_TC = gHEAD_NODE_TCL;\

--- a/OBSRS.h	Tue Mar 01 12:35:49 2016 +0000
+++ b/OBSRS.h	Tue Mar 01 17:42:30 2016 +0000
@@ -255,7 +255,8 @@
         }\
     }\
     else{\
-        gPC.printf("error in send_Ack_andcallsign()");\
+        if (DEBUG)\
+            gPC.printf("error in send_Ack_andcallsign()");\
     }\
 }
 #define send_S_frame {\

--- a/ThreadsAndFunctions.h	Tue Mar 01 12:35:49 2016 +0000
+++ b/ThreadsAndFunctions.h	Tue Mar 01 17:42:30 2016 +0000
@@ -23,7 +23,8 @@
 
 #define reset_all {\
     Base_tc *tcp = gHEAD_NODE_TCL;\
-    /*gPC.puts("inside reset\r\n");*/\
+    if (DEBUG)\
+        gPC.puts("inside reset\r\n");\
     gFLAGS = 0x0000;\
     while(tcp != NULL){\
         Base_tc *temp = tcp->next_TC;\
@@ -52,7 +53,8 @@
     gRX_CURRENT_DATA_NODE = gRX_HEAD_DATA_NODE;\
     gRX_COUNT = 0;\
     /*PENDING : ALL GLOBAL VAARIABLES AND FLAGS*/\
-    /*gPC.puts("finished reset all\r\n");*/\
+    if (DEBUG)\
+        gPC.puts("finished reset all\r\n");\
 }
 
 #define PUT_RAW_BYTE {\
@@ -103,8 +105,9 @@
             }
         }
         else if( gFLAGS & NEW_TC_RECEIVED ){
-            gPC.puts("NEW TC RECEIVED\r\n");
-//            DEBUF_PRINT("NEW TC RECEIVED\r\n");
+            if (DEBUG)
+                gPC.puts("NEW TC RECEIVED\r\n");
+//          DEBUF_PRINT("NEW TC RECEIVED\r\n");
             Thread::wait(2000);    /*To be removed in flight model*/
             gFLAGS = gFLAGS & (~NEW_TC_RECEIVED);
             gFLAGS = gFLAGS | COM_MNG_TMTC_RUNNING_FLAG;
@@ -122,7 +125,8 @@
             gFLAGS = gFLAGS & (~COM_RX_FLAG);
             
             if( gTOTAL_VALID_TC > 0 ){
-                /*gPC.printf("valid TC rx: %u\r\n", gTOTAL_VALID_TC);*/
+                if (DEBUG)
+                    gPC.printf("valid TC rx: %u\r\n", gTOTAL_VALID_TC);
                 if( gTOTAL_VALID_TC < COM_MAX_TC_LIMIT ){
                     // CHECK WEATHER TC LIST HAS MISSING TC OR WEATHER LAST FRAME BIT IS HIGH IN THE LAST PSC-TC
                     /*gPC.puts("checking for tc list complete\r\n");*/

--- a/cdms_sd.h	Tue Mar 01 12:35:49 2016 +0000
+++ b/cdms_sd.h	Tue Mar 01 17:42:30 2016 +0000
@@ -307,9 +307,8 @@
         cmd58();
         cmd(55, 0);
         if (cmd(41, 0x40000000) == 0) {
-            #if DEBUG
-            gPC.puts("\rv2 initialization successfull\r\n");
-            #endif
+            if (DEBUG)
+                gPC.puts("\rv2 initialization successfull\r\n");
             cmd58();
             debug_if(SD_DBG, "\n\rInit: SDCARD_V2\n\r");
             cdv = 1;

--- a/main.cpp	Tue Mar 01 12:35:49 2016 +0000
+++ b/main.cpp	Tue Mar 01 17:42:30 2016 +0000
@@ -43,8 +43,6 @@
 //    gRX_CURRENT_PTR = gRX_CURRENT_DATA_NODE->values;
     RX1M.attach(&rx_read, Serial::RxIrq);
     
-    // DEBUG
-    //gPC.puts("welcome to mng_tm_tc\r\n");
     gPC.baud(1200);
     
     // COMMON SPI
@@ -59,23 +57,20 @@
     FCTN_CDMS_INIT_RTC();/* rtc initialization*/
     FCTN_CDMS_SD_INIT();/* sd card initialization*/
     
-    #if DEBUG
-    gPC.puts("welcome to mng_tmtc\r\n");
-    #endif
-    
+    if (DEBUG)
+        gPC.puts("welcome to mng_tmtc\r\n");
+        
     // COM_MNG_TMTC THREAD
     gCOM_MNG_TMTC_THREAD = new Thread(COM_MNG_TMTC_FUN);
     gCOM_MNG_TMTC_THREAD->set_priority(osPriorityAboveNormal);
-    #if DEBUG
-    gPC.puts("allocating threads\r\n");
-    #endif
+    if (DEBUG)
+        gPC.puts("allocating threads\r\n");
     gSCIENCE_THREAD = new Thread(SCIENCE_FUN);
    // gPC.puts("step one complete\r\n");
     gSCIENCE_THREAD->set_priority(osPriorityBelowNormal);
-    #if DEBUG
-    gPC.puts("competed allocating threads\r\n");
-    #endif
-    
+    if (DEBUG)
+        gPC.puts("competed allocating threads\r\n");
+        
     // *******************INITIALISATIONS END********************
     
     //RtosTimer gCDMS_HK_TIMER(FCTN_CDMS_HK_MAIN, osTimerPeriodic);