FlapJackApps/libdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extract the log version immediately

Browse Source 
To be able to collect the tank begin/end pressure, the log version needs
to be available earlier, because it's needed for parsing the tank
pressure data in the samples. Therefore, extract the log version
immediately after locating the opening record.
This commit is contained in:
Jef Driesen 2019-09-23 21:13:53 +02:00
parent 03ff5d32f2
commit e23c374cd8
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/shearwater_predator_parser.c
View File

@ -288,6 +288,10 @@ shearwater_predator_parser_cache (shearwater_predator_parser_t *parser)
return DC_STATUS_SUCCESS;
}
// Log versions before 6 weren't reliably stored in the data, but
// 6 is also the oldest version that we assume in our code
unsigned int logversion = 0;
// Verify the minimum length.
if (size < 2) {
ERROR (abstract->context, "Invalid data length.");
@ -330,6 +334,9 @@ shearwater_predator_parser_cache (shearwater_predator_parser_t *parser)
parser->opening[i] = 0;
parser->closing[i] = size - footersize;
}
// Log version
logversion = data[127];
}
// Default dive mode.
@ -391,6 +398,11 @@ shearwater_predator_parser_cache (shearwater_predator_parser_t *parser)
} else if (type >= LOG_RECORD_OPENING_0 && type <= LOG_RECORD_OPENING_7) {
// Opening record
parser->opening[type - LOG_RECORD_OPENING_0] = offset;
// Log version
if (type == LOG_RECORD_OPENING_4) {
logversion = data[offset + 16];
}
} else if (type >= LOG_RECORD_CLOSING_0 && type <= LOG_RECORD_CLOSING_7) {
// Closing record
parser->closing[type - LOG_RECORD_CLOSING_0] = offset;
@ -410,10 +422,6 @@ shearwater_predator_parser_cache (shearwater_predator_parser_t *parser)
}
}
// Log versions before 6 weren't reliably stored in the data, but
// 6 is also the oldest version that we assume in our code
unsigned int logversion = data[parser->opening[4] + (pnf ? 16 : 127)];
// Cache sensor calibration for later use
unsigned int nsensors = 0, ndefaults = 0;
unsigned int base = parser->opening[3] + (pnf ? 6 : 86);