mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 13:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove gasmix_is_null

Browse source 
The semantic of fo2==fhe==0 to mean "same gasmix as before" apparently
is not used anywhere and gets in the way of the semantic "this is air".

If there is really need for mix meaning "same as before", please use another
value, e.g. one with a specific negative percentage.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Robert C. Helling 2014-07-05 13:37:49 +02:00 committed by Dirk Hohndel
parent aafd918169
commit 79cd5ce835
2 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dive.h
View file

@ -124,14 +124,6 @@ static inline bool gasmix_is_air(const struct gasmix *gasmix)
return (he == 0) && (o2 == 0 || ((o2 >= O2_IN_AIR - 1) && (o2 <= O2_IN_AIR + 1))); return (he == 0) && (o2 == 0 || ((o2 >= O2_IN_AIR - 1) && (o2 <= O2_IN_AIR + 1)));
} }
/* in the planner we use a null gasmix to indicate that we keep using the gas as before
* this is BAD as a null gasmix can also be interpreted as air.
* DANGER DANGER DANGER */
static inline bool gasmix_is_null(const struct gasmix *gasmix)
{
return gasmix->he.permille == 0 && gasmix->o2.permille == 0;
}
/* Linear interpolation between 'a' and 'b', when we are 'part'way into the 'whole' distance from a to b */ /* Linear interpolation between 'a' and 'b', when we are 'part'way into the 'whole' distance from a to b */
static inline int interpolate(int a, int b, int part, int whole) static inline int interpolate(int a, int b, int part, int whole)
{ {

7
planner.c
View file

@ -292,8 +292,6 @@ static void create_dive_from_plan(struct diveplan *diveplan, bool track_gas)
dp = dp->next; dp = dp->next;
continue; continue;
} }
if (gasmix_is_null(&gasmix))
gasmix = oldgasmix;
/* Check for SetPoint change */ /* Check for SetPoint change */
if (oldpo2 != po2) { if (oldpo2 != po2) {
@ -566,11 +564,8 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool
nextdp = dp->next; nextdp = dp->next;
while (nextdp && nextdp->time == 0) while (nextdp && nextdp->time == 0)
nextdp = nextdp->next; nextdp = nextdp->next;
if (nextdp) { if (nextdp)
newgasmix = nextdp->gasmix; newgasmix = nextdp->gasmix;
if (gasmix_is_null(&newgasmix))
newgasmix = gasmix;
}
/* do we want to skip this leg as it is devoid of anything useful? */ /* do we want to skip this leg as it is devoid of anything useful? */
if (!dp->entered && if (!dp->entered &&
gasmix_distance(&gasmix, &newgasmix) == 0 && gasmix_distance(&gasmix, &newgasmix) == 0 &&