albatross / Mbed 2 deprecated keiki2017

2017年度の製作を開始します。

Dependencies:   BufferedSoftSerial2 SDFileSystem-RTOS mbed mbed-rtos INA226_ver1

Fork of keiki2016ver5 by albatross

Diff: Fusokukei.h

Branch:
fusokukei
Revision:
15:6966299bea4c
Parent:
13:09e05e7cfca1
Child:
27:d2955f29a3aa
--- a/Fusokukei.h	Sat Nov 19 11:00:31 2016 +0000
+++ b/Fusokukei.h	Sat Nov 26 01:12:10 2016 +0000
@@ -18,7 +18,7 @@
 float air_sum[AIR_SUM_NUM] = {0.0};
 
 class Fusokukei{
-    double r;
+    double air_r;
     protected:
     
     public:      
@@ -35,8 +35,8 @@
     }
     
     void calcAirSpeed(float x){
-          r = x/150;
-          air_sum[air_counter % AIR_SUM_NUM] = (float)AIR_K * (float)pow(r, 1 / AIR_N);
+          air_r = x/150;
+          air_sum[air_counter % AIR_SUM_NUM] = (float)AIR_K * (float)pow(air_r, 1 / AIR_N);
           if(air_counter % AIR_SUM_NUM == 0)
             air_counter = 0;
           airSpeed_ave = make_ave(air_sum, AIR_SUM_NUM);