Diff: main.cpp

Revision:

2:6a50d967a71a

Parent:

1:32df8ff2011e

Child:

3:c3f198cd0624

diff -r 32df8ff2011e -r 6a50d967a71a main.cpp
--- a/main.cpp	Tue May 10 12:05:02 2016 +0000
+++ b/main.cpp	Tue May 10 15:35:45 2016 +0000
@@ -1,7 +1,7 @@
 #include "mbed.h"
 #include"time.h"
 
-#define UPA 3800//坐时最大加速度值
+#define UPA 10000//坐时最大加速度值
 
 uint16_t x_a,y_a,z_a;
 bool flag = 0;
@@ -88,10 +88,11 @@
     clock_t start,end;
     start=clock();
     get_val();
-    while(y_a<=UPA)
+    get_val();
+    while(x_a<=UPA)
     {   get_val(); 
         end=clock();
-        if(((double)end-start)/CLK_TCK>20)//坐了20s
+        if((double)(end-start)/CLK_TCK>20)//坐了20s
         {   flag=1;
             break;
             }
@@ -99,7 +100,7 @@
     while(flag)
     {    buzzerini();
          get_val();
-         if(y_a>UPA)
+         if(x_a>UPA)
          {
             buzzer.period_us(0);
             break;}
@@ -119,7 +120,7 @@
      if(flag)
      {   
          flag=0;
-         wait(20);//等站起来后读取判断周期变长
+         wait(10);//等站起来后读取判断周期变长
      }
   }
 }
\ No newline at end of file