Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-09 01:18:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

DataFlash: fixed rebase errors

Browse Source
This commit is contained in:
Andrew Tridgell 2015-05-27 14:27:41 +10:00
parent 08f8355dd0
commit 95ff71940c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/DataFlash/DataFlash.h
View File

@ -636,13 +636,13 @@ Format characters in the format string for binary log messages
{ LOG_COMPASS_MSG, sizeof(log_Compass), \
"MAG", "QhhhhhhhhhB", "TimeUS,MagX,MagY,MagZ,OfsX,OfsY,OfsZ,MOfsX,MOfsY,MOfsZ,Health" }, \
{ LOG_MODE_MSG, sizeof(log_Mode), \
"MODE", "QMB", "TimeUS,Mode,ModeNum" } \
"MODE", "QMB", "TimeUS,Mode,ModeNum" }, \
{ LOG_PIDR_MSG, sizeof(log_PID), \
"PIDR", "Qffffff", "TimeUS,Des,P,I,D,FF,AFF" }, \
{ LOG_PIDP_MSG, sizeof(log_PID), \
"PIDP", "Qffffff", "TimeUS,Des,P,I,D,FF,AFF" }, \
{ LOG_PIDY_MSG, sizeof(log_PID), \
"PIDY", "Qffffff", "TimeUS,Des,P,I,D,FF,AFF" } \
"PIDY", "Qffffff", "TimeUS,Des,P,I,D,FF,AFF" }, \
{ LOG_PIDA_MSG, sizeof(log_PID), \
"PIDA", "Qffffff", "TimeUS,Des,P,I,D,FF,AFF" }

2
libraries/DataFlash/LogFile.cpp
View File

@ -1333,7 +1333,7 @@ void DataFlash_Class::Log_Write_PID(uint8_t msg_type, const PID_Info &info)
{
struct log_PID pkt = {
LOG_PACKET_HEADER_INIT(msg_type),
time_ms : hal.scheduler->millis(),
time_us : hal.scheduler->micros64(),
desired : info.desired,
P : info.P,
I : info.I,