Merge branch 'uemis-integration' of git://github.com/dirkhh/subsurface

* 'uemis-integration' of git://github.com/dirkhh/subsurface:
  Much nicer implementation of uemis sample parsing - and add events, too
  Add working pressure to uemis tank data

1 files changed, 27 insertions, 3 deletions

diff --git a/uemis.h b/uemis.h
index e4e8532c2..29a168f5d 100644
--- a/uemis.h
+++ b/uemis.h
@@ -1,10 +1,34 @@
-#ifndef UEMIS_H
-#define UEMIS_H
-
 /*
  * defines and prototypes for the uemis Zurich SDA file parser
  */
 
+#ifndef UEMIS_H
+#define UEMIS_H
+
+#include <stdint.h>
+
 void uemis_parse_divelog_binary(char *base64, void *divep);
 
+typedef struct {
+	uint16_t	dive_time;
+	uint16_t	water_pressure;		// (in cbar)
+	uint16_t	dive_temperature;	// (in dC)
+	uint8_t		ascent_speed;		// (units unclear)
+	uint8_t		work_fact;
+	uint8_t		cold_fact;
+	uint8_t		bubble_fact;
+	uint16_t	ascent_time;
+	uint16_t	ascent_time_opt;
+	uint16_t	p_amb_tol;
+	uint16_t	satt;
+	uint16_t	hold_depth;
+	uint16_t	hold_time;
+	uint8_t		active_tank;
+	uint16_t	tank_pressure;		// (in cbar)
+	uint16_t	consumption;		// (units unclear)
+	uint8_t		rgt;			// (remaining gas time in minutes)
+	uint8_t		cns;
+	uint8_t		flags[8]; 
+} __attribute((packed)) uemis_sample_t;
+
 #endif /* DIVE_H */