Revision 254:22d97475ca79, committed 2016-07-12

Comitter:

ee12b079

Date:

Tue Jul 12 11:10:48 2016 +0000

Parent:

253:fd6696d91e74

Child:

257:7d404e9dc9e2

Child:

258:bb889bc2e9f5

Commit message:

Threads integrated2, adding chaitanya's changes

Changed in this revision

--- a/COM_MNG_TMTC.h	Tue Jul 12 10:01:32 2016 +0000
+++ b/COM_MNG_TMTC.h	Tue Jul 12 11:10:48 2016 +0000
@@ -1322,7 +1322,7 @@
                             /*SEND call sign, ACK_L1, NON OBSRS TM TO GS*/\
                             snd_tm.head_pointer(tm_ptr_head);\
                             gPC.puts("enter_adf\r\n");\
-                            /*transmit_adf;*/\
+                            transmit_adf;\
                             gPC.puts("exit_adf\r\n");\ 
                             /*DELETE THE TM AFTER USE*/\
                             tm_ptr = tm_ptr_head;\
@@ -1351,7 +1351,7 @@
                             /*read_TC(current_TC);*/\
                             execute_OBSRS_TC(current_TC);\
                             gPC.puts("en_adf");\
-                            /*transmit_adf;*/\
+                            transmit_adf;\
                             gPC.puts("ex_adf");\
                             uint8_t tempExec = TC_STATE_SUCCESSFULLY_EXECUTED;\
                             PUTexec_status(current_TC, tempExec);\

--- a/ThreadsAndFunctions.h	Tue Jul 12 10:01:32 2016 +0000
+++ b/ThreadsAndFunctions.h	Tue Jul 12 11:10:48 2016 +0000
@@ -117,7 +117,7 @@
             gFLAGS = gFLAGS & (~UART_INT_FLAG);
             if( !(gFLAGS & COM_SESSION_FLAG) ){
                 // PENDING : DISABLE THREADS
-                /*HK_counter->stop();*/
+                HK_counter->stop();
                 gPAY_SPI->bulkRead_pause();
                 gFLAGS = gFLAGS | COM_SESSION_FLAG;
                 gSESSION_TIMEOUT.attach(&after_session, SESSION_TIME_LIMIT);
@@ -143,7 +143,7 @@
         }
         else if( gFLAGS & NEW_TC_RECEIVED ){
             gPC.puts("NEW TC RECEIVED\r\n");
-            Thread::wait(1000);
+            Thread::wait(10000);
             gFLAGS = gFLAGS & (~NEW_TC_RECEIVED);
             gFLAGS = gFLAGS | COM_MNG_TMTC_RUNNING_FLAG;
 
@@ -160,7 +160,7 @@
             gFLAGS = gFLAGS & (~COM_RX_FLAG);
             
             //Mutex
-            /*gMutex.lock();*/
+            gMutex.lock();
             
             if( gTOTAL_VALID_TC > 0 ){
                 /*gPC.printf("valid TC rx: %u\r\n", gTOTAL_VALID_TC);*/
@@ -318,6 +318,6 @@
             gSESSION_TIMEOUT.detach();
             gFLAGS = gFLAGS & (~COM_SESSION_FLAG);
         }
-        /*gMutex.unlock();*/
+        gMutex.unlock();
     }
 }
\ No newline at end of file

--- a/main.cpp	Tue Jul 12 10:01:32 2016 +0000
+++ b/main.cpp	Tue Jul 12 11:10:48 2016 +0000
@@ -114,8 +114,8 @@
     FCTN_CDMS_SD_INIT();/* sd card initialization*/
     
     
-    //uint8_t test[512] = {0};
-    //disk_write(test,7000); //to be used only just before launch
+    uint8_t test[512] = {0};
+    disk_write(test,7000); //to be used only just before launch
     
     #if DEBUG
     gPC.puts("welcome to mng_tmtc\r\n");