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

Encapsulate the horrid gas encoding in gas change events

Browse source 
We should never pass permille values around as integers. And we shouldn't
have to decode the stupid value in more than one place.

This doesn't tackle all the places where we access O2 and He "too early"
and should instead keep passing around a gaxmix. But it's a first step.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-06-01 12:07:29 -07:00
parent fb4d9b34f8
commit 1a04013453
6 changed files with 38 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
profile.c
View file

@ -578,13 +578,15 @@ int get_cylinder_index(struct dive *dive, struct event *ev)
int i;
int best = 0, score = INT_MAX;
int target_o2, target_he;
struct gasmix *g;
/*
* Crazy gas change events give us odd encoded o2/he in percent.
* Decode into our internal permille format.
*/
target_o2 = (ev->value & 0xFFFF) * 10;
target_he = (ev->value >> 16) * 10;
g = get_gasmix_from_event(ev);
target_o2 = get_o2(g);
target_he = get_he(g);
/*
* Try to find a cylinder that best matches the target gas