Diff: main.cpp

Branch:

cadence

Revision:

62:98294011f568

Parent:

61:7f980cb3a7a8

Child:

63:f7f4edd463b1

--- a/main.cpp	Tue Jun 13 06:11:51 2017 +0000
+++ b/main.cpp	Wed Jun 14 09:45:04 2017 +0000
@@ -38,10 +38,12 @@
 FILE* fp;
 
 //RawSerial pc(USBTX,USBRX);
-Serial android(p9,p10);
+//Serial android(p9,p10);
 BufferedSoftSerial soudaSerial(p17,p18);
 BufferedSoftSerial twe(p11,p12);
-Cadence cadence_twe(p13,p14);
+//Cadence cadence_twe(p13,p14);
+Serial android(p13,p14);
+
 Ticker cadenceUpdateTicker;
 //Ticker writeDatasTicker;
 //Timer writeTimer;
@@ -72,10 +74,10 @@
 DigitalOut led2(LED2);
 //DigitalOut led3(LED3);
 DigitalOut led4(LED4);
-I2C i2c(p9,p10);
-INA226 VCmonitor(i2c,0x9C);
+I2C InaI2c(p9,p10);
+INA226 VCmonitor(InaI2c,0x9C);
 AnalogIn mgPin(p20);
-AnalogIn mgPin2(p19);
+AnalogIn mgPin2(p16);
 
 char soudaDatas[SOUDA_DATAS_NUM];
 float writeDatas[SD_WRITE_NUM][WRITE_DATAS_NUM];
@@ -344,7 +346,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_twe.cadence;
+    writeDatas[write_datas_index][i++] = cadenceResult;//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]);
@@ -378,10 +380,10 @@
     */
     ////pc.printf("\n\r");
     twe.printf("mpu,%f,%f,%f\n",pitch,roll,yaw);
-    twe.printf("kei,%f,%f,%f\n",airSpeed,sonarDist,cadence_twe.cadence);
+    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,cadence_twe.cadence);
+    pc.printf("%f,%f,%f\n\r",airSpeed,sonarDist,cadenceResult);//cadence_twe.cadence);
 //    for(int i = 0; i < strlen(cadence_twe.myBuff); i++){
 //        ////pc.printf("%c",*(cadence_twe.myBuff+i));
 //    }
@@ -389,7 +391,7 @@
     if(android.writeable()) {
 //        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,cadence_twe.cadence);
+        android.printf("%4.2f,%4.2f,%4.2f,\n,",roll,airSpeed,cadenceResult);//cadence_twe.cadence);
         led2 = !led2;
     }
 //    SDprintf();