Diff: main.cpp

Revision:

8:a9e115560ba3

Parent:

7:5f693667d0e9

Child:

9:ac43a90b6afb

Child:

10:c1d1ff35a6a1

--- a/main.cpp	Thu Feb 23 11:06:28 2017 +0000
+++ b/main.cpp	Thu Feb 23 12:47:00 2017 +0000
@@ -44,10 +44,10 @@
 #include "MPU6050.h"
 #include "SDFileSystem.h"
 /*判定パラメータ*/
-#define ACC_LAUNCH -10//発射判定加速度[g]
+#define ACC_LAUNCH 4//発射判定加速度[g]
 #define DROP_TOP 1.5//頂点判定最低降下量[m]
-#define ALT_CAN 1//缶サット開放高度[m]
-#define TIME_TOP 60//タイマー開放時間
+#define ALT_CAN 350//缶サット開放高度[m]
+#define TIME_TOP 15//タイマー開放時間[s]
 /*動作レート*/
 #define RATE_LOG 10//ログ用
 #define RATE_OPEN 10//開放用
@@ -60,7 +60,7 @@
 #define FLIGHT 2
 #define DROP 3
 
-#define P0 1013.25f
+#define P0 1013.25f//海面気圧[hPa]
 /*ピン指定*/
 MS5607I2C ms5607(p9, p10, false);
 MPU6050 mpu(p9,p10);
@@ -87,8 +87,8 @@
 /*フェイズ変数*/
 int8_t Phase = STANDBY;
 /*判定用*/
+float a_buff;
 float alt,alt_max,alt_launch;
-float a_buff,p_buff,t_buff;
 float t_drop,t_top,t_launch;
 int8_t cnt_launch = 0;
 int8_t cnt_top = 0;
@@ -152,7 +152,6 @@
                   }else{
                      if(timer.read()>t_drop+1.0)cnt_drop = 0;
                   }
-                  pc.printf("DROP:\r\n");
                   break;
    }
 }