X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=783d640a08c4d8e298ecb5e3f349f58837acf859;hb=56980579514f2900e43441b483e435b3e3235266;hp=97654dc5279fbf1ee9d044c9dddba9dae845b789;hpb=18b8247cb357a9a716846854e451e306b752e542;p=ext%2Fsubsurface.git

diff --git a/dive.h b/dive.h
index 97654dc..783d640 100644
--- a/dive.h
+++ b/dive.h
@@ -86,9 +86,26 @@ typedef struct {
 	pressure_t start, end;
 } cylinder_t;
 
+extern int get_pressure_units(unsigned int mb, const char **units);
 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)
+{
+	return cuft * 28.3168466;
+}
+
 static inline double mm_to_feet(int mm)
 {
 	return mm * 0.00328084;
@@ -130,6 +147,10 @@ static inline int to_K(temperature_t temp)
 	return (temp.mkelvin + 499)/1000;
 }
 
+static inline double psi_to_bar(double psi)
+{
+	return psi / 14.5037738;
+}
 static inline int to_PSI(pressure_t pressure)
 {
 	return pressure.mbar * 0.0145037738 + 0.5;
@@ -140,6 +161,12 @@ static inline double to_ATM(pressure_t pressure)
 	return pressure.mbar / 1013.25;
 }
 
+static inline int mbar_to_PSI(int mbar)
+{
+	pressure_t p = {mbar};
+	return to_PSI(p);
+}
+
 struct sample {
 	duration_t time;
 	depth_t depth;
@@ -177,7 +204,7 @@ struct dive {
 	depth_t visibility;
 	temperature_t airtemp, watertemp;
 	cylinder_t cylinder[MAX_CYLINDERS];
-	int otu;
+	int sac, otu;
 	struct event *events;
 	int samples, alloc_samples;
 	struct sample sample[];