samp Srinivasan / Mbed 2 deprecated CDMS_CODE_samp_22Nov16

publishing to check changes in cdms code

Dependencies:   FreescaleIAP SimpleDMA mbed-rtos mbed

Fork of CDMS_CODE_samp_23SEP_DMA_flag by samp Srinivasan

Files at this revision

API Documentation at this revision

Revision 252:9c631b2f5da8, committed 2016-07-12

Comitter:
ee12b079
Date:
Tue Jul 12 05:35:21 2016 +0000
Parent:
251:c766afa330a3
Child:
253:fd6696d91e74
Commit message:
Testing threads

Changed in this revision

DefinitionsAndGlobals.h Show annotated file Show diff for this revision Revisions of this file
ThreadsAndFunctions.h Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/DefinitionsAndGlobals.h	Mon Jul 11 12:30:41 2016 +0000
+++ b/DefinitionsAndGlobals.h	Tue Jul 12 05:35:21 2016 +0000
@@ -1,14 +1,15 @@
 // **************DEFINITIONS*********************
 
 #define bypass_adf 0
+#define dma 0
 
 // COM_RX
     #define RX_TIMEOUT_LIMIT 0.5
-    //#define COM_RX_UART_TX PTE20    // For bypassing RX1M (SET BAUD RATE 1200) #define COM_RX_UART_TX USBTX
-    //#define COM_RX_UART_RX PTE21    // For bypassing RX1M (SET BAUD RATE 1200) #define COM_RX_UART_RX USBRX
+    #define COM_RX_UART_TX PTE20    // For bypassing RX1M (SET BAUD RATE 1200) #define COM_RX_UART_TX USBTX
+    #define COM_RX_UART_RX PTE21    // For bypassing RX1M (SET BAUD RATE 1200) #define COM_RX_UART_RX USBRX
     
-    #define COM_RX_UART_TX USBTX
-    #define COM_RX_UART_RX USBRX
+    //#define COM_RX_UART_TX USBTX
+    //#define COM_RX_UART_RX USBRX
     
 // COMMON SPI
     #define SPI_MOSI PTE1

--- a/ThreadsAndFunctions.h	Mon Jul 11 12:30:41 2016 +0000
+++ b/ThreadsAndFunctions.h	Tue Jul 12 05:35:21 2016 +0000
@@ -22,6 +22,7 @@
         srp(gPAYLOAD_BUFFER);//skip one apcket when cdms resets
         gPC.puts("exit_srp\r\n");
         wait(2);/*timeout to be decided*/
+        if(dma)
         gPAY_SPI->bulkRead_start();
         gMutex.unlock();
     }

--- a/main.cpp	Mon Jul 11 12:30:41 2016 +0000
+++ b/main.cpp	Tue Jul 12 05:35:21 2016 +0000
@@ -99,7 +99,7 @@
     gRX_COUNT = 0;
     RX1M.attach(&rx_read, Serial::RxIrq);
     
-    gPC.baud(115200);//changed for bypassing COM
+    gPC.baud(1200);//changed for bypassing COM
     
     // COMMON SPI
     spi.format(8,0);
@@ -146,8 +146,8 @@
     /*HK_counter = new RtosTimer(hk_isr, osTimerPeriodic,(void * )NULL);
     HK_counter->start(10000);*/
     
-    PL_wo_dma = new RtosTimer(payload_isr_fun_dma, osTimerPeriodic,(void * )NULL);
-    PL_wo_dma->start(6000);//
+    /*PL_wo_dma = new RtosTimer(payload_isr_fun_dma, osTimerPeriodic,(void * )NULL);
+    PL_wo_dma->start(6000);*///
     //gSCIENCE_THREAD->signal_set(SCIENCE_SIGNAL);