mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 14:25:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correctly parse the two different gas change events

Browse source 
This now takes the He percentage into account when matching tanks. Given
the encoding of fO2 and fHe in the GASCHANGE2 event, we can simply mask
and shift as if we have a GASCHANGE2 event and things will automatically
work correctly for the regular GASCHANGE event.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2012-12-08 14:16:13 -08:00
parent 9bcd21bf67
commit 02844c3a10
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
profile.c
View file

@ -1627,14 +1627,20 @@ static int get_cylinder_index(struct dive *dive, struct event *ev)
*
* Crazy suunto gas change events. We really should do
* this in libdivecomputer or something.
*
* There are two different gas change events that can get
* us here - GASCHANGE2 has the He value in the high 16
* bits; looking at the possible values we can actually
* handle them with the same code since the high 16 bits
* will be 0 with the GASCHANGE event - and that means no He
*/
for (i = 0; i < MAX_CYLINDERS; i++) {
cylinder_t *cyl = dive->cylinder+i;
int o2 = (cyl->gasmix.o2.permille + 5) / 10;
if (o2 == ev->value)
int he = (cyl->gasmix.he.permille + 5) / 10;
if (o2 == (ev->value & 0xFFFF) && he == (ev->value >> 16))
return i;
}
return 0;
}