Diff: main.cpp

Revision:

4:d49256697f27

Parent:

3:d564c0a27ba7

Child:

5:38613e30475e

--- a/main.cpp	Sun Aug 29 02:07:08 2021 +0000
+++ b/main.cpp	Sun Aug 29 05:30:41 2021 +0000
@@ -2,7 +2,7 @@
 //GNSS logger with ublox-NEO7M 
 //MPU board:  mbed LPC1768
 //GNSS module: ublox-NEO7M
-//2021/04/28  A.Toda
+//2021/08/29  A.Toda
 //========================================================
 #include "mbed.h"
 #include "SDFileSystem.h"
@@ -344,11 +344,14 @@
     acc_val[1]=imu.read_acceleration_y();//Y軸の加速度の算出
     acc_val[2]=imu.read_acceleration_z();//Z軸の加速度の算出
     
+    thermopile_voltage_1 = 3.3*(thermopile_input_1.read());//サーモパイルセンサ_1出力の計測
+    thermopile_voltage_2 = 3.3*(thermopile_input_2.read());//サーモパイルセンサ_2出力の計測
+      
     //計測時間の取得
     measurement_time_g = processing_timer.read();
     
     if(logging_status==1){
-        fprintf(im,"%f,%f,%f,%f,%f,%f,%f\r\n",measurement_time_g,gyro_val[0],gyro_val[1],gyro_val[2],acc_val[0],acc_val[1],acc_val[2]);
+        fprintf(im,"%f,%f,%f,%f,%f,%f,%f,%f,%f\r\n",measurement_time_g,gyro_val[0],gyro_val[1],gyro_val[2],acc_val[0],acc_val[1],acc_val[2],thermopile_voltage_1,thermopile_voltage_2);
         //pc.printf("IL\r\n");//imu logging
     }else if(logging_status==0){}
     
@@ -545,14 +548,11 @@
     bem280_humidity = BME_280_getHumidity(); 
     bem280_pressure = BME_280_getPressure();
     
-    thermopile_voltage_1 = 3.3*(thermopile_input_1.read());
-    thermopile_voltage_2 = 3.3*(thermopile_input_2.read());
-    
     //計測時間の取得
     measurement_time_g = processing_timer.read();
     
-    //サーモパイルセンサと気圧、湿度、温度の記録
-    fprintf(th,"%f,%f,%f,%f,%f,%f\r\n",measurement_time_g,bem280_tempreture,bem280_humidity,bem280_pressure,thermopile_voltage_1,thermopile_voltage_2);
+    //気圧、湿度、温度の記録
+    fprintf(th,"%f,%f,%f,%f\r\n",measurement_time_g,bem280_tempreture,bem280_humidity,bem280_pressure);
     
     /*
     if(logging_status==1){