Diff: main.cpp

Revision:

1:868ff3346841

Parent:

0:e08a063f61c3

Child:

3:735c712ffaee

--- a/main.cpp	Wed Dec 10 12:53:53 2014 +0000
+++ b/main.cpp	Fri Jan 08 08:09:28 2016 +0000
@@ -18,24 +18,23 @@
 
 #define VERSION "trms_helloworld_2014_12_08"
 #define CIBLE "K64F"
-
+Serial pc(USBTX, USBRX); // tx, rx
 
 
 int main()
 {
 
-trms line1_AC(ADC_DIFF(0,1));
-    line1_AC.test(10);
-        
-    printf("%s %s\r\n",VERSION,CIBLE);
 
-    line1_AC.set_gain(2.0*ADCVREF/65535.0);
+pc.baud(115200); 
+ trms line1_AC(ADC_DIFF(0,1));       
+    pc.printf("%s %s\r\n",VERSION,CIBLE);
+
+    line1_AC.set_gain(GAIN);
     line1_AC.set_offset(0.0);
     line1_AC.start();
-    while (true) {
-        
-        wait(1.0);
-        printf("Vavg= %f Vrms= %f \r\n",line1_AC.read_average(),line1_AC.read_rms());
-        //line1_AC.test(20);
+    int i=0;
+    while (++i<=1000) {
+        wait(0.1);
+        pc.printf("%f\t%f\r\n",line1_AC.read_average(),line1_AC.read_rms());
     }
 }