Diff: Sensor/TweLite_Sensors.cpp

Revision:

31:cef6ee7af014

Parent:

30:6d3a78bc1925

Child:

33:d939479e7b13

diff -r 6d3a78bc1925 -r cef6ee7af014 Sensor/TweLite_Sensors.cpp
--- a/Sensor/TweLite_Sensors.cpp	Thu Dec 29 11:36:49 2016 +0000
+++ b/Sensor/TweLite_Sensors.cpp	Mon Feb 13 06:08:05 2017 +0000
@@ -1,24 +1,37 @@
 #include "mbed.h"
 #include "Global.h"
-#include "TweLite_Senosors.h"
+#include "TweLite_Sensors.h"
 #include <string>
 #define CADENCE 0
 #define ULTSONIC 1
-
+/*
+*要変更
+*バッテリーチェッカー用の電圧も取得する必要あり。
+*/
 TweLite_Sensors::TweLite_Sensors(PinName tx, PinName rx) : _twelite_serial(tx,rx){
     _twelite_serial.baud(115200);    
 }
 
-void TweLite_Sensors::updata(std::string sensor){
-       if(sensor == "cadence"){
-           _twelite_serial.printf("%d",CADENCE);
-           while(!_twelite_serial.readable());
-           _twelite_serial.scanf("%f",cadencereply);
-           Global::setcadence(cadencereply);
-        }else if(sensor == "ultsonic"){
-           _twelite_serial.printf("%d",ULTSONIC);
-           while(!_twelite_serial.readable());
-           _twelite_serial.scanf("%f",ultsonicreply);
-           Global::setultsonic(ultsnoicreply);
+double TweLite_Sensors::scandouble(){
+     for(int i=0;i<=7;i++){
+                while(!_twelite_serial.readable());
+                data[i] = _twelite_serial.getc();
+            }
+           return *(double*)data;     
+}
+
+void TweLite_Sensors::update(int sensor){
+       if(sensor == CADENCE){
+           _twelite_serial.putc(CADENCE);
+           cadencevalu = scandouble();
+           cadenceBattery = scandouble();
+           Global::setcadence(cadencevalu);
+           Global::setcadencevolt(cadenceBattery);
+        }else if(sensor == ULTSONIC){
+           _twelite_serial.putc(ULTSONIC);
+           ultsonicvalu = scandouble();
+           ultsonicBattery = scandouble();
+           Global::setultsonic(ultsonicvalu);
+           Global::setultsonicvolt(ultsonicBattery);
         }
 }
\ No newline at end of file