#include <stdio.h>
#include <pthread.h>
+#include <unistd.h>
+#include <inttypes.h>
#include "dive.h"
#include "divelist.h"
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);
he = gasmix.helium * 1000 + 0.5;
/* Ignore bogus data - libdivecomputer does some crazy stuff */
- if (o2 < 210 || o2 >= 1000)
+ if (o2 <= AIR_PERMILLE || o2 >= 1000)
o2 = 0;
if (he < 0 || he >= 800 || o2+he >= 1000)
he = 0;
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;
case SAMPLE_TYPE_TIME:
sample = prepare_sample(divep);
sample->time.seconds = value.time;
- finish_sample(*divep, sample);
+ finish_sample(*divep);
break;
case SAMPLE_TYPE_DEPTH:
sample->depth.mm = value.depth * 1000 + 0.5;
sample->temperature.mkelvin = (value.temperature + 273.15) * 1000 + 0.5;
break;
case SAMPLE_TYPE_EVENT:
- 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]);
+ handle_event(dive, sample, value);
break;
case SAMPLE_TYPE_RBT:
printf(" <rbt>%u</rbt>\n", value.rbt);
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)
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;
}
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:
break;
case DEVICE_EVENT_CLOCK:
devdata->clock = *clock;
- printf("Event: systime=%lld, devtime=%u\n",
- clock->systime, clock->devtime);
+ printf("Event: systime=%"PRId64", devtime=%u\n",
+ (uint64_t)clock->systime, clock->devtime);
break;
default:
break;
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);
{ "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 }
};