Diff: main.cpp

Revision:

1:6b531bf059e4

Parent:

0:fc7729e19c10

Child:

2:e723d10f745d

--- a/main.cpp	Fri Feb 07 00:27:55 2014 +0000
+++ b/main.cpp	Mon Feb 10 18:53:59 2014 +0000
@@ -1,12 +1,12 @@
 
 #include "mbed.h"
 AnalogOut DA(PTE30);
-AnalogIn AD(PTB0);
+//AnalogIn AD(PTB1);
 
 Serial pc(USBTX, USBRX); // tx, rx
 
     float da;
-    float Amp = 2.0;
+    float Amp = 1.0;
     float w = 1.0;
     float pi = 3.14159;
     
@@ -16,13 +16,14 @@
     //int ww;
     printf("%c\n", pc.getc());
     wait(0.5);
-    pc.printf("Input parameter A(<1.0):\n");
+    pc.printf("Input parameter A(<1.0) and press Enter:\n");
     pc.scanf("%f", &Amp);
     pc.printf("%f\n", Amp);
     //Amp = (float)AA;
-    pc.printf("Input parameter w:\n");
+    pc.printf("Input parameter w and press Enter:\n");
     pc.scanf("%f", &w);
     pc.printf("%f\n", w);
+    pc.printf("Continue...\n");
     //w = (float)ww;
  }
 
@@ -33,14 +34,15 @@
     pc.attach(&callback);
     
     while(1){
-        for (float i=0; i<360; i++) {
-            da = Amp*(sin(w*i/180*pi)*0.5+0.5);
+        for (float i=0; i<(360); i++) {
+            da = Amp*(sin(w*i/(180)*pi)*0.5+0.5);
             DA.write(da);
+            wait(0.01);
+            //pc.printf("%f ",da);
             
-            pc.printf("%f ",da);
+            //Monitor Received Analog In
+            //pc.printf("%f ", AD.read());
             
-            
-            //AD.read()*3.3;
         }
         //wait(3.0);
     }