CORE / Mbed 2 deprecated 2017_03_Kaiho

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   MPU6050 MS5607 mbed SDFileSystem

Files at this revision

API Documentation at this revision

Revision 18:5fb8ce45ce51, committed 2017-03-14

Comitter:
mikawataru
Date:
Tue Mar 14 12:19:07 2017 +0000
Parent:
17:5f7808444d96
Commit message:
fixed comment

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/main.cpp	Tue Mar 14 12:13:28 2017 +0000
+++ b/main.cpp	Tue Mar 14 12:19:07 2017 +0000
@@ -47,7 +47,7 @@
 #define ACC_LAUNCH      4.0f//FIXME:本番は4g
 #define TOP_DROP_AMOUNT 1.5f
 #define ALT_UAV_DROP    150.0f//FIXME:本番は150m
-#define TIME_REACH_TOP  500.0f//FIXME:本番は15sec
+#define TIME_REACH_TOP  15.0f//FIXME:本番は15sec
 
 #define RATE_LOG  10
 #define RATE_OPEN 10
@@ -81,13 +81,13 @@
 Ticker loop_log;
 Ticker loop_open;
 /*ログカウンタ*/
-FILE *fp;
 bool   row = 0;
 int8_t col = 0;
 /*ログ格納用*/
 float pressure[2][RATE_LOG],temperature[2][RATE_LOG];
 float acc[2][RATE_LOG][3],gyro[2][RATE_LOG][3];
 float t[2][RATE_LOG];
+FILE *fp;
 /*フェーズ変数*/
 int8_t Phase = SETUP;
 int8_t Mode  = STANDBY;
@@ -204,7 +204,7 @@
 }
 /*サーボ動作用関数 _Servo(int8_t 扉番号,int8_t 動作)*/
 void _Servo(int8_t door_num, int8_t motion){
-   if(door_num==1){//扉１
+   if(door_num==1){//缶サット
       if(motion==UNLOCK){
           Door_1_1.pulsewidth(0.0015);
           wait(0.2);
@@ -216,7 +216,7 @@
       }else{
           device.printf("error%f\r\n",motion);
       }
-   }else if(door_num==2){//扉２
+   }else if(door_num==2){//パラシュート
       if(motion==UNLOCK){
          Door_2_1.pulsewidth(0.0015);
          wait(0.2);
@@ -234,7 +234,6 @@
 }
 
 /*入力用*/
-// TODO:テストモード実装
 // FIXME:android端末だと入力崩れが起こる
 void _Input(){
    input_buff[input_cnt] = device.getc();