Diff: main.cpp

Branch:

Thread-gyogetsuMPU

Revision:

40:f15c11485e95

Parent:

39:7623678de4e2

Child:

41:1bd730c4840d

Child:

45:73ac4054ea23

--- a/main.cpp	Sun Mar 12 02:20:38 2017 +0000
+++ b/main.cpp	Sun Mar 12 10:56:54 2017 +0000
@@ -8,8 +8,8 @@
 #include "SDFileSystem.h"
 
 #define SOUDA_DATAS_NUM 24 //(yokutan 7 + input 5)*2
-#define WRITE_DATAS_NUM 20
-#define SD_WRITE_NUM 1
+#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 WRITE_DATAS_LOOP_TIME 1
@@ -64,8 +64,8 @@
 
 DigitalOut RollAlarmR(p23);
 DigitalOut RollAlarmL(p22);
-DigitalOut led(LED1);
 DigitalOut led2(LED2);
+DigitalOut led4(LED4);
 
 char soudaDatas[SOUDA_DATAS_NUM];
 float writeDatas[SD_WRITE_NUM][WRITE_DATAS_NUM];
@@ -211,7 +211,7 @@
             sum = 0;
             sumCount = 0;
         }
-        Thread::wait(0.01);
+        Thread::wait(1);
     }//while(1)
 }
 
@@ -241,7 +241,7 @@
 }
 
 void SDprintf(){
-    fp = fopen("/sd/mydir/sdtest.csv", "a");
+    fp = fopen("/sd/mydir/data.csv", "a");
     if(fp == NULL) {
         error("Could not open file for write\n");
     }
@@ -274,6 +274,7 @@
 //    pc.printf("\n\r");
 //    twe.printf("\n\r");
     if(write_datas_index == SD_WRITE_NUM-1){
+        SDprintf();
         write_datas_index=0;
     }
     else{
@@ -300,7 +301,7 @@
 //        android.printf("%f,%f,\r\n",airSpeed,sonarDist); 
         android.printf("%f,%f,test\n\r",roll,airSpeed);
     }
-    SDprintf();
+//    SDprintf();
 }
 
 void WriteDatasF(){
@@ -357,8 +358,9 @@
         sonarCalc();
         RollAlarm();
         DataReceiveFromSouda();
-        updateCadence();
+//        updateCadence();
         WriteDatas();
 //        WriteServo();
+        led4 = !led4;
     }
 }
\ No newline at end of file