Diff: main.cpp

Revision:

1:79b4bdf4997b

Parent:

0:fbbd04cdb029

--- a/main.cpp	Fri Jun 15 02:46:31 2018 +0000
+++ b/main.cpp	Mon Jul 23 13:08:53 2018 +0000
@@ -3,21 +3,19 @@
 
 Serial pc(USBTX, USBRX);  // tx, rx
 
-int main() {
-    
-   powerMon pm1(-1);
- while(1)
- {
+int main() 
+{
+    pc.baud(115200);
+    powerMon pmR2(0);
+    int i;
+    while(1)
+    {
         wait(0.125);
-
-
-pc.printf("V_Source = %f\n", pm1.V_Source());
-//pc.printf("V_Sense = %f\n", pm1.V_Sense());
-pc.printf("Current = %f\n", pm1.Current());
-//pc.printf("Power_R = %d\n", pm1.Power_Ratio());
-pc.printf("Power = %f\n", pm1.Power());
-}
-
-
-    
+        pc.printf("iterate : %i\t\t", i++);
+        pc.printf("V_Source = %f\t\t", pmR2.V_Source());
+        //pc.printf("V_Sense = %f\n", pmR2.V_Sense());
+        pc.printf("Current = %f\t\t", pmR2.Current());
+        //pc.printf("Power_R = %d\n", pmR2.Power_Ratio());
+        pc.printf("Power = %f\n\r", pmR2.Power());
+    }   
 }
\ No newline at end of file