Add support for obtaining salinity from libdivecomputer

This requires a patched libdivecomputer that can return salinity of the water the dive was conducted in. Experimental patches exist that implement this for the OSTC. The code is designed so that it simply defaults to salt water if libdivecomputer doesn't include the feature. The patch also fixes the dive merge code to merge two other recent additions to the dive structure (surface_pressure and visibility). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-10 19:18:10 +01:00
parent 836bbad7a6
commit f53788e5e4
3 changed files with 16 additions and 0 deletions
--- a/dive.h
+++ b/dive.h
@@ -267,6 +267,7 @@ struct dive {
 	int rating;
 	double latitude, longitude;
 	depth_t maxdepth, meandepth;
+	int salinity; // kg per 10000 l
 	duration_t duration, surfacetime;
 	int visibility; /* 0 - 5 star rating */
 	temperature_t airtemp, watertemp;