X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=bbc5c67ae36413fead1c033f136e7685aa001d6c;hb=e9d28901341d4cefb4c80a98239daaf81fb3d941;hp=6c5dbcc23496cf0730bb3fc1b701b9f8f66e4a48;hpb=de721d98106569ccf74d4bcc35619e281df00e5e;p=ext%2Fsubsurface.git diff --git a/dive.h b/dive.h index 6c5dbcc..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)