Clear O2/H2 field if there is no tank information

[ext/subsurface.git] / dive.h

diff --git a/dive.h b/dive.h
index 5eec6f170da66bbbcbdcd6dbe140d26309976af7..cf11e1f89384bb34176e9eb5c14879cb89f73be1 100644 (file)
--- a/dive.h
+++ b/dive.h
@@ -86,13 +86,19 @@ 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 ml_to_cuft(int ml)
 {
-       return ml / 28317.0;
+       return ml / 28316.8466;
+}
+
+static inline double cuft_to_l(double cuft)
+{
+       return cuft * 28.3168466;
 }
 
 static inline double mm_to_feet(int mm)
@@ -136,16 +142,31 @@ 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;
 }
 
+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;
 }
 
+static inline int mbar_to_PSI(int mbar)
+{
+       pressure_t p = {mbar};
+       return to_PSI(p);
+}
+
 struct sample {
        duration_t time;
        depth_t depth;
@@ -238,6 +259,8 @@ extern void flush_dive_info_changes(struct dive *);
 extern void show_dive_equipment(struct dive *);
 extern void flush_dive_equipment_changes(struct dive *);
 
+extern void show_dive_stats(struct dive *);
+
 extern void update_dive(struct dive *new_dive);
 extern void save_dives(const char *filename);
 
@@ -264,7 +287,7 @@ extern void add_event(struct dive *dive, int time, int type, int flags, int valu
 
 /* UI related protopypes */
 
-extern void init_ui(int argc, char **argv);
+extern void init_ui(int *argcp, char ***argvp);
 
 extern void run_ui(void);