X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=libdivecomputer.c;h=4495b1716e72bab5ba18edcc57b56f82b969886d;hb=11db04b350382c021edf83e2f91b3cace090989b;hp=daf724190d44d7868ff1a753c29a6a9954c06e09;hpb=1d51c7772996705fb69b2b3433cd94af3543583d;p=ext%2Fsubsurface.git

diff --git a/libdivecomputer.c b/libdivecomputer.c
index daf7241..4495b17 100644
--- a/libdivecomputer.c
+++ b/libdivecomputer.c
@@ -10,7 +10,15 @@
 
 #include "libdivecomputer.h"
 
-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, ...)
 {
 	va_list args;
 	GError *error;
@@ -20,8 +28,7 @@ static void error(const char *fmt, ...)
 		g_quark_from_string("subsurface"),
 		DIVE_ERROR_PARSE, fmt, args);
 	va_end(args);
-	report_error(error);
-	g_error_free(error);
+	return error;
 }
 
 static parser_status_t create_parser(device_data_t *devdata, parser_t **parser)
@@ -67,6 +74,9 @@ static parser_status_t create_parser(device_data_t *devdata, parser_t **parser)
 	case DEVICE_TYPE_OCEANIC_ATOM2:
 		return oceanic_atom2_parser_create(parser, devdata->devinfo.model);
 
+	case DEVICE_TYPE_MARES_DARWIN:
+		return mares_darwin_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);
@@ -75,7 +85,12 @@ static parser_status_t create_parser(device_data_t *devdata, parser_t **parser)
 		return mares_iconhd_parser_create(parser, devdata->devinfo.model);
 
 	case DEVICE_TYPE_HW_OSTC:
-		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
 
 	case DEVICE_TYPE_CRESSI_EDY:
 	case DEVICE_TYPE_ZEAGLE_N2ITION3:
@@ -175,7 +190,7 @@ sample_cb(parser_sample_type_t type, parser_sample_value_t value, void *userdata
 	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;
@@ -385,6 +400,9 @@ static device_status_t device_open(const char *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);
 
@@ -493,7 +511,7 @@ static void *pthread_wrapper(void *_data)
 	return (void *)err_string;
 }
 
-void do_import(device_data_t *data)
+GError *do_import(device_data_t *data)
 {
 	pthread_t pthread;
 	void *retval;
@@ -508,7 +526,8 @@ void do_import(device_data_t *data)
 	if (pthread_join(pthread, &retval) < 0)
 		retval = "Odd pthread error return";
 	if (retval)
-		error(retval, data->name, data->devname);
+		return error(retval, data->name, data->devname);
+	return NULL;
 }
 
 /*
@@ -533,10 +552,14 @@ struct device_list device_list[] = {
 	{ "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 },
+#ifdef LIBDIVECOMPUTER_SUPPORTS_FROG
+	{ "OSTC Frog",		DEVICE_TYPE_HW_FROG },
+#endif
 	{ "Cressi Edy",		DEVICE_TYPE_CRESSI_EDY },
 	{ "Zeagle N2iTiON 3",	DEVICE_TYPE_ZEAGLE_N2ITION3 },
 	{ "Atomics Cobalt",	DEVICE_TYPE_ATOMICS_COBALT },