Waveform generator

Dependencies:   MODDMA mbed

Files at this revision

API Documentation at this revision

Comitter:
carsonbrown27
Date:
Thu Dec 08 05:04:05 2022 +0000
Parent:
0:c1a4c1e9618c
Commit message:
Final Version

Changed in this revision

SignalGenDAC.cpp Show annotated file Show diff for this revision Revisions of this file
main.cpp Show diff for this revision Revisions of this file
--- a/SignalGenDAC.cpp	Mon Dec 05 02:01:53 2022 +0000
+++ b/SignalGenDAC.cpp	Thu Dec 08 05:04:05 2022 +0000
@@ -109,7 +109,7 @@
     float mid = rangelimit(offset, minV, maxV);
     float low = rangelimit(offset - voltage/2, minV, maxV);
     float v;
-    numSamples = 128;    // Ideally, compute this based on the frequency for good resolution
+    numSamples = 128 * (10000 / frequency);    // Ideally, compute this based on the frequency for good resolution
     dcCount = dutycycle/100.0 * numSamples;
     firstQtr = dcCount / 2;
     lastQtr = dcCount + (numSamples - dcCount)/2;
--- a/main.cpp	Mon Dec 05 02:01:53 2022 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-
-
-// confirmed includes
-#include "mbed.h"
-#include "MODDMA.h"
-
-// testing includes
-#include "SignalGenDAC.h"
-#include "SignalGenDefs.h"
-
-#define PI 3.14159
-
-int main() {
-    RawSerial pc(USBTX, USBRX);
-    
-    SignalGenDAC signal;
-    signal.PrepareWaveform(SG_SINE, 100, 50, 3.0, 1.5);
-    wait(1.0);
-    
-    while (1) {
-        signal.Start();
-        wait(5.0);
-        signal.Stop();
-        wait(1.0);
-    }
-}
-
-
-
-
-