X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=109d0c57da1a984e59aa03dd0792c3f6ac258276;hb=43960a70a6dafea5e2d05efac290283c726fb028;hp=cc6e85da2c50b627f0ae1d68b6f41eb5a5e14382;hpb=42f627b8b1cf7e929a30c0a07a5fb44a4cec9e1f;p=ext%2Fsubsurface.git

diff --git a/dive.h b/dive.h
index cc6e85d..109d0c5 100644
--- a/dive.h
+++ b/dive.h
@@ -86,23 +86,38 @@ typedef struct {
 	pressure_t start, end;
 } cylinder_t;
 
+static inline double mm_to_feet(int mm)
+{
+	return mm * 0.00328084;
+}
+
 static inline int to_feet(depth_t depth)
 {
-	return depth.mm * 0.00328084 + 0.5;
+	return mm_to_feet(depth.mm) + 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)
@@ -132,6 +147,8 @@ struct dive {
 	time_t when;
 	char *location;
 	char *notes;
+	char *divemaster, *buddy;
+	double latitude, longitude;
 	depth_t maxdepth, meandepth;
 	duration_t duration, surfacetime;
 	depth_t visibility;
@@ -205,6 +222,11 @@ 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
 
+const char *weekday(int wday);
+const char *monthname(int mon);
+
 #endif /* DIVE_H */