From 926fcef2a1e83b58c37c948a3f1a904aa0be0d0e Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sat, 9 Feb 2013 11:15:18 +1100 Subject: Do more dive fixup for each dive computer In commit b6c9301e5847 ("Move more dive computer filled data to the divecomputer structure") we moved the fields that get filled in by the dive computers to be per-divecomputer data structures. This patch re-creates some of those fields back in the "struct dive", but now the fields are initialized to be a reasonable average from the dive computer data. We already did some of this for the temperature min/max fields for the statistics, so this just continues that trend. The goal is to make it easy to look at "dive values" without having to iterate over dive computers every time you do. Just do it once in "fixup_dive()" instead. Signed-off-by: Linus Torvalds Signed-off-by: Dirk Hohndel --- uemis.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'uemis.c') diff --git a/uemis.c b/uemis.c index 026c836df..aad76c10f 100644 --- a/uemis.c +++ b/uemis.c @@ -300,9 +300,9 @@ void uemis_parse_divelog_binary(char *base64, void *datap) { dive->dc.airtemp.mkelvin = *(uint16_t *)(data + 45) * 100 + ZERO_C_IN_MKELVIN; dive->dc.surface_pressure.mbar = *(uint16_t *)(data + 43); if (*(uint8_t *)(data + 19)) - dive->dc.salinity = 10300; /* avg grams per 10l sea water */ + dive->dc.salinity = SEAWATER_SALINITY; /* avg grams per 10l sea water */ else - dive->dc.salinity = 10000; /* grams per 10l fresh water */ + dive->dc.salinity = FRESHWATER_SALINITY; /* grams per 10l fresh water */ /* this will allow us to find the last dive read so far from this computer */ dc->model = strdup("Uemis Zurich"); -- cgit v1.2.3-70-g09d2