]> git.tdb.fi Git - ext/subsurface.git/blobdiff - libdivecomputer.c
Clean up event handling from libdivecomputer
[ext/subsurface.git] / libdivecomputer.c
index c08b1175fe42654e1aa4b2c128b41c39e7b885d7..d405253d43a6128363fd8e6862ae7baa615ca4e9 100644 (file)
@@ -1,21 +1,12 @@
 #include <stdio.h>
-#include <gtk/gtk.h>
+#include <pthread.h>
 
 #include "dive.h"
+#include "divelist.h"
 #include "display.h"
+#include "display-gtk.h"
 
-/* libdivecomputer */
-#include <device.h>
-#include <suunto.h>
-#include <reefnet.h>
-#include <uwatec.h>
-#include <oceanic.h>
-#include <mares.h>
-#include <hw.h>
-#include <cressi.h>
-#include <zeagle.h>
-#include <atomics.h>
-#include <utils.h>
+#include "libdivecomputer.h"
 
 static void error(const char *fmt, ...)
 {
@@ -24,20 +15,13 @@ static void error(const char *fmt, ...)
 
        va_start(args, fmt);
        error = g_error_new_valist(
-               g_quark_from_string("divelog"),
+               g_quark_from_string("subsurface"),
                DIVE_ERROR_PARSE, fmt, args);
        va_end(args);
        report_error(error);
        g_error_free(error);
 }
 
-typedef struct device_data_t {
-       device_type_t type;
-       const char *name;
-       device_devinfo_t devinfo;
-       device_clock_t clock;
-} device_data_t;
-
 static parser_status_t create_parser(device_data_t *devdata, parser_t **parser)
 {
        switch (devdata->type) {
@@ -103,6 +87,112 @@ static parser_status_t create_parser(device_data_t *devdata, parser_t **parser)
        }
 }
 
+static int parse_gasmixes(struct dive *dive, parser_t *parser, int ngases)
+{
+       int i;
+
+       for (i = 0; i < ngases; i++) {
+               int rc;
+               gasmix_t gasmix = {0};
+               int o2, he;
+
+               rc = parser_get_field(parser, FIELD_TYPE_GASMIX, i, &gasmix);
+               if (rc != PARSER_STATUS_SUCCESS && rc != PARSER_STATUS_UNSUPPORTED)
+                       return rc;
+
+               if (i >= MAX_CYLINDERS)
+                       continue;
+
+               o2 = gasmix.oxygen * 1000 + 0.5;
+               he = gasmix.helium * 1000 + 0.5;
+
+               /* Ignore bogus data - libdivecomputer does some crazy stuff */
+               if (o2 < 210 || o2 >= 1000)
+                       o2 = 0;
+               if (he < 0 || he >= 800 || o2+he >= 1000)
+                       he = 0;
+
+               dive->cylinder[i].gasmix.o2.permille = o2;
+               dive->cylinder[i].gasmix.he.permille = he;
+       }
+       return PARSER_STATUS_SUCCESS;
+}
+
+static void handle_event(struct dive **divep, struct sample *sample, parser_sample_value_t value)
+{
+       static const char *events[] = {
+               "none", "deco", "rbt", "ascent", "ceiling", "workload", "transmitter",
+               "violation", "bookmark", "surface", "safety stop", "gaschange",
+               "safety stop (voluntary)", "safety stop (mandatory)", "deepstop",
+               "ceiling (safety stop)", "unknown", "divetime", "maxdepth",
+               "OLF", "PO2", "airtime", "rgbm", "heading", "tissue level warning"};
+
+       printf("   <event type=\"%u\" time=\"%u\" flags=\"%u\" value=\"%u\">%s</event>\n",
+               value.event.type, value.event.time, value.event.flags, value.event.value, events[value.event.type]);
+}
+
+
+void
+sample_cb(parser_sample_type_t type, parser_sample_value_t value, void *userdata)
+{
+       int i;
+       struct dive **divep = userdata;
+       struct dive *dive = *divep;
+       struct sample *sample;
+
+       /*
+        * We fill in the "previous" sample - except for SAMPLE_TYPE_TIME,
+        * which creates a new one.
+        */
+       sample = dive->samples ? dive->sample+dive->samples-1 : NULL;
+
+       switch (type) {
+       case SAMPLE_TYPE_TIME:
+               sample = prepare_sample(divep);
+               sample->time.seconds = value.time;
+               finish_sample(*divep, sample);
+               break;
+       case SAMPLE_TYPE_DEPTH:
+               sample->depth.mm = value.depth * 1000 + 0.5;
+               break;
+       case SAMPLE_TYPE_PRESSURE:
+               sample->cylinderindex = value.pressure.tank;
+               sample->cylinderpressure.mbar = value.pressure.value * 1000 + 0.5;
+               break;
+       case SAMPLE_TYPE_TEMPERATURE:
+               sample->temperature.mkelvin = (value.temperature + 273.15) * 1000 + 0.5;
+               break;
+       case SAMPLE_TYPE_EVENT:
+               handle_event(divep, sample, value);
+               break;
+       case SAMPLE_TYPE_RBT:
+               printf("   <rbt>%u</rbt>\n", value.rbt);
+               break;
+       case SAMPLE_TYPE_HEARTBEAT:
+               printf("   <heartbeat>%u</heartbeat>\n", value.heartbeat);
+               break;
+       case SAMPLE_TYPE_BEARING:
+               printf("   <bearing>%u</bearing>\n", value.bearing);
+               break;
+       case SAMPLE_TYPE_VENDOR:
+               printf("   <vendor type=\"%u\" size=\"%u\">", value.vendor.type, value.vendor.size);
+               for (i = 0; i < value.vendor.size; ++i)
+                       printf("%02X", ((unsigned char *) value.vendor.data)[i]);
+               printf("</vendor>\n");
+               break;
+       default:
+               break;
+       }
+}
+
+
+static int parse_samples(struct dive **divep, parser_t *parser)
+{
+       // Parse the sample data.
+       printf("Parsing the sample data.\n");
+       return parser_samples_foreach(parser, sample_cb, divep);
+}
+
 static int dive_cb(const unsigned char *data, unsigned int size,
        const unsigned char *fingerprint, unsigned int fsize,
        void *userdata)
