Diff: main.cpp

Branch:

Thread-gyogetsuMPU

Revision:

37:34aaa1951390

Parent:

34:c46f2f687c7b

Child:

38:32f483b0a77f

--- a/main.cpp	Sat Feb 18 06:45:59 2017 +0000
+++ b/main.cpp	Sun Feb 19 13:20:11 2017 +0000
@@ -112,7 +112,7 @@
 void updateCadence(/*void const *arg*/){
 //    while(1){
         cadence_twe.readData();
-//        Thread::wait(0.5);
+//        Thread::wait(5);
 //    }
 }
 
@@ -234,7 +234,7 @@
     writeDatas[write_datas_index][i++] = yaw;
     writeDatas[write_datas_index][i++] = airSpeed;
     writeDatas[write_datas_index][i++] = sonarDist;
-    writeDatas[write_datas_index][i++] = cadence;
+    writeDatas[write_datas_index][i++] = cadence_twe.cadence;
     //writeDatas[write_datas_index][i++] = writeTimer.read();
     //for(i = 0; i < WRITE_DATAS_NUM; i++){
 //        pc.printf("%f   ", writeDatas[write_datas_index][i]);
@@ -255,10 +255,11 @@
     }
     //pc.printf("\n\r");
     twe.printf("%f,%f,%f,",pitch,roll,yaw);
-    twe.printf("%f,%f,%f\r\n",airSpeed,sonarDist,cadence); 
+    twe.printf("%f,%f,%f\r\n",airSpeed,sonarDist,cadence_twe.cadence); 
     pc.printf("%f,%f,%f\n\r",pitch,roll,yaw);
     //pc.printf("%f,%f,%f\n\r",calcKXdeg(kx_X.read()),calcKXdeg(KX_Y),calcKXdeg(KX_Z));   
-    pc.printf("%f,%f,%f\n\r",airSpeed,sonarDist,cadence);
+    pc.printf("%f,%f,%s\n\r",airSpeed,sonarDist,cadence_twe.myBuff);
+    pc.printf(cadence_twe.strData.c_str());
     pc.putc(cadence_twe.strV[0]);
     if(android.writeable()){
 //        for(int i = 0; i<SOUDA_DATAS_NUM; i++){
@@ -316,7 +317,7 @@
 
 int main(){
 //    Thread cadence_thread(&updateCadence);
-    Thread mpu_thread(&mpuProcessing);
+//    Thread mpu_thread(&mpuProcessing);
 //    Thread soudaSerial_thread(&DataReceiveFromSouda);
     init();
     while(1){