Diff: main.cpp

Branch:

Thread-gyogetsuMPU

Revision:

42:73c3862e4c12

Parent:

41:1bd730c4840d

Child:

46:c649987c4d84

--- a/main.cpp	Sat Mar 18 03:13:36 2017 +0000
+++ b/main.cpp	Sat Mar 18 14:09:42 2017 +0000
@@ -34,7 +34,7 @@
 //SDFileSystem sd(p5, p6, p7, p8, "sd");
 //FILE* fp;
 
-RawSerial pc(USBTX,USBRX);
+//RawSerial pc(USBTX,USBRX);
 RawSerial android(p9,p10);
 BufferedSoftSerial soudaSerial(p17,p18);
 BufferedSoftSerial twe(p11,p12);
@@ -133,7 +133,7 @@
 //    SdInit();
 //    MpuInit(); 
     //writeDatasTicker.attach(&WriteDatas,1);
-    cadenceUpdateTicker.attach(&updateCadence, 1);
+//    cadenceUpdateTicker.attach(&updateCadence, 0.2);
     
 //-----for InterruptMode of sonar----------------------------
 //    sonarPin.rise(&sonarInterruptStart);
@@ -290,10 +290,10 @@
     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\n\r",airSpeed,sonarDist);
-    for(int i = 0; i < cadence_twe.strData.length(); i++){
-        pc.printf("%c",*(cadence_twe.strData.c_str()+i));
-    }
+    pc.printf("%f,%f,%f\n\r",airSpeed,sonarDist,cadence_twe.cadence);
+//    for(int i = 0; i < strlen(cadence_twe.myBuff); i++){
+//        pc.printf("%c",*(cadence_twe.myBuff+i));
+//    }
     if(android.writeable()){
 //        for(int i = 0; i<SOUDA_DATAS_NUM; i++){
 //            android.printf("%i,",soudaDatas[i]);