Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Logger: make structure check errors clearer

Browse Source 
add message name to more error messages
This commit is contained in:
Andrew Tridgell 2020-11-06 10:27:02 +11:00
parent bd7ed003c2
commit daa0abeb13
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/AP_Logger/AP_Logger.cpp
View File

@ -361,7 +361,7 @@ bool AP_Logger::validate_structure(const struct LogStructure *logstructure, cons
#define CHECK_ENTRY(fieldname,fieldname_s,fieldlen) \
do { \
if (strnlen(logstructure->fieldname, fieldlen) > fieldlen-1) { \
Debug(" Message " fieldname_s " not NULL-terminated or too long"); \
Debug(" Message %s." fieldname_s " not NULL-terminated or too long", logstructure->name); \
passed = false; \
} \
} while (false)
@ -383,8 +383,8 @@ bool AP_Logger::validate_structure(const struct LogStructure *logstructure, cons
uint8_t fieldcount = strlen(logstructure->format);
uint8_t labelcount = count_commas(logstructure->labels)+1;
if (fieldcount != labelcount) {
Debug(" fieldcount=%u does not match labelcount=%u",
fieldcount, labelcount);
Debug(" %s fieldcount=%u does not match labelcount=%u",
logstructure->name, fieldcount, labelcount);
passed = false;
}
@ -401,15 +401,15 @@ bool AP_Logger::validate_structure(const struct LogStructure *logstructure, cons
// ensure we have units for each field:
if (strlen(logstructure->units) != fieldcount) {
Debug(" fieldcount=%u does not match unitcount=%u",
(unsigned)fieldcount, (unsigned)strlen(logstructure->units));
Debug(" %s fieldcount=%u does not match unitcount=%u",
logstructure->name, (unsigned)fieldcount, (unsigned)strlen(logstructure->units));
passed = false;
}
// ensure we have multipliers for each field
if (strlen(logstructure->multipliers) != fieldcount) {
Debug(" fieldcount=%u does not match multipliercount=%u",
(unsigned)fieldcount, (unsigned)strlen(logstructure->multipliers));
Debug(" %s fieldcount=%u does not match multipliercount=%u",
logstructure->name, (unsigned)fieldcount, (unsigned)strlen(logstructure->multipliers));
passed = false;
}