X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=libdivecomputer.c;h=bf912f00875fa79fe8a2d204a285e0cc33356a95;hb=698892329a3f981ff762300427bb43f34b553baf;hp=bcf59eeb588ba463de2de58d3e2af719f00ab8f0;hpb=d6c2236b8a9e20d22d78de7432f7017a18235619;p=ext%2Fsubsurface.git

diff --git a/libdivecomputer.c b/libdivecomputer.c
index bcf59ee..bf912f0 100644
--- a/libdivecomputer.c
+++ b/libdivecomputer.c
@@ -1,5 +1,7 @@
 #include <stdio.h>
 #include <pthread.h>
+#include <unistd.h>
+#include <inttypes.h>
 
 #include "dive.h"
 #include "divelist.h"
@@ -65,6 +67,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);
@@ -107,7 +112,7 @@ static int parse_gasmixes(struct dive *dive, parser_t *parser, int ngases)
 		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;
@@ -173,7 +178,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;
@@ -383,6 +388,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);
 
@@ -411,10 +419,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:
@@ -433,8 +441,8 @@ static void event_cb(device_t *device, device_event_t event, const void *data, v
 		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;
@@ -531,8 +539,9 @@ 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 },
 	{ "Cressi Edy",		DEVICE_TYPE_CRESSI_EDY },