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

Make "is_gasmix_redundant()" more robust

Browse source 
The gas switch event handling is somewhat fragile, mostly because the
legacy event encoding for gas switches is odd.  It's also limited to
whole percentages, unlike our internal gas mix model.

In addition, it also ends up comparing the values to the raw permille
values, which is wrong for air, and wouldn't match our O2_IN_AIR which
is 209 permille (closest approximation to 20.946%).

So handle air separately, since "21" really is a valid oxygen value for
air, and should match 20.9%.  And use the proper accessor functions to
get the gasmix values.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Linus Torvalds 2016-04-02 11:13:35 -05:00 • committed by Dirk Hohndel
parent eb5907ab3b
commit 9005274986
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/dive.c
View file

@ -49,13 +49,17 @@ int event_is_gaschange(struct event *ev)
*/
int event_gasmix_redundant(struct event *ev)
{
struct gasmix *mix = &ev->gas.mix;
int value = ev->value;
int o2, he;
if (value == 21)
return gasmix_is_air(mix);
o2 = (value & 0xffff) * 10;
he = (value >> 16) * 10;
return o2 == ev->gas.mix.o2.permille &&
he == ev->gas.mix.he.permille;
return o2 == get_o2(mix) &&
he == get_he(mix);
}
struct event *add_event(struct divecomputer *dc, unsigned int time, int type, int flags, int value, const char *name)