Diff: main.cpp

Branch:

cadence

Revision:

64:2de7ea84d39a

Parent:

63:f7f4edd463b1

Child:

65:075118165355

Child:

66:1ffafa1c4a87

--- a/main.cpp	Wed Jun 14 10:14:26 2017 +0000
+++ b/main.cpp	Wed Jun 14 11:29:52 2017 +0000
@@ -360,14 +360,20 @@
     } else {
         write_datas_index++;
     }
-    twe.printf("con,");
+    char sbuf[128];
+    int p=0;
+//    twe.printf("con,");
+    p = sprintf(sbuf,"con,");
     for(int i = 0; i <YOKUTAN_DATAS_NUM ; i++) {
 //        pc.printf("%i   ",soudaDatas[i]);
-        twe.printf("%i,",soudaDatas[i]);
+//        twe.printf("%i,",soudaDatas[i]);
+        p = sprintf(sbuf+p,"%i,",soudaDatas[i]);
 
         if(i == YOKUTAN_DATAS_NUM - 1)
-            twe.printf("%i\n",soudaDatas[i]);
+//            twe.printf("%i\n",soudaDatas[i]);
+            p = sprintf(sbuf+p,"%i\n",soudaDatas[i]);
     }
+    twe.printf("%s",sbuf);
     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]);
     
     /*
@@ -386,7 +392,8 @@
 //    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);
+//    printf("mgPin V:%f\n\r",mgPin.read()*3.3);
+    pc.printf("mgPin V:%f\n%d,%i,%d,%i\n%f,%f,%f\n%f,%f,%f\n\r",mgPin.read()*3.3,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));
 //    }
@@ -395,7 +402,7 @@
 //        android.printf("%f,%f,%f,",pitch,roll,yaw);
 //        android.printf("%f,%f,\r\n",airSpeed,sonarDist);
         android.printf("%4.2f,%4.2f,%4.2f,\n,",roll,airSpeed,cadenceResult);//cadence_twe.cadence);
-        led2 = !led2;
+//        led2 = !led2; 
     }
 //    SDprintf();
 }
@@ -436,7 +443,6 @@
         if(VCmonitor.getVoltage(&V) == 0) {
             printf("e:%f\n",V);
         }
-        printf("mgPin V:%f\n\r",mgPin.read()*3.3);
         updateCadence(V,mgPin.read() * 3.3,mgPin2.read() * 3.3,isFirstCadenceFlag);
         isFirstCadenceFlag = false;
         //pc.printf("test\n\r");