Diff: main.cpp

Branch:

cadence

Revision:

63:f7f4edd463b1

Parent:

62:98294011f568

Child:

64:2de7ea84d39a

--- a/main.cpp	Wed Jun 14 09:45:04 2017 +0000
+++ b/main.cpp	Wed Jun 14 10:14:26 2017 +0000
@@ -42,7 +42,7 @@
 BufferedSoftSerial soudaSerial(p17,p18);
 BufferedSoftSerial twe(p11,p12);
 //Cadence cadence_twe(p13,p14);
-Serial android(p13,p14);
+RawSerial android(p13,p14);
 
 Ticker cadenceUpdateTicker;
 //Ticker writeDatasTicker;
@@ -362,14 +362,14 @@
     }
     twe.printf("con,");
     for(int i = 0; i <YOKUTAN_DATAS_NUM ; i++) {
-        pc.printf("%i   ",soudaDatas[i]);
+//        pc.printf("%i   ",soudaDatas[i]);
         twe.printf("%i,",soudaDatas[i]);
 
         if(i == YOKUTAN_DATAS_NUM - 1)
             twe.printf("%i\n",soudaDatas[i]);
     }
     twe.printf("inp,%d,%i,%d,%i\n",soudaDatas[YOKUTAN_DATAS_NUM],soudaDatas[sizeof(int) + YOKUTAN_DATAS_NUM + 2],(int)soudaDatas[SOUDA_DATAS_NUM - sizeof(int) - 3],soudaDatas[SOUDA_DATAS_NUM-1]);
-    pc.printf("%d,%i,%d,%i,",soudaDatas[YOKUTAN_DATAS_NUM],soudaDatas[sizeof(int) + YOKUTAN_DATAS_NUM + 2],(int)soudaDatas[SOUDA_DATAS_NUM - sizeof(int) - 3],soudaDatas[SOUDA_DATAS_NUM-1]);
+    
     /*
     送信文字列
     0-13翼端データ
@@ -381,9 +381,12 @@
     ////pc.printf("\n\r");
     twe.printf("mpu,%f,%f,%f\n",pitch,roll,yaw);
     twe.printf("kei,%f,%f,%f\n",airSpeed,sonarDist,cadenceResult);//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,cadenceResult);//cadence_twe.cadence);
+//    pc.printf("%f,%f,%f\n\r",airSpeed,sonarDist,cadenceResult);//cadence_twe.cadence);
+//    pc.printf("%d,%i,%d,%i,",soudaDatas[YOKUTAN_DATAS_NUM],soudaDatas[sizeof(int) + YOKUTAN_DATAS_NUM + 2],(int)soudaDatas[SOUDA_DATAS_NUM - sizeof(int) - 3],soudaDatas[SOUDA_DATAS_NUM-1]);
+//    pc.printf("%f,%f,%f\n\r",pitch,roll,yaw);
+    pc.printf("%d,%i,%d,%i\n%f,%f,%f\n%f,%f,%f\n\r",soudaDatas[YOKUTAN_DATAS_NUM],soudaDatas[sizeof(int) + YOKUTAN_DATAS_NUM + 2],(int)soudaDatas[SOUDA_DATAS_NUM - sizeof(int) - 3],soudaDatas[SOUDA_DATAS_NUM-1],pitch,roll,yaw,airSpeed,sonarDist,cadenceResult);
 //    for(int i = 0; i < strlen(cadence_twe.myBuff); i++){
 //        ////pc.printf("%c",*(cadence_twe.myBuff+i));
 //    }