Diff: main.cpp

Revision:

2:c2f8ff2de89e

Parent:

1:81b746caadc5

Child:

3:2b7006ab9646

--- a/main.cpp	Sat Dec 19 10:06:48 2020 +0000
+++ b/main.cpp	Sat Dec 19 10:47:54 2020 +0000
@@ -24,11 +24,12 @@
     xbee.printf("initialization complete!\n\r");//初期化完了
 
     while(1){
-        if(bmp180.ReadData(&temperature,&pressure)){
           float x4,x5,x6,x7,a,b;
           float sum=0,altitude[11];
-            for(int p=1;p<11;p++){
-                a = pressure;
+          int r=0;
+        for(int p=1;p<11;p++){
+        if(bmp180.ReadData(&temperature,&pressure)){
+            a = pressure;
             b = temperature;
             x4 = 1019.11 / a; //海面気圧を気圧でわる
             x5 = powf(x4, 0.1902225); //5.257ぶんの1
@@ -37,31 +38,30 @@
             x8 = x7 / 0.0065;
             altitude[p] = x8;
             sum=sum+altitude[p];
-            xbee.printf("高度%d回目%f\n\r",p,altitude[p]);
-             xbee.printf("-------------------------------\n\r");
+            r++;
+        }else{
+        xbee.printf("NO DATA\n\r");
+        xbee.printf("---------------------------\n\r");
+        wait(1);
             }
-            avalt=sum/10;
             
-            
+            avalt=sum/(float)r;
             xbee.printf("Altitude(m)\t:%.3f\n\r",avalt);
             xbee.printf("--------------------------------\n\r");
             wait(3);
             break;
             n=0;
-    }else{
-        xbee.printf("NO DATA\n\r");
-        xbee.printf("---------------------------\n\r");
-        wait(1);
+    }
         }
-    }
         while(1){
-            if(bmp180.ReadData(&temperature,&pressure)){
                 float y4,y5,y6,y7,y8,c,d;
                 float speed;
                 float s=0;
                 float alti[11];
                 float average_alti;
-                for(int q=1;q<11;q++){
+                int e=0;
+        for(int q=1;q<11;q++){
+                if(bmp180.ReadData(&temperature,&pressure)){
                 c = pressure;
                 d = temperature;
                 y4 = 1019.11 / c; //海面気圧を気圧でわる
@@ -71,32 +71,26 @@
                 y8 = y7 / 0.0065;
                 alti[q]= y8;
                 s=s+alti[q];
+                average_alti=s/(float)e;
                 xbee.printf("高度%d回目%f\n\r",q,alti[q]);
                 xbee.printf("-------------------------------\n\r");
-                }
-                average_alti=s/10;
                 speed = (avalt - average_alti)/(float)(3+n);//値が取得でた場合は，3秒間の速さをだし，値が取得できなかった場合は3＋n秒(nは値が取得できなかった回数)の速さをだす
-                
                 xbee.printf("Altitude(m)\t:%.3f\n\r",average_alti);
                 xbee.printf("Speed(m/s)\t:%.3f\n\r",speed);
                 xbee.printf("-------------------------------\n\r");
-                x8 = y8;
-                n=0;
-                wait(3);
+                avalt=average_alti;
+                printf("tの値は%d",t);
                 if(speed<=0.5){
                     t=t+1;
                     }
-            }else{xbee.printf("NO DATA\n\r");
-                    ++n;
-                    wait(1);
-                    }
                     if(t=3){
                         break;
                         }
-           }
-           /*speedが3回0.5m/s以下になったらFETに20秒電流を流してその後電流を止める*/         
-    
-                      
+                n=0;
+                wait(3);
+                }
+             }  
 
    return 0;
+   }
    }
\ No newline at end of file