Diff: main.cpp

Branch:

Thread-gyogetsuMPU

Revision:

51:f391d3a02397

Parent:

48:2160c28d02f8

Child:

52:a94cbaef3602

Child:

53:9bc528ee224b

Child:

54:bbd1bf12d356

--- a/main.cpp	Fri Apr 21 05:44:00 2017 +0000
+++ b/main.cpp	Fri Apr 21 10:50:05 2017 +0000
@@ -12,7 +12,7 @@
 #define WRITE_DATAS_NUM 30 // souda_datas_num + 6( rpy, airspeed, height, cadence)
 #define SD_WRITE_NUM 20
 #define MPU_LOOP_TIME 0.01
-#define AIR_LOOP_TIME 0.01
+#define AIR_LOOP_TIME 0.01//(0.002005)
 #define WRITE_DATAS_LOOP_TIME 1
 #define ROLL_R_MAX_DEG 2
 #define ROLL_L_MAX_DEG 2
@@ -67,6 +67,7 @@
 DigitalOut RollAlarmR(p23);
 DigitalOut RollAlarmL(p22);
 DigitalOut led2(LED2);
+//DigitalOut led3(LED3);
 DigitalOut led4(LED4);
 
 char soudaDatas[SOUDA_DATAS_NUM];
@@ -92,6 +93,7 @@
 void air_countUp()
 {
     air_kaitensu++;
+    led3 = !led3;
 }
 
 void call_calcAirSpeed()
@@ -297,14 +299,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]);
+    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翼端データ
@@ -316,13 +318,13 @@
     ////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);
-    //pc.printf("%f,%f,%f\n\r",pitch,roll,yaw);
+    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,cadence_twe.cadence);
 //    for(int i = 0; i < strlen(cadence_twe.myBuff); i++){
 //        ////pc.printf("%c",*(cadence_twe.myBuff+i));
 //    }
-    pc.printf("%f\n\r",airSpeed);
+//    pc.printf("%f\t%f\t%f\t%f\n\r",airSpeed,air_sum[0],air_sum[1],air_sum[2]);
     if(android.writeable()) {
 //        for(int i = 0; i<SOUDA_DATAS_NUM; i++){
 //            android.printf("%i,",soudaDatas[i]);