X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=d9fa35abf88997f76143ff8b0130cb7ca3acc17f;hb=ed4b739f5f618fa9fb316dcec4c67224bb4f2bb8;hp=ea8fceec1863dc41479d448912998f9a4156a642;hpb=05857e0a05bc15672ddd5e835714d2cd20405b97;p=ext%2Fsubsurface.git

diff --git a/dive.h b/dive.h
index ea8fcee..d9fa35a 100644
--- a/dive.h
+++ b/dive.h
@@ -95,7 +95,21 @@ static inline int to_C(temperature_t temp)
 {
 	if (!temp.mkelvin)
 		return 0;
-	return (temp.mkelvin - 273150) / 1000;
+	return (temp.mkelvin - 273150 + 499) / 1000;
+}
+
+static inline int to_F(temperature_t temp)
+{
+	if (!temp.mkelvin)
+		return 0;
+	return temp.mkelvin * 9 / 5000.0 - 459.670 + 0.5;
+}
+
+static inline int to_K(temperature_t temp)
+{
+	if (!temp.mkelvin)
+		return 0;
+	return (temp.mkelvin + 499)/1000;
 }
 
 static inline int to_PSI(pressure_t pressure)
@@ -161,7 +175,12 @@ static inline struct dive *get_dive(unsigned int nr)
 extern void parse_xml_init(void);
 extern void parse_xml_file(const char *filename, GError **error);
 
-extern void flush_dive_info_changes(void);
+extern void show_dive_info(struct dive *);
+extern void flush_dive_info_changes(struct dive *);
+
+extern void show_dive_equipment(struct dive *);
+extern void flush_dive_equipment_changes(struct dive *);
+
 extern void save_dives(const char *filename);
 
 static inline unsigned int dive_size(int samples)