2018年度計器mbed用プログラム

Dependencies:   BufferedSoftSerial2 INA226_ver1 mbed-rtos mbed SDFileSystem-RTOS

Fork of keiki2017 by albatross

Files at this revision

API Documentation at this revision

Comitter:
tsumagari
Date:
Fri May 05 01:08:57 2017 +0000
Branch:
Thread-gyogetsuMPU
Parent:
51:f391d3a02397
Commit message:
???????????????????????????

Changed in this revision

Fusokukei.h 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
mbed.bld Show annotated file Show diff for this revision Revisions of this file
--- a/Fusokukei.h	Fri Apr 21 10:50:05 2017 +0000
+++ b/Fusokukei.h	Fri May 05 01:08:57 2017 +0000
@@ -34,7 +34,7 @@
     }
     
     void calcAirSpeed(float x){
-          air_sum[air_counter % AIR_SUM_NUM] = (float)AIR_K * (float)pow((double)x, 1 / AIR_N);
+          air_sum[air_counter % AIR_SUM_NUM] = (float)AIR_K * (float)pow((double)x*5, 1 / AIR_N);
           if(air_counter % AIR_SUM_NUM == 0)
             air_counter = 0;
           airSpeed_ave = make_ave(air_sum, AIR_SUM_NUM);
--- a/main.cpp	Fri Apr 21 10:50:05 2017 +0000
+++ b/main.cpp	Fri May 05 01:08:57 2017 +0000
@@ -45,8 +45,11 @@
 //Ticker writeDatasTicker;
 //Timer writeTimer;
 
+PwmOut fusokuControlPin(p26);
 InterruptIn FusokukeiPin(p24);
 Ticker FusokukeiTicker;
+Ticker FusokuEnableTicker;
+Ticker FusokuDisableTicker;
 Fusokukei air;
 volatile int air_kaitensu= 0;
 
@@ -95,7 +98,12 @@
     air_kaitensu++;
     led3 = !led3;
 }
-
+void fusokuEnable(){
+    FusokukeiPin.enable_irq();
+}
+void fusokuDisable(){
+    FusokukeiPin.disable_irq();
+}
 void call_calcAirSpeed()
 {
     air.calcAirSpeed(air_kaitensu);
@@ -157,6 +165,9 @@
 {
     FusokukeiPin.rise(air_countUp);
     FusokukeiTicker.attach(&call_calcAirSpeed, AIR_LOOP_TIME);
+    FusokuEnableTicker.attach(&fusokuEnable,0.2);
+    wait_ms(2);
+    FusokuDisableTicker.attach(&fusokuDisable,0.2);
 }
 
 void MpuInit()
--- a/mbed.bld	Fri Apr 21 10:50:05 2017 +0000
+++ b/mbed.bld	Fri May 05 01:08:57 2017 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/mbed_official/code/mbed/builds/093f2bd7b9eb
\ No newline at end of file
+https://mbed.org/users/mbed_official/code/mbed/builds/794e51388b66
\ No newline at end of file