X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=uemis.c;h=769752915edb1f93e645645a8097af56d79b71c8;hb=254b851e44a31e2028a2fdddfb4f6989a8e59374;hp=980c1827c86847cd6d5ba85253b515a33fef63cf;hpb=529412aa379ead5beaa9e66c19fbc127d24b9ed4;p=ext%2Fsubsurface.git

diff --git a/uemis.c b/uemis.c
index 980c182..7697529 100644
--- a/uemis.c
+++ b/uemis.c
@@ -180,15 +180,37 @@ bail:
 /*
  * parse uemis base64 data blob into struct dive
  */
-static void parse_divelog_binary(char *base64, struct dive **divep) {
+void uemis_parse_divelog_binary(char *base64, void *datap) {
 	int datalen;
 	int i;
 	uint8_t *data;
 	struct sample *sample;
+	struct dive **divep = datap;
 	struct dive *dive = *divep;
+	int template, gasoffset;
 
 	datalen = uemis_convert_base64(base64, &data);
 
+	/* dive template in use:
+	   0 = air
+	   1 = nitrox (B)
+	   2 = nitrox (B+D)
+	   3 = nitrox (B+T+D)
+	   uemis cylinder data is insane - it stores seven tank settings in a block
+	   and the template tells us which of the four groups of tanks we need to look at
+	 */
+	gasoffset = template = *(uint8_t *)(data+115);
+	if (template == 3)
+		gasoffset = 4;
+	for (i = 0; i < template; i++) {
+		float volume = *(float *)(data+116+25*(gasoffset + i)) * 1000.0;
+		/* uemis always assumes a working pressure of 3000psi / 206bar - even though that's wrong */
+		/* I also think that the unit that it stores (cuft for me) might change with SDA settings */
+		// dive->cylinder[i].type.size.mliter = volume * 206.84 / 28.317;
+		dive->cylinder[i].type.size.mliter = volume * 200 / 28.317;
+		dive->cylinder[i].gasmix.o2.permille = *(uint8_t *)(data+120+25*(gasoffset + i)) * 10 + 0.5;
+		dive->cylinder[i].gasmix.he.permille = 0;
+	}
 	/* first byte of divelog data is at offset 0x123 */
 	i = 0x123;
 	while ((i < datalen) && (*(uint16_t *)(data+i))) {
@@ -199,12 +221,13 @@ static void parse_divelog_binary(char *base64, struct dive **divep) {
 		if (*(uint16_t *)(data+i) > dive->duration.seconds + 180)
 			break;
 		sample = prepare_sample(divep);
+		dive = *divep; /* prepare_sample might realloc the dive */
 		sample->time.seconds = *(uint16_t *)(data+i);
 		sample->depth.mm = pressure_to_depth(*(uint16_t *)(data+i+2));
 		sample->temperature.mkelvin = (*(uint16_t *)(data+i+4) * 100) + 273150;
 		sample->cylinderpressure.mbar= *(uint16_t *)(data+i+23) * 10;
 		sample->cylinderindex = *(uint8_t *)(data+i+22);
-		finish_sample(*divep, sample);
+		finish_sample(dive, sample);
 		i += 0x25;
 	}
 	dive->duration.seconds = sample->time.seconds - 1;
@@ -249,7 +272,7 @@ parse_uemis_file(char *divelogfilename) {
 		/* some error handling */
 		goto bail;
 	}
-	parse_divelog_binary(found,&dive);
+	uemis_parse_divelog_binary(found,&dive);
 	record_dive(dive);
 bail:
 	if (found)