-static void error(const char *fmt, ...)
+/* Christ. Libdivecomputer has the worst configuration system ever. */
+#ifdef HW_FROG_H
+ #define NOT_FROG , 0
+ #define LIBDIVECOMPUTER_SUPPORTS_FROG
+#else
+ #define NOT_FROG
+#endif
+
+static GError *error(const char *fmt, ...)
g_quark_from_string("subsurface"),
DIVE_ERROR_PARSE, fmt, args);
va_end(args);
g_quark_from_string("subsurface"),
DIVE_ERROR_PARSE, fmt, args);
va_end(args);
case DEVICE_TYPE_OCEANIC_ATOM2:
return oceanic_atom2_parser_create(parser, devdata->devinfo.model);
case DEVICE_TYPE_OCEANIC_ATOM2:
return oceanic_atom2_parser_create(parser, devdata->devinfo.model);
case DEVICE_TYPE_MARES_NEMO:
case DEVICE_TYPE_MARES_PUCK:
return mares_nemo_parser_create(parser, devdata->devinfo.model);
case DEVICE_TYPE_MARES_ICONHD:
case DEVICE_TYPE_MARES_NEMO:
case DEVICE_TYPE_MARES_PUCK:
return mares_nemo_parser_create(parser, devdata->devinfo.model);
case DEVICE_TYPE_MARES_ICONHD:
- return hw_ostc_parser_create(parser);
+ return hw_ostc_parser_create(parser NOT_FROG);
+
+#ifdef LIBDIVECOMPUTER_SUPPORTS_FROG
+ case DEVICE_TYPE_HW_FROG:
+ return hw_ostc_parser_create(parser, 1);
+#endif
-static int parse_gasmixes(struct dive *dive, parser_t *parser, int ngases)
+static int parse_gasmixes(device_data_t *devdata, struct dive *dive, parser_t *parser, int ngases)
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",
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;
- 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]);
-}
+ /*
+ * 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);
+}
+static void dev_info(device_data_t *devdata, const char *fmt, ...)
+{
+ char buffer[32];
+ va_list ap;
+
+ va_start(ap, fmt);
+ vsnprintf(buffer, sizeof(buffer), fmt, ap);
+ va_end(ap);
+ update_progressbar_text(&devdata->progress, buffer);
+}
+
+static int import_dive_number = 0;
+/*
+ * 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 inline int year(int year)
+{
+ if (year < 70)
+ return year + 2000;
+ if (year < 100)
+ return year + 1900;
+ return year;
+}
+
static int dive_cb(const unsigned char *data, unsigned int size,
const unsigned char *fingerprint, unsigned int fsize,
void *userdata)
static int dive_cb(const unsigned char *data, unsigned int size,
const unsigned char *fingerprint, unsigned int fsize,
void *userdata)
rc = create_parser(devdata, &parser);
if (rc != PARSER_STATUS_SUCCESS) {
rc = create_parser(devdata, &parser);
if (rc != PARSER_STATUS_SUCCESS) {
return rc;
}
rc = parser_set_data(parser, data, size);
if (rc != PARSER_STATUS_SUCCESS) {
return rc;
}
rc = parser_set_data(parser, data, size);
if (rc != PARSER_STATUS_SUCCESS) {
dive = alloc_dive();
rc = parser_get_datetime(parser, &dt);
if (rc != PARSER_STATUS_SUCCESS && rc != PARSER_STATUS_UNSUPPORTED) {
dive = alloc_dive();
rc = parser_get_datetime(parser, &dt);
if (rc != PARSER_STATUS_SUCCESS && rc != PARSER_STATUS_UNSUPPORTED) {
- printf("Parsing the divetime.\n");
+ dev_info(devdata, "Dive %d: %s %d %04d", import_dive_number,
+ monthname(tm.tm_mon), tm.tm_mday, year(tm.tm_year));
unsigned int divetime = 0;
rc = parser_get_field (parser, FIELD_TYPE_DIVETIME, 0, &divetime);
if (rc != PARSER_STATUS_SUCCESS && rc != PARSER_STATUS_UNSUPPORTED) {
unsigned int divetime = 0;
rc = parser_get_field (parser, FIELD_TYPE_DIVETIME, 0, &divetime);
if (rc != PARSER_STATUS_SUCCESS && rc != PARSER_STATUS_UNSUPPORTED) {
double maxdepth = 0.0;
rc = parser_get_field(parser, FIELD_TYPE_MAXDEPTH, 0, &maxdepth);
if (rc != PARSER_STATUS_SUCCESS && rc != PARSER_STATUS_UNSUPPORTED) {
double maxdepth = 0.0;
rc = parser_get_field(parser, FIELD_TYPE_MAXDEPTH, 0, &maxdepth);
if (rc != PARSER_STATUS_SUCCESS && rc != PARSER_STATUS_UNSUPPORTED) {
unsigned int ngases = 0;
rc = parser_get_field(parser, FIELD_TYPE_GASMIX_COUNT, 0, &ngases);
if (rc != PARSER_STATUS_SUCCESS && rc != PARSER_STATUS_UNSUPPORTED) {
unsigned int ngases = 0;
rc = parser_get_field(parser, FIELD_TYPE_GASMIX_COUNT, 0, &ngases);
if (rc != PARSER_STATUS_SUCCESS && rc != PARSER_STATUS_UNSUPPORTED) {
case DEVICE_TYPE_OCEANIC_ATOM2:
return oceanic_atom2_device_open(device, devname);
case DEVICE_TYPE_OCEANIC_ATOM2:
return oceanic_atom2_device_open(device, devname);
+ case DEVICE_TYPE_MARES_DARWIN:
+ return mares_darwin_device_open(device, devname, 0); /// last parameter is model type (taken from example), 0 seems to be standard, 1 is DARWIN_AIR => Darwin Air wont work if this is fixed here?
+
case DEVICE_TYPE_MARES_NEMO:
return mares_nemo_device_open(device, devname);
case DEVICE_TYPE_MARES_NEMO:
return mares_nemo_device_open(device, 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;
- 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;
break;
case DEVICE_EVENT_PROGRESS:
update_progressbar(&devdata->progress,
break;
case DEVICE_EVENT_PROGRESS:
update_progressbar(&devdata->progress,
- printf("Event: model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)\n",
+ dev_info(devdata, "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)",
devinfo->model, devinfo->model,
devinfo->firmware, devinfo->firmware,
devinfo->serial, devinfo->serial);
break;
case DEVICE_EVENT_CLOCK:
devdata->clock = *clock;
devinfo->model, devinfo->model,
devinfo->firmware, devinfo->firmware,
devinfo->serial, devinfo->serial);
break;
case DEVICE_EVENT_CLOCK:
devdata->clock = *clock;
- printf("Event: systime=%lld, devtime=%u\n",
- clock->systime, clock->devtime);
+ dev_info(devdata, "Event: systime=%"PRId64", devtime=%u\n",
+ (uint64_t)clock->systime, clock->devtime);
rc = device_open(data->devname, data->type, &device);
if (rc != DEVICE_STATUS_SUCCESS)
return "Unable to open %s (%s)";
rc = device_open(data->devname, data->type, &device);
if (rc != DEVICE_STATUS_SUCCESS)
return "Unable to open %s (%s)";
/* 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);
/* 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);
if (pthread_join(pthread, &retval) < 0)
retval = "Odd pthread error return";
if (retval)
if (pthread_join(pthread, &retval) < 0)
retval = "Odd pthread error return";
if (retval)
{ "Oceanic VT Pro", DEVICE_TYPE_OCEANIC_VTPRO },
{ "Oceanic Veo250", DEVICE_TYPE_OCEANIC_VEO250 },
{ "Oceanic Atom 2", DEVICE_TYPE_OCEANIC_ATOM2 },
{ "Oceanic VT Pro", DEVICE_TYPE_OCEANIC_VTPRO },
{ "Oceanic Veo250", DEVICE_TYPE_OCEANIC_VEO250 },
{ "Oceanic Atom 2", DEVICE_TYPE_OCEANIC_ATOM2 },
- { "Mares Nemo", DEVICE_TYPE_MARES_NEMO },
- { "Mares Puck", DEVICE_TYPE_MARES_PUCK },
+ { "Mares Darwin, M1, M2, Airlab", DEVICE_TYPE_MARES_DARWIN },
+ { "Mares Nemo, Excel, Apneist", DEVICE_TYPE_MARES_NEMO },
+ { "Mares Puck, Nemo Air, Nemo Wide", DEVICE_TYPE_MARES_PUCK },
{ "Mares Icon HD", DEVICE_TYPE_MARES_ICONHD },
{ "OSTC", DEVICE_TYPE_HW_OSTC },
{ "Mares Icon HD", DEVICE_TYPE_MARES_ICONHD },
{ "OSTC", DEVICE_TYPE_HW_OSTC },
{ "Cressi Edy", DEVICE_TYPE_CRESSI_EDY },
{ "Zeagle N2iTiON 3", DEVICE_TYPE_ZEAGLE_N2ITION3 },
{ "Atomics Cobalt", DEVICE_TYPE_ATOMICS_COBALT },
{ "Cressi Edy", DEVICE_TYPE_CRESSI_EDY },
{ "Zeagle N2iTiON 3", DEVICE_TYPE_ZEAGLE_N2ITION3 },
{ "Atomics Cobalt", DEVICE_TYPE_ATOMICS_COBALT },