Diff: DMA_sampling/dac.cpp

Revision:

74:ebc9f09fda11

Parent:

54:1697dc574b96

--- a/DMA_sampling/dac.cpp	Wed May 31 22:02:56 2017 +0000
+++ b/DMA_sampling/dac.cpp	Thu Jun 01 22:12:31 2017 +0000
@@ -4,18 +4,18 @@
 
 void dac_init()
 {   
-    SIM_SCGC2 |= SIM_SCGC2_DAC0_MASK; // Turn on clock to DAC
-        DAC0_C0 |= DAC_C0_DACEN_MASK; // Enable DAC
+    SIM->SCGC2 |= SIM_SCGC2_DAC0_MASK; // Turn on clock to DAC
+    DAC0->C0 |= DAC_C0_DACEN_MASK; // Enable DAC
     
     //DAC0_C0 &= ~DAC_C0_DACTRGSEL_MASK;
-    DAC0_C0 |= DAC_C0_DACTRGSEL_MASK;
-    DAC0_C1 = 0;
+    DAC0->C0 |= DAC_C0_DACTRGSEL_MASK;
+    DAC0->C1 = 0;
     
-    DAC0_DAT0H = 0x0F;
-    DAC0_DAT0L = 0x00;
+    DAC0->DAT[0].DATH = 0x0F;
+    DAC0->DAT[0].DATL = 0x00;
     
-    DAC0_C1 |= DAC_C1_DACBFMD(2);   
-    DAC0_C0 |= DAC_C0_DACSWTRG_MASK | DAC_C0_DACRFS_MASK;
+    DAC0->C1 |= DAC_C1_DACBFMD(2);   
+    DAC0->C0 |= DAC_C0_DACSWTRG_MASK | DAC_C0_DACRFS_MASK;
     
     //debug2.printf("DAC0_C0: %x\r\n", DAC0_C0);
     //debug2.printf("DAC0_SR: %x\r\n", DAC0_SR);