Fix profile and average depth for freedives

[ext/subsurface.git] / uemis.c

diff --git a/uemis.c b/uemis.c
index dc11a6deced6882077f2aec614b87f124c52bb9e..06ef5b4231c6f85e6474d182b04a5cf7911d8f2b 100644 (file)
--- a/uemis.c
+++ b/uemis.c
@@ -14,7 +14,6 @@
 #include <stdlib.h>
 #define __USE_XOPEN
 #include <time.h>
-#include <regex.h>
 
 #include "dive.h"
 #include "uemis.h"
@@ -87,9 +86,9 @@ static int pressure_to_depth(uint16_t value)
 {
        double atm, cm;
 
-       atm = (value / 100.0) / 1.01325;
+       atm = bar_to_atm(value / 100.0);
        cm = 100 * atm + 0.5;
-       return( (cm > 0) ? 10 * (long)cm : 0);
+       return (cm > 0) ? 10 * (long)cm : 0;
 }
 
 /*
@@ -151,7 +150,7 @@ void uemis_event(struct dive *dive, struct sample *sample, uemis_sample_t *u_sam
        if (flags[4] & 0x08)
                add_event(dive, sample->time.seconds, 0, 0, 0, "RGT Alert");
        if (flags[4] & 0x40)
-               add_event(dive, sample->time.seconds, 0, 0, 0, "Tank Change Suggest");
+               add_event(dive, sample->time.seconds, 0, 0, 0, "Tank Change Suggested");
        if (flags[4] & 0x80)
                add_event(dive, sample->time.seconds, 0, 0, 0, "Depth Limit Exceeded");
        if (flags[5] & 0x01)
@@ -198,6 +197,8 @@ void uemis_parse_divelog_binary(char *base64, void *datap) {
        gasoffset = template = *(uint8_t *)(data+115);
        if (template == 3)
                gasoffset = 4;
+       if (template == 0)
+               template = 1;
        for (i = 0; i < template; i++) {
                float volume = *(float *)(data+116+25*(gasoffset + i)) * 1000.0;
                /* uemis always assumes a working pressure of 202.6bar (!?!?) - I first thought
@@ -230,7 +231,7 @@ void uemis_parse_divelog_binary(char *base64, void *datap) {
                sample->cylinderindex = u_sample->active_tank;
                sample->cylinderpressure.mbar= u_sample->tank_pressure * 10;
                uemis_event(dive, sample, u_sample);
-               finish_sample(dive, sample);
+               finish_sample(dive);
                i += 0x25;
                u_sample++;
        }