aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replay: cope with old copter attitude and baro msgs

Browse Source
This commit is contained in:
Andrew Tridgell 2014-10-25 11:20:26 +11:00
parent ddd27f5acb
commit 485397c4cb
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Tools/Replay/LogReader.cpp
View File

@ -224,8 +224,14 @@ void LogReader::process_copter(uint8_t type, uint8_t *data, uint16_t length)
case LOG_COPTER_ATTITUDE_MSG: { case LOG_COPTER_ATTITUDE_MSG: {
struct log_Copter_Attitude msg; struct log_Copter_Attitude msg;
if(sizeof(msg) != length) { if (sizeof(msg) == length+sizeof(uint16_t)*2) {
printf("Bad ATTITUDE length %u should be %u\n", length, sizeof(msg)); // old style, without errors
memset(&msg, 0, sizeof(msg));
memcpy(&msg, data, length);
} else if (sizeof(msg) == length) {
memcpy(&msg, data, sizeof(msg));
} else {
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));
@ -455,11 +461,17 @@ bool LogReader::update(uint8_t &type)
case LOG_BARO_MSG: { case LOG_BARO_MSG: {
struct log_BARO msg; struct log_BARO msg;
if(sizeof(msg) != f.length) { if (sizeof(msg) == f.length+sizeof(float)) {
printf("Bad LOG_BARO length\n"); // old style, without climbrate
memset(&msg, 0, sizeof(msg));
memcpy(&msg, data, f.length);
} else if (sizeof(msg) == f.length) {
memcpy(&msg, data, sizeof(msg));
} else {
printf("Bad LOG_BARO length %u expected %u\n",
(unsigned)f.length, (unsigned)sizeof(msg));
exit(1); exit(1);
} }
memcpy(&msg, data, sizeof(msg));
wait_timestamp(msg.timestamp); wait_timestamp(msg.timestamp);
baro.setHIL(msg.pressure, msg.temperature*0.01f); baro.setHIL(msg.pressure, msg.temperature*0.01f);
break; break;