Add working pressure to uemis tank data

[ext/subsurface.git] / uemis.c

diff --git a/uemis.c b/uemis.c
index 8dfc5a373f384d28c581d0464f1b36b7e05821c0..76bd1669b4217a8f05306874a9a0c1b6dcfae71e 100644 (file)
--- a/uemis.c
+++ b/uemis.c
@@ -203,10 +203,15 @@ static void parse_divelog_binary(char *base64, struct dive **divep) {
                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;
+               /* uemis always assumes a working pressure of 202.6bar (!?!?) - I first thought
+                * it was 3000psi, but testing against all my dives gets me that strange number.
+                * Still, that's of course completely bogus and shows they don't get how
+                * cylinders are named in non-metric parts of the world...
+                * we store the incorrect working pressure to get the SAC calculations "close"
+                * but the user will have to correct this manually
+                */
+               dive->cylinder[i].type.size.mliter = volume;
+               dive->cylinder[i].type.workingpressure.mbar = 202600;
                dive->cylinder[i].gasmix.o2.permille = *(uint8_t *)(data+120+25*(gasoffset + i)) * 10 + 0.5;
                dive->cylinder[i].gasmix.he.permille = 0;
        }
@@ -220,12 +225,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;