Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Fork of Impedance_Fast_Circuitry by
Diff: DMA_sampling/dma.cpp
- Revision:
- 72:0b554f5026b9
- Parent:
- 70:8cd7a8a2c153
- Child:
- 74:ebc9f09fda11
diff -r 8cd7a8a2c153 -r 0b554f5026b9 DMA_sampling/dma.cpp
--- a/DMA_sampling/dma.cpp	Wed May 17 23:10:03 2017 +0000
+++ b/DMA_sampling/dma.cpp	Thu May 18 20:19:12 2017 +0000
@@ -108,9 +108,9 @@
     DMA_TCD0_BITER_ELINKYES = DMA_CITER_ELINKYES_ELINK_MASK | DMA_BITER_ELINKYES_LINKCH(1) | DMA_BITER_ELINKYES_BITER(SAMPLE_BUFFER_LENGTH);
     DMA_TCD0_CITER_ELINKYES = DMA_CITER_ELINKYES_ELINK_MASK | DMA_CITER_ELINKYES_LINKCH(1) | DMA_CITER_ELINKYES_CITER(SAMPLE_BUFFER_LENGTH);
     DMA_TCD0_CSR = DMA_CSR_MAJORLINKCH(1) | DMA_CSR_MAJORELINK_MASK;
-    DMA_TCD1_BITER_ELINKYES = DMA_CITER_ELINKYES_ELINK_MASK | DMA_BITER_ELINKYES_LINKCH(8) | DMA_BITER_ELINKYES_BITER(SAMPLE_BUFFER_LENGTH);
-    DMA_TCD1_CITER_ELINKYES = DMA_CITER_ELINKYES_ELINK_MASK | DMA_CITER_ELINKYES_LINKCH(8) | DMA_CITER_ELINKYES_CITER(SAMPLE_BUFFER_LENGTH);
-    DMA_TCD1_CSR = DMA_CSR_MAJORLINKCH(8) | DMA_CSR_MAJORELINK_MASK;
+    DMA_TCD1_BITER_ELINKYES = DMA_CITER_ELINKYES_ELINK_MASK | DMA_BITER_ELINKYES_LINKCH(10) | DMA_BITER_ELINKYES_BITER(SAMPLE_BUFFER_LENGTH);
+    DMA_TCD1_CITER_ELINKYES = DMA_CITER_ELINKYES_ELINK_MASK | DMA_CITER_ELINKYES_LINKCH(10) | DMA_CITER_ELINKYES_CITER(SAMPLE_BUFFER_LENGTH);
+    DMA_TCD1_CSR = DMA_CSR_MAJORLINKCH(10) | DMA_CSR_MAJORELINK_MASK;
  
     // Setup control and status register
 
@@ -284,6 +284,10 @@
     DMA_TCD9_SLAST = 0;      // Source address adjustment
     DMA_TCD9_DLASTSGA = 0;  // Destination address adjustment
    
+   
+   
+   
+   
   //JARED THIS IS WHERE YOU STARTED TO CHANGE THINGS
   // Enable request signal for channel 10 this DMA swaps ADC0 between a0 and a1.
     DMA_ERQ |= DMA_ERQ_ERQ10_MASK;
@@ -314,19 +318,13 @@
     DMA_TCD10_SLAST = -(4*2);      // Source address adjustment
     DMA_TCD10_DLASTSGA = 0;  // Destination address adjustment
     
-    //DMAMUX_CHCFG0 |= DMAMUX_CHCFG_ENBL_MASK | DMAMUX_CHCFG_SOURCE(40); // ADC0
-    //DMAMUX_CHCFG1 |= DMAMUX_CHCFG_ENBL_MASK | DMAMUX_CHCFG_SOURCE(41); // ADC1
-    /* Source number    Source module
-           40                ADC0
-           41                ADC1
-    */
+    //DMAMUX_CHCFG10 |= DMAMUX_CHCFG_ENBL_MASK | DMAMUX_CHCFG_SOURCE(41); // ADC0 Source   Jared's Note I think that this is actually the pdb timer
 
-    
-    DMAMUX_CHCFG10 |= DMAMUX_CHCFG_ENBL_MASK | DMAMUX_CHCFG_SOURCE(41); // ADC0 Source   Jared's Note I think that this is actually the pdb timer
-
-    DMA_TCD10_BITER_ELINKYES = DMA_CITER_ELINKYES_ELINK_MASK | DMA_BITER_ELINKYES_LINKCH(0) | DMA_BITER_ELINKYES_BITER(2);
-    DMA_TCD10_CITER_ELINKYES = DMA_CITER_ELINKYES_ELINK_MASK | DMA_CITER_ELINKYES_LINKCH(0) | DMA_CITER_ELINKYES_CITER(2);
-    DMA_TCD10_CSR |= DMA_CSR_MAJORLINKCH(0) | DMA_CSR_MAJORELINK_MASK;
+    //DMA_TCD10_CITER_ELINKNO = DMA_CITER_ELINKNO_CITER(2);
+    //DMA_TCD10_BITER_ELINKNO = DMA_BITER_ELINKNO_BITER(2);
+    DMA_TCD10_BITER_ELINKYES = DMA_CITER_ELINKYES_ELINK_MASK | DMA_BITER_ELINKYES_LINKCH(8) | DMA_BITER_ELINKYES_BITER(2);
+    DMA_TCD10_CITER_ELINKYES = DMA_CITER_ELINKYES_ELINK_MASK | DMA_CITER_ELINKYES_LINKCH(8) | DMA_CITER_ELINKYES_CITER(2);
+    DMA_TCD10_CSR |= DMA_CSR_MAJORLINKCH(8) | DMA_CSR_MAJORELINK_MASK;
    
   
 }
    