@@ -111,33 +201,88 @@ static int dive_cb(const unsigned char *data, unsigned int size,
        parser_t *parser = NULL;
        device_data_t *devdata = userdata;
        dc_datetime_t dt = {0};
+       struct tm tm;
+       struct dive *dive;
 
        rc = create_parser(devdata, &parser);
        if (rc != PARSER_STATUS_SUCCESS) {
-               error("Unable to create parser for %s", devdata->name);
+               fprintf(stderr, "Unable to create parser for %s", devdata->name);
                return rc;
        }
 
        rc = parser_set_data(parser, data, size);
        if (rc != PARSER_STATUS_SUCCESS) {
-               error("Error registering the data.");
+               fprintf(stderr, "Error registering the data.");
                parser_destroy(parser);
                return rc;
        }
 
+       dive = alloc_dive();
        rc = parser_get_datetime(parser, &dt);
        if (rc != PARSER_STATUS_SUCCESS && rc != PARSER_STATUS_UNSUPPORTED) {
-               error("Error parsing the datetime.");
+               fprintf(stderr, "Error parsing the datetime.");
                parser_destroy (parser);
                return rc;
        }
 
-       printf("<datetime>%04i-%02i-%02i %02i:%02i:%02i</datetime>\n",
-               dt.year, dt.month, dt.day,
-               dt.hour, dt.minute, dt.second);
+       tm.tm_year = dt.year;
+       tm.tm_mon = dt.month-1;
+       tm.tm_mday = dt.day;
+       tm.tm_hour = dt.hour;
+       tm.tm_min = dt.minute;
+       tm.tm_sec = dt.second;
+       dive->when = utc_mktime(&tm);
+
+       // Parse the divetime.
+       printf("Parsing the divetime.\n");
+       unsigned int divetime = 0;
+       rc = parser_get_field (parser, FIELD_TYPE_DIVETIME, 0, &divetime);
+       if (rc != PARSER_STATUS_SUCCESS && rc != PARSER_STATUS_UNSUPPORTED) {
+               fprintf(stderr, "Error parsing the divetime.");
+               parser_destroy(parser);
+               return rc;
+       }
+       dive->duration.seconds = divetime;
+
+       // Parse the maxdepth.
+       printf("Parsing the maxdepth.\n");
+       double maxdepth = 0.0;
+       rc = parser_get_field(parser, FIELD_TYPE_MAXDEPTH, 0, &maxdepth);
+       if (rc != PARSER_STATUS_SUCCESS && rc != PARSER_STATUS_UNSUPPORTED) {
+               fprintf(stderr, "Error parsing the maxdepth.");
+               parser_destroy(parser);
+               return rc;
+       }
+       dive->maxdepth.mm = maxdepth * 1000 + 0.5;
+
+       // Parse the gas mixes.
+       printf("Parsing the gas mixes.\n");
+       unsigned int ngases = 0;
+       rc = parser_get_field(parser, FIELD_TYPE_GASMIX_COUNT, 0, &ngases);
+       if (rc != PARSER_STATUS_SUCCESS && rc != PARSER_STATUS_UNSUPPORTED) {
+               fprintf(stderr, "Error parsing the gas mix count.");
+               parser_destroy(parser);
+               return rc;
+       }
+
+       rc = parse_gasmixes(dive, parser, ngases);
+       if (rc != PARSER_STATUS_SUCCESS) {
+               fprintf(stderr, "Error parsing the gas mix.");
+               parser_destroy(parser);
+               return rc;
+       }
+
+       // Initialize the sample data.
+       rc = parse_samples(&dive, parser);
+       if (rc != PARSER_STATUS_SUCCESS) {
+               fprintf(stderr, "Error parsing the samples.");
+               parser_destroy(parser);
+               return rc;
+       }
+       record_dive(dive);
 
        parser_destroy(parser);
-       return PARSER_STATUS_SUCCESS;
+       return 1;
 }
 
 
