Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replay: cope with too many log format msgs

This commit is contained in:
Andrew Tridgell 2014-04-20 21:45:31 +10:00
parent 68f1ae3036
commit 623cbc3316
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tools/Replay/LogReader.cpp
View File

@ -150,7 +150,7 @@ void LogReader::process_plane(uint8_t type, uint8_t *data, uint16_t length)
case LOG_PLANE_ATTITUDE_MSG: { case LOG_PLANE_ATTITUDE_MSG: {
struct log_Plane_Attitude msg; struct log_Plane_Attitude msg;
if(sizeof(msg) != length) { if(sizeof(msg) != length) {
printf("Bad ATTITUDE length\n"); printf("Bad ATTITUDE length %u should be %u\n", (unsigned)length, (unsigned)sizeof(msg));
exit(1); exit(1);
} }
memcpy(&msg, data, sizeof(msg)); memcpy(&msg, data, sizeof(msg));
@ -290,7 +290,9 @@ bool LogReader::update(uint8_t &type)
if (::read(fd, &f.type, sizeof(f)-3) != sizeof(f)-3) { if (::read(fd, &f.type, sizeof(f)-3) != sizeof(f)-3) {
return false; return false;
} }
num_formats++; if (num_formats < LOGREADER_MAX_FORMATS-1) {
num_formats++;
}
type = f.type; type = f.type;
return true; return true;
} }

9
Tools/Replay/LogReader.h
View File

@ -1,9 +1,9 @@
enum log_messages { enum log_messages {
// plane specific messages // plane specific messages
LOG_PLANE_ATTITUDE_MSG = 10, LOG_PLANE_ATTITUDE_MSG = 9,
LOG_PLANE_COMPASS_MSG = 12, LOG_PLANE_COMPASS_MSG = 11,
LOG_PLANE_AIRSPEED_MSG = 18, LOG_PLANE_AIRSPEED_MSG = 17,
// copter specific messages // copter specific messages
LOG_COPTER_ATTITUDE_MSG = 1, LOG_COPTER_ATTITUDE_MSG = 1,
@ -51,8 +51,9 @@ private:
uint32_t ground_alt_cm; uint32_t ground_alt_cm;
#define LOGREADER_MAX_FORMATS 100
uint8_t num_formats; uint8_t num_formats;
struct log_Format formats[100]; struct log_Format formats[LOGREADER_MAX_FORMATS];
Vector3f attitude; Vector3f attitude;
Vector3f sim_attitude; Vector3f sim_attitude;