Diff: ThreadsAndFunctions.h

Revision:

190:f0d5fde60221

Parent:

189:0636c8391407

Child:

197:1369ef45b49e

--- a/ThreadsAndFunctions.h	Tue Jun 28 08:22:08 2016 +0000
+++ b/ThreadsAndFunctions.h	Tue Jun 28 09:51:56 2016 +0000
@@ -7,7 +7,7 @@
 void payload_isr_fun_dma(void const *args ){
     gSCIENCE_THREAD->signal_set(SCIENCE_SIGNAL);
 }
-RtosTimer PL_wo_dma(payload_isr_fun_dma, osTimerPeriodic,(void * )NULL);
+
 void SCIENCE_FUN(void const *args){
     
     // initialisation of payload spi
@@ -22,7 +22,7 @@
         gPC.puts("sig_set\r\n");
         srp(gPAYLOAD_BUFFER);
         gPC.puts("exit_srp\r\n");
-        gPAY_SPI.bulkRead_start();
+        //gPAY_SPI.bulkRead_start();
         
     }
 }
@@ -109,7 +109,7 @@
             gFLAGS = gFLAGS & (~UART_INT_FLAG);
             if( !(gFLAGS & COM_SESSION_FLAG) ){
                 // PENDING : DISABLE THREADS
-                PL_wo_dma.stop();
+                PL_wo_dma->stop();
                 gFLAGS = gFLAGS | COM_SESSION_FLAG;
                 gSESSION_TIMEOUT.attach(&after_session, SESSION_TIME_LIMIT);
                 gFLAGS = gFLAGS | COM_RX_FLAG;
@@ -193,6 +193,7 @@
                             reset_all;
                             gFLAGS = gFLAGS & (~COM_SESSION_VALIDITY);
                             // PENDING : ENABLE THREADS
+                            PL_wo_dma->start(6000);
                             gSESSION_TIMEOUT.detach();
                             gFLAGS = gFLAGS & (~COM_SESSION_FLAG);
                             // WARNING: clear COM_MNG_TMTC ?
@@ -245,6 +246,7 @@
                 gFLAGS = gFLAGS & (~COM_MNG_TMTC_RUNNING_FLAG);
                 reset_all;
                 // PENDING : ENABLE THREADS
+                PL_wo_dma->start(6000);
                 gSESSION_TIMEOUT.detach();
                 gFLAGS = gFLAGS & (~COM_SESSION_FLAG);
             }
@@ -296,7 +298,7 @@
             COM_POWER_OFF_TX;
             reset_all;
             // PENDING : ENABLE THREADS
-            PL_wo_dma.start(6000);
+            PL_wo_dma->start(6000);
             gSESSION_TIMEOUT.detach();
             gFLAGS = gFLAGS & (~COM_SESSION_FLAG);
         }