Diff: main.cpp

Revision:

7:e68ead6d3c1a

Parent:

6:b2b05ccd4252

Child:

8:c2812fae50df

diff -r b2b05ccd4252 -r e68ead6d3c1a main.cpp
--- a/main.cpp	Fri Aug 28 04:46:53 2020 +0000
+++ b/main.cpp	Fri Aug 28 06:51:20 2020 +0000
@@ -41,7 +41,7 @@
     float *hokui_n,*tokei_n;
     
     mkdir("/sd/mydir00", 0777);
-    FILE *fp = fopen("/sd/mydir00/sdtest.txt", "w");
+    FILE *fp = fopen("/sd/mydir00/sddata.csv", "w");
     if(fp == NULL) {
         error("Could not open file for write\n");
     }
@@ -49,6 +49,7 @@
     gps.baud(9600); 
     //pc.baud(9600);
     //gps.attach(getGPS(&hokui_n,&tokei_n),Serial::RxIrq);
+    fprintf(fp,"N,E,acc:x,acc:y,acc:z,gyr:x,gyr:y,gyr:z,mag:x,mag:y,mag:z");
     warikomi.attach(&FlightPinDriver,0.5);
     
    
@@ -56,12 +57,20 @@
         //BMX055部分
         bmx.getAcc();//加速度の取得
         bmx.getGyro();//角力加速度の取得
-        int a[3],b[3];
+        bmx.getMag();//地磁気の取得
+        getGPS(hokui_n,tokei_n);//GPS取得
+        fprintf(fp,"%f,%f,%f,%f,%f,%2.4f,%2.4f,%2.4f,%2.4f,%2.4f,%2.4f\n\r",hokui_n,tokei_n,(bmx.accel[0]/512)*9.8,
+        (bmx.accel[1]/512)*9.8,(bmx.accel[2]/512)*9.8,(bmx.gyroscope[0]*125)/2048,
+        (bmx.gyroscope[1]*125)/2048,(bmx.gyroscope[2]*125)/2048,bmx.magnet[0],bmx.magnet[1],bmx.magnet[2]);
+        int a[3],b[3],c[3];
         for(int i=0;i<3;i++){
             a[i]=bmx.accel[i];
             if(a[i]<0)a[i] += 4096;//負値の場合+4096
             b[i]=bmx.gyroscope[i];
-            if(b[i]<0)b[i] += 4096;//負値の場合+4096         
+            if(b[i]<0)b[i] += 4096;//負値の場合+4096
+            c[i]=bmx.magnet[i];
+            if(c[i]<0)c[i] += 4096;//負値の場合+4096
+                     
             }
         //GPS部分
         //getGPS(hokui_n,tokei_n);