mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add a few more conversion helper functions to dive.h

Browse source 
Convert feet to mm, psi to mbar, and F to mkelvin.  We do this elsewhere
too, but I'm going to need it for the Cochran CSV files, so let's do the
helpers now.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2012-06-19 20:06:59 -07:00
parent e5692a77c3
commit 80b0c09733
1 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
dive.h
View file

@ -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;