Diff: Cadence.h

Revision:

26:50272431cd1e

Parent:

21:8802034b7810

Child:

27:d2955f29a3aa

Child:

29:2da9b8d03c0b

--- a/Cadence.h	Sat Jan 07 06:45:20 2017 +0000
+++ b/Cadence.h	Wed Jan 25 12:24:10 2017 +0000
@@ -25,6 +25,7 @@
         voltage=0;
     }
     void readData(){ //Ticker で定期的に呼び出して値を更新
+      if(readable()){
         data_count = 0;
         data_num = 0;
         cadence = 0;
@@ -34,9 +35,12 @@
                 data_count++;
             }
         }while(data[data_count-1] != '\n');
-        
         strData = data;
-        if(strData.length() > DATAS_NUM-4 ){
+        if( int strlength = strData.length() > DATAS_NUM-4 ){
+//            for(int i = 0; i<4; i++){
+//                strC += data[data_count-6+i];
+//                strV += data[data_count-43+i];
+//            }
             switch (strData.length()){
                 case DATAS_NUM-3 :
                     strData.erase(0,2);
@@ -54,9 +58,10 @@
             strC = strData.substr(64,4);
             sscanf(strV.c_str(),"%lf",&voltage);
             sscanf(strC.c_str(),"%lf",&cadence);
-            //cadence /= 6.0;
-//            voltage *= 0.001;
+            cadence /= 6.0;
+            voltage *= 0.001;
         }
+      }
     }
 };
 #endif
\ No newline at end of file