X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=cf11e1f89384bb34176e9eb5c14879cb89f73be1;hb=d906c82f31c5406b6debe0df88cb49b916cd6ced;hp=783d640a08c4d8e298ecb5e3f349f58837acf859;hpb=56980579514f2900e43441b483e435b3e3235266;p=ext%2Fsubsurface.git diff --git a/dive.h b/dive.h index 783d640..cf11e1f 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; @@ -259,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); @@ -285,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);