201903_ISE
Dependencies: mbed Madgwick MPU6050 Kalman BMP180
Diff: main.cpp
- Revision:
- 18:37d747f51c0a
- Parent:
- 17:9fc09af2f37a
- Child:
- 19:1e1a9f1829a9
diff -r 9fc09af2f37a -r 37d747f51c0a main.cpp --- a/main.cpp Wed Mar 13 13:05:54 2019 +0000 +++ b/main.cpp Wed Mar 13 14:49:17 2019 +0000 @@ -86,7 +86,7 @@ } t = timer_data.read(); if(t > 1800){ - t_hour =+ 1800; + t_hour += 1800; timer_data.reset(); } t = t + t_hour; @@ -113,6 +113,8 @@ Phase = LAUNCH; servo1_signal = 0; servo2_signal = 0; + t = 0; + timer_data.reset(); } if(c[0] == 'g'){ pc.printf("9,0,0,0,0\r\n"); @@ -144,6 +146,7 @@ cnt_judge=0; timer_open.start(); Phase = RISE; + timer_data.stop(); } break; @@ -163,7 +166,7 @@ pc.printf("3,%f,%f,%3f\r\n",acc_abs,alt_md,timer_open.read()); wait(0.9); i=0; - timer_data.reset(); + //timer_data.reset(); } Phase = OPEN; t = 0.0;