#include <stdio.h>
#include <gtk/gtk.h>
+#include <pthread.h>
#include "dive.h"
#include "divelist.h"
#include <atomics.h>
#include <utils.h>
-/*
- * I'd love to do a while-loop here for pending events, but
- * that seems to screw up with the dive computer reading timing.
- *
- * I may need to spawn a new thread to do the computer
- * reading stuff..
- */
-static int run_gtk_mainloop(void)
-{
- return gtk_main_iteration_do(0);
-}
+/* handling uemis Zurich SDA files */
+#include "uemis.h"
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);
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)
if (i >= MAX_CYLINDERS)
continue;
- dive->cylinder[i].gasmix.o2.permille = gasmix.oxygen * 1000 + 0.5;
- dive->cylinder[i].gasmix.he.permille = gasmix.helium * 1000 + 0.5;
+ 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;
}
struct tm tm;
struct dive *dive;
- /* Christ, this is hacky */
- run_gtk_mainloop();
-
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;
}
unsigned int divetime = 0;
rc = parser_get_field (parser, FIELD_TYPE_DIVETIME, 0, &divetime);
if (rc != PARSER_STATUS_SUCCESS && rc != PARSER_STATUS_UNSUPPORTED) {
- error("Error parsing the divetime.");
+ fprintf(stderr, "Error parsing the divetime.");
parser_destroy(parser);
return rc;
}
double maxdepth = 0.0;
rc = parser_get_field(parser, FIELD_TYPE_MAXDEPTH, 0, &maxdepth);
if (rc != PARSER_STATUS_SUCCESS && rc != PARSER_STATUS_UNSUPPORTED) {
- error("Error parsing the maxdepth.");
+ fprintf(stderr, "Error parsing the maxdepth.");
parser_destroy(parser);
return rc;
}
unsigned int ngases = 0;
rc = parser_get_field(parser, FIELD_TYPE_GASMIX_COUNT, 0, &ngases);
if (rc != PARSER_STATUS_SUCCESS && rc != PARSER_STATUS_UNSUPPORTED) {
- error("Error parsing the gas mix count.");
+ fprintf(stderr, "Error parsing the gas mix count.");
parser_destroy(parser);
return rc;
}
rc = parse_gasmixes(dive, parser, ngases);
if (rc != PARSER_STATUS_SUCCESS) {
- error("Error parsing the gas mix.");
+ 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) {
- error("Error parsing the samples.");
+ fprintf(stderr, "Error parsing the samples.");
parser_destroy(parser);
return rc;
}
const device_clock_t *clock = (device_clock_t *) data;
device_data_t *devdata = (device_data_t *) userdata;
- /* Christ, this is hacky */
- run_gtk_mainloop();
-
switch (event) {
case DEVICE_EVENT_WAITING:
printf("Event: waiting for user action\n");
}
}
+static int import_thread_done = 0, import_thread_cancelled;
+
static int
cancel_cb(void *userdata)
{
- return run_gtk_mainloop();
+ return import_thread_cancelled;
}
-static void do_import(device_data_t *data)
+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;
- rc = device_open(devname, data->type, &device);
- if (rc != DEVICE_STATUS_SUCCESS) {
- error("Unable to open %s (%s)", data->name, data->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, 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, 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, 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;
+}
+
+static 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 gtk main loop */
+ import_thread_done = 0;
+ pthread_create(&pthread, NULL, pthread_wrapper, data);
+ while (!import_thread_done) {
+ while (gtk_events_pending()) {
+ if (gtk_main_iteration_do(0)) {
+ import_thread_cancelled = 1;
+ break;
+ }
+ }
+ usleep(100000);
+ }
+ if (pthread_join(pthread, &retval) < 0)
+ retval = "Odd pthread error return";
+ if (retval)
+ error(retval, data->name, data->devname);
}
/*
{ "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 }
};
gtk_widget_destroy(dialog);
report_dives();
- dive_list_update_dives(dive_list);
+ dive_list_update_dives();
}
projects / ext / subsurface.git / blobdiff