summaryrefslogtreecommitdiffstats
path: root/dive.h
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2011-11-01 21:12:21 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2011-11-01 21:34:06 -0700
commit485b02937d8ca1f9a9043c89e74a3d2f15d6426b (patch)
treeb589a44458c22dcbdeada5996eaf634cc064723e /dive.h
parent56980579514f2900e43441b483e435b3e3235266 (diff)
downloadsubsurface-485b02937d8ca1f9a9043c89e74a3d2f15d6426b.tar.gz
Even more places with pressure and volume conversions
Amazing at how many spots we are re-implementing the wheel. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'dive.h')
-rw-r--r--dive.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/dive.h b/dive.h
index 783d640a0..b5a42d3e2 100644
--- a/dive.h
+++ b/dive.h
@@ -91,17 +91,12 @@ extern double get_depth_units(unsigned int mm, int *frac, const char **units);
extern double get_volume_units(unsigned int mm, int *frac, const char **units);
extern double get_temp_units(unsigned int mm, const char **units);
-static inline double bar_to_atm(double bar)
-{
- return bar / 1.01325;
-}
-
static inline double ml_to_cuft(int ml)
{
return ml / 28316.8466;
}
-static inline double cuft_to_ml(double cuft)
+static inline double cuft_to_l(double cuft)
{
return cuft * 28.3168466;
}
@@ -156,6 +151,11 @@ static inline int to_PSI(pressure_t pressure)
return pressure.mbar * 0.0145037738 + 0.5;
}
+static inline double bar_to_atm(double bar)
+{
+ return bar / 1.01325;
+}
+
static inline double to_ATM(pressure_t pressure)
{
return pressure.mbar / 1013.25;