X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=libdivecomputer.c;h=bcf59eeb588ba463de2de58d3e2af719f00ab8f0;hb=b6f6107be1be09536f16a84c20af1604e99d6d5c;hp=cf8b048c9e79e62ea63f30bc04a364ce3ce59855;hpb=682135838ff313594c7f67fabd9be8f88a33883b;p=ext%2Fsubsurface.git
diff --git a/libdivecomputer.c b/libdivecomputer.c
index cf8b048..bcf59ee 100644
--- a/libdivecomputer.c
+++ b/libdivecomputer.c
@@ -70,7 +70,7 @@ static parser_status_t create_parser(device_data_t *devdata, parser_t **parser)
return mares_nemo_parser_create(parser, devdata->devinfo.model);
case DEVICE_TYPE_MARES_ICONHD:
- return mares_iconhd_parser_create(parser);
+ return mares_iconhd_parser_create(parser, devdata->devinfo.model);
case DEVICE_TYPE_HW_OSTC:
return hw_ostc_parser_create(parser);
@@ -118,16 +118,47 @@ static int parse_gasmixes(struct dive *dive, parser_t *parser, int ngases)
return PARSER_STATUS_SUCCESS;
}
-void
-sample_cb(parser_sample_type_t type, parser_sample_value_t value, void *userdata)
+static void handle_event(struct dive *dive, struct sample *sample, parser_sample_value_t value)
{
- int i;
+ int type, time;
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"};
+ "OLF", "PO2", "airtime", "rgbm", "heading", "tissue level warning"
+ };
+ const int nr_events = sizeof(events) / sizeof(const char *);
+ const char *name;
+
+ /*
+ * Just ignore surface events. They are pointless. What "surface"
+ * means depends on the dive computer (and possibly even settings
+ * in the dive computer). It does *not* necessarily mean "depth 0",
+ * so don't even turn it into that.
+ */
+ if (value.event.type == SAMPLE_EVENT_SURFACE)
+ return;
+
+ /*
+ * Other evens might be more interesting, but for now we just print them out.
+ */
+ type = value.event.type;
+ name = "invalid event number";
+ if (type < nr_events)
+ name = events[type];
+
+ time = value.event.time;
+ if (sample)
+ time += sample->time.seconds;
+
+ add_event(dive, time, type, value.event.flags, value.event.value, name);
+}
+
+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;
@@ -155,8 +186,7 @@ sample_cb(parser_sample_type_t type, parser_sample_value_t value, void *userdata
sample->temperature.mkelvin = (value.temperature + 273.15) * 1000 + 0.5;
break;
case SAMPLE_TYPE_EVENT:
- printf(" %s\n",
- value.event.type, value.event.time, value.event.flags, value.event.value, events[value.event.type]);
+ handle_event(dive, sample, value);
break;
case SAMPLE_TYPE_RBT:
printf(" %u\n", value.rbt);
@@ -186,6 +216,23 @@ static int parse_samples(struct dive **divep, parser_t *parser)
return parser_samples_foreach(parser, sample_cb, divep);
}
+/*
+ * Check if this dive already existed before the import
+ */
+static int find_dive(struct dive *dive, device_data_t *devdata)
+{
+ int i;
+
+ for (i = 0; i < dive_table.preexisting; i++) {
+ struct dive *old = dive_table.dives[i];
+
+ if (dive->when != old->when)
+ continue;
+ return 1;
+ }
+ return 0;
+}
+
static int dive_cb(const unsigned char *data, unsigned int size,
const unsigned char *fingerprint, unsigned int fsize,
void *userdata)
@@ -272,9 +319,14 @@ static int dive_cb(const unsigned char *data, unsigned int size,
parser_destroy(parser);
return rc;
}
- record_dive(dive);
parser_destroy(parser);
+
+ /* If we already saw this dive, abort. */
+ if (find_dive(dive, devdata))
+ return 0;
+
+ record_dive(dive);
return 1;
}
@@ -369,7 +421,7 @@ static void event_cb(device_t *device, device_event_t event, const void *data, v
printf("Event: waiting for user action\n");
break;
case DEVICE_EVENT_PROGRESS:
- update_progressbar(devdata->progress,
+ update_progressbar(&devdata->progress,
(double) progress->current / (double) progress->maximum);
break;
case DEVICE_EVENT_DEVINFO:
@@ -444,9 +496,6 @@ 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);
@@ -489,6 +538,5 @@ struct device_list 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 }
};