X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=libdivecomputer.c;h=b1c86c5ee8d378ad1852a88e7d396d88885b78a1;hb=8c0c6bad59b588de4fe1e8983d76ded16538fc44;hp=b20acdbecd0ebf41cc32b2244488d4ad82dcf8a5;hpb=d344d15a905576ca25a0585e6beb554388628bc6;p=ext%2Fsubsurface.git
diff --git a/libdivecomputer.c b/libdivecomputer.c
index b20acdb..b1c86c5 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,7 +118,7 @@ static int parse_gasmixes(struct dive *dive, parser_t *parser, int ngases)
return PARSER_STATUS_SUCCESS;
}
-static void handle_event(struct dive **divep, struct sample *sample, parser_sample_value_t value)
+static void handle_event(struct dive *dive, struct sample *sample, parser_sample_value_t value)
{
int type, time;
static const char *events[] = {
@@ -152,9 +152,7 @@ static void handle_event(struct dive **divep, struct sample *sample, parser_samp
if (sample)
time += sample->time.seconds;
- printf(" \n",
- type, time / 60, time % 60,
- value.event.flags, value.event.value, name);
+ add_event(dive, time, type, value.event.flags, value.event.value, name);
}
void
@@ -188,7 +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:
- handle_event(divep, sample, value);
+ handle_event(dive, sample, value);
break;
case SAMPLE_TYPE_RBT:
printf(" %u\n", value.rbt);
@@ -218,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)
@@ -304,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;
}
@@ -391,10 +411,10 @@ 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)
{
- const device_progress_t *progress = (device_progress_t *) data;
- const device_devinfo_t *devinfo = (device_devinfo_t *) data;
- const device_clock_t *clock = (device_clock_t *) data;
- device_data_t *devdata = (device_data_t *) userdata;
+ const device_progress_t *progress = data;
+ const device_devinfo_t *devinfo = data;
+ const device_clock_t *clock = data;
+ device_data_t *devdata = userdata;
switch (event) {
case DEVICE_EVENT_WAITING:
@@ -476,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);
@@ -521,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 }
};