diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2014-11-17 12:25:00 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-11-17 11:45:06 +0000 |
| commit | 0d7c192e6edc1fba710632fd0844126e7c488599 (patch) | |
| tree | 575f5746c06ebb8723c65d46aa6008d971d96881 /parse-xml.c | |
| parent | 5ed4876ad29c2952d84814b586572f5515afba94 (diff) | |
| download | subsurface-0d7c192e6edc1fba710632fd0844126e7c488599.tar.gz | |
For CCR dives, the diluent cylinder is the current cylinder
Change the meaning that _the_ cylinder (as we treat it in OC dives) is the
diluent cylinder (rather than the O2 cylinder). This eliminates special
cases. Now, for CCR, we have to handle the O2 cylinder in addition
(rather than the diluent in addition).
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'parse-xml.c')
| -rw-r--r-- | parse-xml.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/parse-xml.c b/parse-xml.c index c8feac1c8..24911b0b6 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -891,7 +891,9 @@ static void try_to_fill_sample(struct sample *sample, const char *name, char *bu return; if (MATCH("cylpress.sample", pressure, &sample->cylinderpressure)) return; - if (MATCH("pdiluent.sample", pressure, &sample->diluentpressure)) + if (MATCH("pdiluent.sample", pressure, &sample->cylinderpressure)) + return; + if (MATCH("o2pressure.sample", pressure, &sample->o2cylinderpressure)) return; if (MATCH("cylinderindex.sample", get_cylinderindex, &sample->sensor)) return; |