Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-21 23:33:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Copter: use unsigned long for dataflash log for gps time

Browse Source 
Updated some formatting of comments in the same file
This commit is contained in:
Randy Mackay 2013-03-04 23:13:06 +09:00
parent 33bd984a91
commit 998511f506
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ArduCopter/Log.pde
View File

@ -245,8 +245,8 @@ static void Log_Read_GPS()
// need to fix printf formatting
cliSerial->printf_P(PSTR("GPS, %ld, %u, "),
(long)pkt.gps_time,
cliSerial->printf_P(PSTR("GPS, %lu, %u, "),
(unsigned long)pkt.gps_time,
(unsigned)pkt.num_sats);
print_latlon(cliSerial, pkt.latitude);
cliSerial->print_P(PSTR(", "));
@ -752,7 +752,7 @@ static void Log_Read_Attitude()
struct log_Attitude pkt;
DataFlash.ReadPacket(&pkt, sizeof(pkt));
// 1 2 3 4 5 6 7
// 1 2 3 4 5 6 7
cliSerial->printf_P(PSTR("ATT, %d, %d, %d, %d, %d, %u, %u\n"),
(int)pkt.roll_in,
(int)pkt.roll,
@ -810,21 +810,21 @@ static void Log_Read_INAV()
struct log_INAV pkt;
DataFlash.ReadPacket(&pkt, sizeof(pkt));
// 1 2 3 4 5 6 7 8 9 10 11 12 13
// 1 2 3 4 5 6 7 8 9 10 11 12 13
cliSerial->printf_P(PSTR("INAV, %d, %d, %d, %6.4f, %6.4f, %6.4f, %6.4f, %ld, %ld, %6.4f, %6.4f, %6.4f, %6.4f\n"),
(int)pkt.baro_alt, // 1 barometer altitude
(int)pkt.inav_alt, // 2 accel + baro filtered altitude
(int)pkt.inav_climb_rate, // 4 accel + baro based climb rate
(float)pkt.accel_corr_x, // 5 accel correction x-axis
(float)pkt.accel_corr_y, // 6 accel correction y-axis
(float)pkt.accel_corr_z, // 7 accel correction z-axis
(float)pkt.accel_corr_ef_z, // 8 accel correction earth frame
(long)pkt.gps_lat_from_home, // 9 lat from home
(long)pkt.gps_lon_from_home, // 10 lon from home
(float)pkt.inav_lat_from_home, // 11 accel based lat from home
(float)pkt.inav_lon_from_home, // 12 accel based lon from home
(float)pkt.inav_lat_speed, // 13 accel based lat velocity
(float)pkt.inav_lon_speed); // 14 accel based lon velocity
(int)pkt.inav_climb_rate, // 3 accel + baro based climb rate
(float)pkt.accel_corr_x, // 4 accel correction x-axis
(float)pkt.accel_corr_y, // 5 accel correction y-axis
(float)pkt.accel_corr_z, // 6 accel correction z-axis
(float)pkt.accel_corr_ef_z, // 7 accel correction earth frame
(long)pkt.gps_lat_from_home, // 8 lat from home
(long)pkt.gps_lon_from_home, // 9 lon from home
(float)pkt.inav_lat_from_home, // 10 accel based lat from home
(float)pkt.inav_lon_from_home, // 11 accel based lon from home
(float)pkt.inav_lat_speed, // 12 accel based lat velocity
(float)pkt.inav_lon_speed); // 13 accel based lon velocity
}
struct log_Mode {