X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=divelist.c;h=eb8f231432a99f33f40a8ca0341aee8a66b14148;hb=0d7ad02f87ad02d3b9836c07230f2ddb3f1d3e14;hp=2d04eb5b09e4469f13ad5029b6838294497a6d2a;hpb=485b02937d8ca1f9a9043c89e74a3d2f15d6426b;p=ext%2Fsubsurface.git diff --git a/divelist.c b/divelist.c index 2d04eb5..eb8f231 100644 --- a/divelist.c +++ b/divelist.c @@ -299,6 +299,7 @@ static double calculate_airuse(struct dive *dive) int i; for (i = 0; i < MAX_CYLINDERS; i++) { + pressure_t start, end; cylinder_t *cyl = dive->cylinder + i; int size = cyl->type.size.mliter; double kilo_atm; @@ -306,7 +307,9 @@ static double calculate_airuse(struct dive *dive) if (!size) continue; - kilo_atm = (to_ATM(cyl->start) - to_ATM(cyl->end)) / 1000.0; + start = cyl->start.mbar ? cyl->start : cyl->sample_start; + end = cyl->end.mbar ? cyl->end : cyl->sample_end; + kilo_atm = (to_ATM(start) - to_ATM(end)) / 1000.0; /* Liters of air at 1 atm == milliliters at 1k atm*/ airuse += kilo_atm * size;