diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-02 11:13:35 -0500 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-04-04 22:37:18 -0700 |
| commit | 900527498690c80b5303a608002431966bacae93 (patch) | |
| tree | 8e44c58149d0420728b038611741201e76d01361 /core/dive.c | |
| parent | eb5907ab3b8805d4c9990cba45ac4b46f6e5cdb8 (diff) | |
| download | subsurface-900527498690c80b5303a608002431966bacae93.tar.gz | |
Make "is_gasmix_redundant()" more robust
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>
Diffstat (limited to 'core/dive.c')
| -rw-r--r-- | core/dive.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/dive.c b/core/dive.c index 64cf48a58..6d4f8603c 100644 --- a/core/dive.c +++ b/core/dive.c @@ -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) |