Merge branch 'uemis-native'

This brings in the code to download dive information directly from a Uemis
Zurich dive computer.

The implementation contains a major hack that hooks the uemis code into
the same data structures used to setup libdivecomputer. This gives the
best result for the user, but is not something that I like as a long term
solution as it relies on internal libdivecomputer data structures.

1 files changed, 8 insertions, 2 deletions

diff --git a/uemis.h b/uemis.h
index ba9a23402..baa6783a4 100644
--- a/uemis.h
+++ b/uemis.h
@@ -24,8 +24,14 @@ typedef struct {
 	uint16_t	hold_depth;
 	uint16_t	hold_time;
 	uint8_t		active_tank;
-	uint16_t	tank_pressure;		// (in cbar)
-	uint16_t	consumption;		// (units unclear)
+	// bloody glib, when compiled for Windows, forces the whole program to use
+	// the Windows packing rules. So to avoid problems on Windows (and since
+	// only tank_pressure is currently used and that exactly once) I give in and
+	// make this silly low byte / high byte 8bit entries
+	uint8_t		tank_pressure_low;	// (in cbar)
+	uint8_t		tank_pressure_high;
+	uint8_t		consumption_low;	// (units unclear)
+	uint8_t		consumption_high;
 	uint8_t		rgt;			// (remaining gas time in minutes)
 	uint8_t		cns;
 	uint8_t		flags[8];