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

DataFlash: add ? and - to multiplier table 

This allows a consumer to expect referential integrity for the
multipliers
This commit is contained in:
Peter Barker 2018-01-25 10:20:12 +11:00 committed by Randy Mackay
parent aef9fa4a63
commit 8e8b0dcc06
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/DataFlash/DataFlash.cpp
View File

@ -273,19 +273,11 @@ bool DataFlash_Class::validate_structure(const struct LogStructure *logstructure
}
}
// ensure the FMTU messages reference valid units
// ensure the FMTU messages reference valid multipliers
for (uint8_t j=0; j<strlen(logstructure->multipliers); j++) {
char logmultiplier = logstructure->multipliers[j];
uint8_t k;
for (k=0; k<_num_multipliers; k++) {
if (logmultiplier == '-') {
// no sensible multiplier
break;
}
if (logmultiplier == '?') {
// currently unknown multiplier....
break;
}
if (logmultiplier == _multipliers[k].ID) {
// found this one
break;

2
libraries/DataFlash/LogStructure.h
View File

@ -112,6 +112,8 @@ const struct UnitStructure log_Units[] = {
const struct MultiplierStructure log_Multipliers[] = {
// <leave a gap here, just in case....>
{ '-', 0 }, // no multiplier e.g. a string
{ '?', 1 }, // multipliers which haven't been worked out yet....
{ '2', 1e2 },
{ '1', 1e1 },
{ '0', 1e0 },