cansat program1

Dependencies:   ADXL345 BME280 HMC5883L ITG3200 MBed_Adafruit-GPS-Library XBee agzIDLIST cansat mbed

Fork of Cansat_program4_1 by CanSat2015aizu

Files at this revision

API Documentation at this revision

Comitter:
s1210160
Date:
Sat May 07 06:41:52 2016 +0000
Parent:
23:8581b740beef
Commit message:
cansat;

Changed in this revision

cansat.lib Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
diff -r 8581b740beef -r e88f40aedb9c cansat.lib
--- a/cansat.lib	Wed Aug 19 07:49:59 2015 +0000
+++ b/cansat.lib	Sat May 07 06:41:52 2016 +0000
@@ -1,1 +1,1 @@
-https://developer.mbed.org/teams/CanSat2015aizu/code/cansat2/#e82a5e1154a1
+https://developer.mbed.org/teams/CanSat2016aizu/code/cansat/#0b2d3e8a615b
diff -r 8581b740beef -r e88f40aedb9c main.cpp
--- a/main.cpp	Wed Aug 19 07:49:59 2015 +0000
+++ b/main.cpp	Sat May 07 06:41:52 2016 +0000
@@ -369,7 +369,6 @@
     
     if(cansat.get_pressure() >= goal_Pressure){         // 取得した気圧と閾値を比較
         if(fall_flag == 0){
-            nic = 1;    // ニクロム線を切る
             fall_flag = 1;
             sep_Timer.reset();
         }
@@ -377,6 +376,7 @@
     
     if(fall_flag == 1 && pressure_Timer.read_ms() >= pressure_Time){    // 取得した気圧が閾値より大きく、落下してから10秒以上経過しているとき
         mode = 2;   // 走行モードに移る
+        nic = 1;    // ニクロム線を切る
         xbee.printf("my pressure is high!\n");
         xbee.printf("remove the parachute\n");
         xbee.printf("change mode: running\n");