MPUとHMCでうごくかもver
Dependencies: ConfigFile SDFileSystem mbed
Fork of LAURUS_program by
Revision 18:9dd72e417c60, committed 2015-06-22
- Comitter:
- ojan
- Date:
- Mon Jun 22 15:16:00 2015 +0000
- Parent:
- 16:174daf81eea0
- Child:
- 19:ad8ff2de68f5
- Commit message:
- LAURUS_program_v2.1; ; + some refactoring; + GPS bug fixed (by Onaka
Changed in this revision
main.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/main.cpp Sun Jun 21 15:45:38 2015 +0000 +++ b/main.cpp Mon Jun 22 15:16:00 2015 +0000 @@ -259,14 +259,20 @@ float lv = (float)logicVcc.read_u16() * ADC_LSB_TO_V * 2.0f; // ロジック電源電圧 // データをmicroSDに保存し、XBeeでPCへ送信する - sprintf(data, "%.3f,%.3f,%.3f, %.3f,%.5f,%.5f, %.3f,%.3f,%.3f, %.3f,%d\r\n", - yaw, pitch, roll, - press, gms.longitude, gms.latitude, - sv, lv, vrt_acc, - Distance(target_p, p), optSensor.read_u16()); + sprintf(data, "%d, %.1f,%.1f,%.1f, %.3f,%.5f,%.5f", + UTC_t, yaw, pitch, roll, + press, gms.longitude, gms.latitude); fprintf(fp, data); fflush(fp); xbee.printf(data); + + sprintf(data, ", %.3f,%.3f,%.3f, %.3f,%d\r\n", + sv, lv, vrt_acc, + Distance(target_p, p), optSensor.read_u16()); + + fprintf(fp, data); + fflush(fp); + xbee.printf(data); INT_flag = TRUE; // 割り込み許可 }