Diff: main.cpp

Branch:

Thread-gyogetsuMPU

Revision:

47:0c9f3a057f79

Parent:

46:c649987c4d84

Child:

48:2160c28d02f8

Child:

50:d30226fc087f

--- a/main.cpp	Fri Mar 31 07:33:34 2017 +0000
+++ b/main.cpp	Sat Apr 01 08:43:02 2017 +0000
@@ -294,12 +294,15 @@
     } else {
         write_datas_index++;
     }
+    twe.printf("con,");
     for(int i = 0; i <YOKUTAN_DATAS_NUM ; i++) {
         pc.printf("%i   ",soudaDatas[i]);
         twe.printf("%i,",soudaDatas[i]);
-//        android.printf("%i,",soudaDatas[i]);
+        
+        if(i == YOKUTAN_DATAS_NUM - 1)
+          twe.printf("%i\n",soudaDatas[i]);
     }
-    twe.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]);
+    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]);
     /*
     送信文字列
@@ -310,8 +313,8 @@
     23 LDRUG
     */
     //pc.printf("\n\r");
-    twe.printf("%f,%f,%f,",pitch,roll,yaw);
-    twe.printf("%f,%f,%f\n",airSpeed,sonarDist,cadence_twe.cadence);
+    twe.printf("mpu,%f,%f,%f\n",pitch,roll,yaw);
+    twe.printf("kei,%f,%f,%f\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_twe.cadence);