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, 2 insertions, 1 deletions

diff --git a/uemis.c b/uemis.c
index 06ef5b423..557c419f3 100644
--- a/uemis.c
+++ b/uemis.c
@@ -229,7 +229,8 @@ void uemis_parse_divelog_binary(char *base64, void *datap) {
 		sample->depth.mm = pressure_to_depth(u_sample->water_pressure);
 		sample->temperature.mkelvin = (u_sample->dive_temperature * 100) + 273150;
 		sample->cylinderindex = u_sample->active_tank;
-		sample->cylinderpressure.mbar= u_sample->tank_pressure * 10;
+		sample->cylinderpressure.mbar =
+			(u_sample->tank_pressure_high * 256 + u_sample->tank_pressure_low) * 10;
 		uemis_event(dive, sample, u_sample);
 		finish_sample(dive);
 		i += 0x25;