Add working pressure to uemis tank data

[ext/subsurface.git] / uemis.c

diff --git a/uemis.c b/uemis.c
index 259d30c53758f9d8ad3e8f2868ef47fa30534efa..46878e22a89c0632ad0be203f41ea3bbbcc8bfda 100644 (file)
--- a/uemis.c
+++ b/uemis.c
@@ -73,64 +73,6 @@ static void decode( uint8_t *inbuf, uint8_t *outbuf, int inbuf_len ) {
 }
 /* end code from Bob Trower */
 
-/* small helper functions */
-/* simpleregex allocates (and reallocates) the found buffer
- * don't forget to free it when you are done
- */
-static int simpleregex(char *buffer, char *regex, char **found) {
-       int status;
-       regex_t re;
-       regmatch_t match[5];
-
-       if (regcomp(&re, regex, 0) !=0) {
-               fprintf(stderr,"internal error, regex failed!\n");
-               exit(1);
-       }
-       status = regexec(&re,buffer,5,match,0);
-       if(status == 0) {
-               *found = realloc(*found,match[1].rm_eo-match[1].rm_so + 1);
-               strncpy(*found,buffer+match[1].rm_so,match[1].rm_eo-match[1].rm_so);
-               (*found)[match[1].rm_eo-match[1].rm_so] = '\0';
-       }
-       return(status == 0);
-}
-
-/* read in line of arbitrary length (important for SDA files that can
- * have lines that are tens of kB long
- * don't forget to free it when you are done
- */
-#define MYGETL_INCR 1024
-static char * mygetline(FILE * f) {
-       size_t size = 0;
-       size_t len  = 0;
-       char * buf  = NULL;
-
-       do {
-               size += MYGETL_INCR;
-               if ((buf = realloc(buf,size)) == NULL)
-                       break;
-               fgets(buf+len,MYGETL_INCR,f);
-               len = strlen(buf);
-       } while (!feof(f) && buf[len-1]!='\n');
-       return buf;
-}
-
-/* text matching, used to build very poor man's XML parser */
-int matchit(FILE *infd, char *regex, char *typeregex, char **found) {
-       char *buffer;
-
-       while (!feof(infd)) {
-               buffer = mygetline(infd);
-               if (buffer && simpleregex(buffer,regex,found)) {
-                       buffer = mygetline(infd);
-                       if (buffer && simpleregex(buffer,typeregex,found)) {
-                               return 1;
-                       }
-               }
-       }
-       return 0;
-}
-
 /*
  * pressure_to_depth: In centibar. And when converting to
  * depth, I'm just going to always use saltwater, because I
@@ -180,11 +122,12 @@ bail:
 /*
  * parse uemis base64 data blob into struct dive
  */
-void uemis_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;
 
@@ -203,10 +146,15 @@ void uemis_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;
        }
@@ -232,58 +180,3 @@ void uemis_parse_divelog_binary(char *base64, struct dive **divep) {
        dive->duration.seconds = sample->time.seconds - 1;
        return;
 }
-
-/* parse a single file
- * TODO: we don't report any errors when the parse fails - we simply don't add them to the list
- */
-void
-parse_uemis_file(char *divelogfilename) {
-       char *found=NULL;
-       struct tm tm;
-       struct dive *dive;
-
-       FILE *divelogfile = fopen(divelogfilename,"r");
-
-       dive = alloc_dive();
-
-       if (! matchit(divelogfile,"val key=\"date\"","<ts>\\([^<]*\\)</ts>",&found)) {
-               /* some error handling */
-               goto bail;
-       }
-       strptime(found, "%Y-%m-%dT%H:%M:%S", &tm);
-       dive->when = utc_mktime(&tm);
-       if (! matchit(divelogfile,"<val key=\"duration\">",
-                       "<float>\\([0-9.]*\\)</float>", &found)) {
-               /* some error handling */
-               goto bail;
-       }
-       dive->duration.seconds = 60.0 * atof(found);
-
-       if (! matchit(divelogfile,"<val key=\"depth\">",
-                       "<int>\\([0-9.]*\\)</int>", &found)) {
-               /* some error handling */
-               goto bail;
-       }
-       dive->maxdepth.mm = pressure_to_depth(atoi(found));
-
-       if (! matchit(divelogfile,"<val key=\"file_content\">",
-                       ">\\([a-zA-Z0-9+/=]*\\)<", &found)) {
-               /* some error handling */
-               goto bail;
-       }
-       uemis_parse_divelog_binary(found,&dive);
-       record_dive(dive);
-bail:
-       if (found)
-               free(found);
-}
-
-/*
- * parse the two files extracted from the SDA
- */
-void
-uemis_import() {
-       if (open_import_file_dialog("*.SDA","uemis Zurich SDA files",
-                                       &parse_uemis_file))
-               report_dives();
-}