X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=a25fafb39e95cc4b0eee571f94b195165b2200f4;hb=4912951e97b4040941944e1df70a91366a6a5559;hp=4d60a77a2c173e64f22f10374cb6f48d2121ab17;hpb=725e4582d9c7174b70fe197bb27345960457549e;p=ext%2Fsubsurface.git diff --git a/dive.h b/dive.h index 4d60a77..a25fafb 100644 --- a/dive.h +++ b/dive.h @@ -125,21 +125,31 @@ static inline double mm_to_feet(int mm) return mm * 0.00328084; } +static inline unsigned long feet_to_mm(double feet) +{ + return feet * 304.8 + 0.5; +} + static inline int to_feet(depth_t depth) { return mm_to_feet(depth.mm) + 0.5; } -static double mkelvin_to_C(int mkelvin) +static inline double mkelvin_to_C(int mkelvin) { return (mkelvin - 273150) / 1000.0; } -static double mkelvin_to_F(int mkelvin) +static inline double mkelvin_to_F(int mkelvin) { return mkelvin * 9 / 5000.0 - 459.670; } +static inline unsigned long F_to_mkelvin(double f) +{ + return (f-32) * 1000 / 1.8 + 273150.5; +} + static inline int to_C(temperature_t temp) { if (!temp.mkelvin) @@ -165,6 +175,12 @@ static inline double psi_to_bar(double psi) { return psi / 14.5037738; } + +static inline unsigned long psi_to_mbar(double psi) +{ + return psi_to_bar(psi)*1000 + 0.5; +} + static inline int to_PSI(pressure_t pressure) { return pressure.mbar * 0.0145037738 + 0.5; @@ -327,6 +343,7 @@ extern void add_location(const char *string); extern void remember_event(const char *eventname); extern void evn_foreach(void (*callback)(const char *, int *, void *), void *data); +extern int add_new_dive(struct dive *dive); extern int edit_dive_info(struct dive *dive); extern void dive_list_update_dives(void); extern void flush_divelist(struct dive *dive);