diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-19 13:32:10 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-19 13:32:10 -0700 |
commit | e9d28901341d4cefb4c80a98239daaf81fb3d941 (patch) | |
tree | 43f4000d940e8f57fffc2bd7b86a52db107de898 /dive.h | |
parent | de721d98106569ccf74d4bcc35619e281df00e5e (diff) | |
download | subsurface-e9d28901341d4cefb4c80a98239daaf81fb3d941.tar.gz |
Start filling in temperature and nitrox data in dive list
Still more to go, but it's slowly fleshing out..
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'dive.h')
-rw-r--r-- | dive.h | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -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) |