X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=bbc5c67ae36413fead1c033f136e7685aa001d6c;hb=e9d28901341d4cefb4c80a98239daaf81fb3d941;hp=abfd95174f60c63ccbfd415e5bca2e98c5e57b2f;hpb=5804c2970eaaf0215b9862f767cf7aa745083744;p=ext%2Fsubsurface.git diff --git a/dive.h b/dive.h index abfd951..bbc5c67 100644 --- a/dive.h +++ b/dive.h @@ -91,18 +91,28 @@ static inline int to_feet(depth_t depth) return depth.mm * 0.00328084 + 0.5; } +static double mkelvin_to_C(int mkelvin) +{ + return (mkelvin - 273150) / 1000.0; +} + +static double mkelvin_to_F(int mkelvin) +{ + return mkelvin * 9 / 5000.0 - 459.670; +} + static inline int to_C(temperature_t temp) { if (!temp.mkelvin) return 0; - return (temp.mkelvin - 273150 + 499) / 1000; + return mkelvin_to_C(temp.mkelvin) + 0.5; } static inline int to_F(temperature_t temp) { if (!temp.mkelvin) return 0; - return temp.mkelvin * 9 / 5000.0 - 459.670 + 0.5; + return mkelvin_to_F(temp.mkelvin) + 0.5; } static inline int to_K(temperature_t temp) @@ -207,6 +217,8 @@ extern void report_dives(void); extern struct dive *fixup_dive(struct dive *dive); extern struct dive *try_to_merge(struct dive *a, struct dive *b); +extern void update_air_info(char *buffer); + #define DIVE_ERROR_PARSE 1 #endif /* DIVE_H */