Diff: main.cpp

Revision:

2:fed59450f2ed

Parent:

1:5aa590d1f1bf

Child:

3:814cb36d0f90

--- a/main.cpp	Wed Sep 21 08:24:57 2016 +0000
+++ b/main.cpp	Thu Sep 22 14:10:56 2016 +0000
@@ -10,22 +10,22 @@
 Timer tmr1, tmr2,tmr;
 Timeout timeouter;
 int flag=0;
-float sum1=0,sum2=0,count1=0,count2=0;
+float sum1=0,sum2=0,count1=0,count2=0,timecount1=0,timecount2=0,timesum1=0,timesum2=0;
 long microsecondsToCentimeters(long microseconds);
 
 void reset()
 {
     flag = 0;
     tmr.reset();
-    sum1=0,sum2=0,count1=0,count2=0;
+    sum1=0,sum2=0,count1=0,count2=0,timecount1=0,timecount2=0,timesum1=0,timesum2=0;
 }
 
 int main()
 {
-    float avg1,avg2;
+    float avg1,avg2,timeavg1,timeavg2;
     pc.baud(115200);
     while (1) {
-        long duration1, duration2,USSDistance1, USSDistance2, cm1, cm2, time;
+        long duration1, duration2,USSDistance1, USSDistance2, cm1, cm2, time1,time2;
 
         pingPin1.output();
         pingPin1 = 0;
@@ -57,13 +57,19 @@
                 timeouter.detach();
                 timeouter.attach(&reset, 5);
             }
-            time=tmr.read_ms();
-            printf("1: %d  %d[ms]\n", cm1,time);
+            time1=tmr.read_ms();
+            printf("1: %d  %d[ms]", cm1,time1);
 
             count1++;
+            timecount1++;
 
             sum1=sum1+cm1;   //cm1の値を合計する
             avg1=sum1/count1;    //cm1の平均
+            printf("   avg1: %4.2f",avg1);
+            
+            timesum1=timesum1+time1;    //time1を合計する
+            timeavg1=timesum1/timecount1;   //time1の平均
+            printf("   timeavg1: %4.2f[ms]\n",timeavg1);
 
         }
 
@@ -89,12 +95,19 @@
 
         cm2 = microsecondsToCentimeters(USSDistance2);
         if(15<cm2&&cm2<40) {
-            time=tmr.read_ms();
-            printf("                 2: %d %d[ms]\n",cm2,time);
+            time2=tmr.read_ms();
+            printf("                                                   2: %d %d[ms]",cm2,time2);
 
             count2++;
+            timecount2++;
+            
             sum2=sum2+cm2;   //cm2の値を合計する
             avg2=sum2/count2;    //cm2の平均
+            printf("   avg2: %4.2f",avg2);
+            
+            timesum2=timesum2+time2;    //time2を合計する
+            timeavg2=timesum2/timecount2;   //time2の平均
+            printf("   timeavg2:%4.2f[ms]\n",timeavg2);
 
         }
         wait_ms(10);