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

Allow easier disabling of the tank switch and surface samples.

Browse Source
This commit is contained in:
Jef Driesen 2012-04-23 20:49:48 +02:00
parent 2897d1079a
commit 414a8053d5
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/oceanic_atom2_parser.c
View File

@ -392,10 +392,13 @@ oceanic_atom2_parser_samples_foreach (parser_t *abstract, sample_callback_t call
complete = 0;
}
// Get the sample type.
unsigned int sampletype = data[offset + 0];
// The sample size is usually fixed, but some sample types have a
// larger size. Check whether we have that many bytes available.
unsigned int length = samplesize;
if (data[offset + 0] == 0xBB) {
if (sampletype == 0xBB) {
length = PAGESIZE;
if (offset + length > size - PAGESIZE)
return PARSER_STATUS_ERROR;
@ -408,7 +411,7 @@ oceanic_atom2_parser_samples_foreach (parser_t *abstract, sample_callback_t call
if (callback) callback (SAMPLE_TYPE_VENDOR, sample, userdata);
// Check for a tank switch sample.
if (data[offset + 0] == 0xAA) {
if (sampletype == 0xAA) {
if (parser->model == DATAMASK || parser->model == COMPUMASK) {
// Tank pressure (1 psi) and number
tank = 0;
@ -421,7 +424,7 @@ oceanic_atom2_parser_samples_foreach (parser_t *abstract, sample_callback_t call
else
pressure = (((data[offset + 4] << 8) + data[offset + 5]) & 0x0FFF) * 2;
}
} else if (data[offset + 0] == 0xBB) {
} else if (sampletype == 0xBB) {
// The surface time is not always a nice multiple of the samplerate.
// The number of inserted surface samples is therefore rounded down
// to keep the timestamps aligned at multiples of the samplerate.