Diff: ThreadsAndFunctions.h

Revision:

177:2fa8582896e0

Parent:

175:e869e7837978

--- a/ThreadsAndFunctions.h	Fri Apr 22 12:15:09 2016 +0000
+++ b/ThreadsAndFunctions.h	Fri Apr 22 15:52:58 2016 +0000
@@ -4,9 +4,13 @@
     gSCIENCE_THREAD->signal_set(SCIENCE_SIGNAL);
 }
 
+#define Pause_gPAY_SPI{\
+    gPAY_SPI.bulkRead_init(gPAYLOAD_BUFFER, PAYLOAD_BUFFER_LENGTH, NULL);\
+    gPAY_SPI.bulkRead_start();\
+    }
+
+
 #define Init_gPAY_SPI{\
-    gPAY_SPI.frequency(1000000);\
-    gPAY_SPI.format(8,0);\
     gPAY_SPI.bulkRead_init(gPAYLOAD_BUFFER, PAYLOAD_BUFFER_LENGTH, &payload_isr_fun);\
     gPAY_SPI.bulkRead_start();\
     }
@@ -18,9 +22,10 @@
     gPAY_SPI.format(8,0);
     gPAY_SPI.bulkRead_init(gPAYLOAD_BUFFER, PAYLOAD_BUFFER_LENGTH, &payload_isr_fun);
     gPAY_SPI.bulkRead_start();
-    gPAY_SPI.bulkRead_end();
+    Pause_gPAY_SPI;
     Init_gPAY_SPI;
     
+    
     while(true){
         gPC.puts("entering sci\r\n");
         gSCIENCE_THREAD->signal_wait(SCIENCE_SIGNAL);
@@ -114,7 +119,7 @@
             gFLAGS = gFLAGS & (~UART_INT_FLAG);
             if( !(gFLAGS & COM_SESSION_FLAG) ){
                 // PENDING : DISABLE THREADS
-                gPAY_SPI.bulkRead_end();
+                Pause_gPAY_SPI;
                 gFLAGS = gFLAGS | COM_SESSION_FLAG;
                 gSESSION_TIMEOUT.attach(&after_session, SESSION_TIME_LIMIT);
                 gFLAGS = gFLAGS | COM_RX_FLAG;