Diff: main.cpp

Revision:

7:4efaca1e9acd

Parent:

6:e0c25c3976ae

Child:

8:b10169df8f5f

--- a/main.cpp	Sun Oct 29 13:38:47 2017 +0000
+++ b/main.cpp	Sat Nov 04 01:08:35 2017 +0000
@@ -33,6 +33,7 @@
 float   _getAcc();
 float   _median(float data[], int num);
 
+
 /*  グローバル変数 */
 int     Alt_cnt;
 float   a[3],Acc;
@@ -125,15 +126,17 @@
                 Alt_buff[j] = _getAlt();
             }
             Alt_median_buff[i] = _median(Alt_buff,10);
-            if(Alt_median_buff[i] < Alt_median_buff[i-1]) Alt_cnt++;
+//            pc.printf("%f\r\n",Alt_median_buff[i]);
+            if(Alt_median_buff[i] < Alt_median_buff[i-1]-0.1) Alt_cnt++;
         }
+//        pc.printf("%d\r\n",Alt_cnt);
         if(para_timer.read() >= PARA_OPEN_FILTER_s){
-            if(Alt_cnt >= PARA_OPEN_CNT/* || para_timer.read() >= PARA_OPEN_TIME_s*/){
+            if(Alt_cnt >= PARA_OPEN_CNT || para_timer.read() >= PARA_OPEN_TIME_s){
                 _open();
                 leaf_timer.start();
                 oshirase2 = 0;
                 para_timer.stop();
-    //            for(int i=0;i<10;i++)pc.printf("%f\n\r",Alt_buff[i]);
+//                for(int i=0;i<10;i++)pc.printf("%f\n\r",Alt_buff[i]);
                 break;
             }
         }
@@ -145,7 +148,7 @@
             Alt_buff[i] = _getAlt();
         }
         Altitude = _median(Alt_buff,10);
-        if(/*Altitude - Land_Alt <= LEAF_UNLOCK_ALT_m ||*/ leaf_timer.read() >= LEAF_UNLOCK_TIME_s){
+        if(Altitude - Land_Alt <= LEAF_UNLOCK_ALT_m || leaf_timer.read() >= LEAF_UNLOCK_TIME_s){
             _leaf_unlock();
             oshirase2 = 1;
             leaf_timer.stop();
@@ -165,8 +168,11 @@
 
 /*  高度取得関数    */
 float _getAlt(){
+    float altitude;
     bmp.ReadData(&Temperature,&Pressure);
-    return (pow((p0/Pressure), (1.0f/5.257f))-1.0f)*(Temperature+273.15f)/0.0065f;
+    altitude = (pow((p0/Pressure), (1.0f/5.257f))-1.0f)*(Temperature+273.15f)/0.0065f;
+//    pc.printf("%f, %f, %f\r\n",Pressure,Temperature,altitude);
+    return altitude;
 }