mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

DLF import: cleanup start mode decoding

Browse source 
As i thought, only 3 bits there where dive mode. Only look at those.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2015-01-24 00:29:33 +01:00 • committed by Dirk Hohndel
parent 724a07b7e0
commit bc3b56a969
1 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

28
parse-xml.c
View file

@ -2569,21 +2569,33 @@ int parse_dlf_buffer(unsigned char *buffer, size_t size)
cur_dc->duration.seconds = ((ptr[14] & 0xFE) << 16) + (ptr[13] << 8) + ptr[12]; cur_dc->duration.seconds = ((ptr[14] & 0xFE) << 16) + (ptr[13] << 8) + ptr[12];
// ptr[15] is dive type // ptr[14] >> 1 is scrubber used in %
if (0xc8 <= ptr[15] && ptr[15] <= 0xcf)
// 3 bit dive type
switch((ptr[15] & 0x30) >> 3) {
case 0: // unknown
case 1:
cur_dc->divemode = OC; cur_dc->divemode = OC;
else if (0xd0 <= ptr[15] && ptr[15] <= 0xd7) break;
case 2:
cur_dc->divemode = CCR; cur_dc->divemode = CCR;
else if (0xd8 <= ptr[15] && ptr[15] <= 0xdf) break;
case 3:
cur_dc->divemode = CCR; // mCCR cur_dc->divemode = CCR; // mCCR
else if (0xe0 <= ptr[15] && ptr[15] <= 0xe7) break;
case 4:
cur_dc->divemode = FREEDIVE; cur_dc->divemode = FREEDIVE;
else if (0xe8 <= ptr[15] && ptr[15] <= 0xef) break;
case 5:
cur_dc->divemode = OC; // Gauge cur_dc->divemode = OC; // Gauge
else if (0xf0 <= ptr[15] && ptr[15] <= 0xf7) break;
case 6:
cur_dc->divemode = PSCR; // ASCR cur_dc->divemode = PSCR; // ASCR
else if (0xf8 <= ptr[15] && ptr[15] <= 0xff) break;
case 7:
cur_dc->divemode = PSCR; cur_dc->divemode = PSCR;
break;
}
cur_dc->maxdepth.mm = ((ptr[21] << 8) + ptr[20]) * 10; cur_dc->maxdepth.mm = ((ptr[21] << 8) + ptr[20]) * 10;