@@ -219,8 +364,7 @@ static device_status_t device_open(const char *devname,
        }
 }
 
-static void
-event_cb (device_t *device, device_event_t event, const void *data, void *userdata)
+static void event_cb(device_t *device, device_event_t event, const void *data, void *userdata)
 {
        const device_progress_t *progress = (device_progress_t *) data;
        const device_devinfo_t *devinfo = (device_devinfo_t *) data;
@@ -232,9 +376,8 @@ event_cb (device_t *device, device_event_t event, const void *data, void *userda
                printf("Event: waiting for user action\n");
                break;
        case DEVICE_EVENT_PROGRESS:
-               printf("Event: progress %3.2f%% (%u/%u)\n",
-                       100.0 * (double) progress->current / (double) progress->maximum,
-                       progress->current, progress->maximum);
+               update_progressbar(&devdata->progress,
+                       (double) progress->current / (double) progress->maximum);
                break;
        case DEVICE_EVENT_DEVINFO:
                devdata->devinfo = *devinfo;
@@ -253,54 +396,75 @@ event_cb (device_t *device, device_event_t event, const void *data, void *userda
        }
 }
 
+static int import_thread_done = 0, import_thread_cancelled;
+
 static int
-cancel_cb (void *userdata)
+cancel_cb(void *userdata)
 {
-       return 0;
+       return import_thread_cancelled;
 }
 
-static void do_import(const char *computer, device_type_t type)
+static const char *do_libdivecomputer_import(device_data_t *data)
 {
-       /* FIXME! Needs user input! */
-       const char *devname = "/dev/ttyUSB0";
        device_t *device = NULL;
        device_status_t rc;
-       device_data_t devicedata = {
-               .type = type,
-               .name = computer,
-       };
 
-       rc = device_open(devname, type, &device);
-       if (rc != DEVICE_STATUS_SUCCESS) {
-               error("Unable to open %s (%s)", computer, devname);
-               return;
-       }
+       rc = device_open(data->devname, data->type, &device);
+       if (rc != DEVICE_STATUS_SUCCESS)
+               return "Unable to open %s (%s)";
 
        // Register the event handler.
        int events = DEVICE_EVENT_WAITING | DEVICE_EVENT_PROGRESS | DEVICE_EVENT_DEVINFO | DEVICE_EVENT_CLOCK;
-       rc = device_set_events(device, events, event_cb, &devicedata);
+       rc = device_set_events(device, events, event_cb, data);
        if (rc != DEVICE_STATUS_SUCCESS) {
-               error("Error registering the event handler.");
                device_close(device);
-               return;
+               return "Error registering the event handler.";
        }
 
        // Register the cancellation handler.
-       rc = device_set_cancel(device, cancel_cb, &devicedata);
+       rc = device_set_cancel(device, cancel_cb, data);
        if (rc != DEVICE_STATUS_SUCCESS) {
-               error("Error registering the cancellation handler.");
                device_close(device);
-               return;
+               return "Error registering the cancellation handler.";
        }
 
-       rc = import_device_data(device, &devicedata);
+       rc = import_device_data(device, data);
        if (rc != DEVICE_STATUS_SUCCESS) {
-               error("Dive data import error");
                device_close(device);
-               return;
+               return "Dive data import error";
        }
 
        device_close(device);
+       return NULL;
+}
+
+static void *pthread_wrapper(void *_data)
+{
+       device_data_t *data = _data;
+       const char *err_string = do_libdivecomputer_import(data);
+       import_thread_done = 1;
+       return (void *)err_string;
+}
+
+void do_import(device_data_t *data)
+{
+       pthread_t pthread;
+       void *retval;
+
+       if (data->type == DEVICE_TYPE_UEMIS)
+               return uemis_import();
+
+       /* I'm sure there is some better interface for waiting on a thread in a UI main loop */
+       import_thread_done = 0;
+       pthread_create(&pthread, NULL, pthread_wrapper, data);
+       while (!import_thread_done) {
+               import_thread_cancelled = process_ui_events();
+               usleep(100000);
+       }
+       if (pthread_join(pthread, &retval) < 0)
+               retval = "Odd pthread error return";
+       if (retval)
+               error(retval, data->name, data->devname);
 }
 
 /*
@@ -310,10 +474,7 @@ static void do_import(const char *computer, device_type_t type)
  * libdivecomputer tell us what devices it supports,
  * rather than have the application have to know..
  */
-struct device_list {
-       const char *name;
-       device_type_t type;
-} device_list[] = {
+struct device_list device_list[] = {
        { "Suunto Solution",    DEVICE_TYPE_SUUNTO_SOLUTION },
        { "Suunto Eon",         DEVICE_TYPE_SUUNTO_EON },
        { "Suunto Vyper",       DEVICE_TYPE_SUUNTO_VYPER },
@@ -335,80 +496,6 @@ struct device_list {
        { "Cressi Edy",         DEVICE_TYPE_CRESSI_EDY },
        { "Zeagle N2iTiON 3",   DEVICE_TYPE_ZEAGLE_N2ITION3 },
        { "Atomics Cobalt",     DEVICE_TYPE_ATOMICS_COBALT },
+       { "Uemis Zurich SDA",   DEVICE_TYPE_UEMIS },
        { NULL }
 };
-
-static void fill_computer_list(GtkListStore *store)
-{
-       GtkTreeIter iter;
-       struct device_list *list = device_list;
-
-       for (list = device_list ; list->name ; list++) {
-               gtk_list_store_append(store, &iter);
-               gtk_list_store_set(store, &iter,
-                       0, list->name,
-                       1, list->type,
-                       -1);
-       }
-}
-
-static GtkComboBox *dive_computer_selector(GtkWidget *dialog)
-{
-       GtkWidget *hbox, *combo_box;
-       GtkListStore *model;
-       GtkCellRenderer *renderer;
-
-       hbox = gtk_hbox_new(FALSE, 6);
-       gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
-
-       model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
-       fill_computer_list(model);
-
-       combo_box = gtk_combo_box_new_with_model(GTK_TREE_MODEL(model));
-       gtk_box_pack_start(GTK_BOX(hbox), combo_box, FALSE, TRUE, 3);
-
-       renderer = gtk_cell_renderer_text_new();
-       gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo_box), renderer, TRUE);
-       gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo_box), renderer, "text", 0, NULL);
-
-       return GTK_COMBO_BOX(combo_box);
-}
-
-void import_dialog(GtkWidget *w, gpointer data)
-{
-       int result;
-       GtkWidget *dialog;
-       GtkComboBox *computer;
-
-       dialog = gtk_dialog_new_with_buttons("Import from dive computer",
-               GTK_WINDOW(main_window),
-               GTK_DIALOG_DESTROY_WITH_PARENT,
-               GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
-               GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
-               NULL);
-
-       computer = dive_computer_selector(dialog);
-
-       gtk_widget_show_all(dialog);
-       result = gtk_dialog_run(GTK_DIALOG(dialog));
-       switch (result) {
-               int type;
-               GtkTreeIter iter;
-               GtkTreeModel *model;
-               const char *comp;
-       case GTK_RESPONSE_ACCEPT:
-               if (!gtk_combo_box_get_active_iter(computer, &iter))
-                       break;
-               model = gtk_combo_box_get_model(computer);
-               gtk_tree_model_get(model, &iter,
-                       0, &comp,
-                       1, &type,
-                       -1);
-               do_import(comp, type);
-               break;
-       default:
-               break;
-       }
-       gtk_widget_destroy(dialog);
-}
-