Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-22 07:44:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Plane: fixed up merge errors

Browse Source
This commit is contained in:
Andrew Tridgell 2014-01-30 22:35:07 +11:00
parent b56c8211c9
commit a7faa58879
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduPlane/Log.pde
View File

@ -601,10 +601,6 @@ static const struct LogStructure log_structure[] PROGMEM = {
"ARSP", "Iffc", "TimeMS,Airspeed,DiffPress,Temp" },
{ LOG_AHRS2_MSG, sizeof(log_AHRS2),
"AHR2","IccCfLL","TimeMS,Roll,Pitch,Yaw,Alt,Lat,Lng" },
{ LOG_EKF1_MSG, sizeof(log_EKF1),
"EKF1","IccCffffffbbb","TimeMS,Roll,Pitch,Yaw,VN,VE,VD,PN,PE,PD,GX,GY,GZ" },
{ LOG_EKF2_MSG, sizeof(log_EKF2),
"EKF2","Ibbbcchhhhhh","TimeMS,AX,AY,AZ,VWN,VWE,MN,ME,MD,MX,MY,MZ" },
TECS_LOG_FORMAT(LOG_TECS_MSG),
};

2
ArduPlane/defines.h
View File

@ -143,8 +143,6 @@ enum log_messages {
LOG_COMPASS2_MSG,
LOG_ARM_DISARM_MSG,
LOG_AIRSPEED_MSG,
LOG_EKF1_MSG,
LOG_EKF2_MSG,
LOG_AHRS2_MSG, // unused
MAX_NUM_LOGS // always at the end
};