Diff: main.cpp

Revision:

2:cc462c2a54f6

Parent:

1:fb8f053747d6

Child:

3:bb920a8eb590

--- a/main.cpp	Fri Nov 27 00:35:09 2015 +0000
+++ b/main.cpp	Fri Nov 27 00:42:38 2015 +0000
@@ -11,7 +11,7 @@
 float time_interv;
 uint16_t sample = 0;
 int length_waveform=1000;
-float waveform[1000];
+uint16_t waveform[1000];
 
 int waveform_type=0;
 float freq=2; //Hz
@@ -29,13 +29,24 @@
 }
 
 void generate_waveform_datapoints(){
+    float t=0;
     time_interv=1.0/freq/length_waveform;
-        for (float t = 0.0f; t < 1/freq; t += time_interv) {
-            x=amp*(cos(2*pi*freq*t)+1);   
-            sample=(uint16_t) (x*32767);    
-            aout.write_u16(sample);;
-            wait(time_interv);
-        }
+     
+    for (int datapoint_counter=0; datapoint_counter<length_waveform; datapoint_counter++){
+        x=amp*(cos(2*pi*freq*t)+1);
+        waveform[datapoint_counter]=(uint16_t) (x*32767);
+        
+        aout.write_u16(waveform[datapoint_counter]);
+        t += time_interv;
+        
+        wait(time_interv);
+    } 
+}
+
+void output_waveform_datapoints(){
+
+
+    
 }
 
 
@@ -51,8 +62,8 @@
 
     while (1){
         
-        
         generate_waveform_datapoints();
+        output_waveform_datapoints();
         
         
         /*for (float t = 0.0f; t < 1/freq; t += 1/fs) {