mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-01 06:30:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added support for Mares Darwin, M1, M2, ... from latest libdivecomputer.

Browse source 
Only M1 has been tested.
Darwin Air will most likely not work as an additional model flag seems to be needed.
This is not foreseen in current GUI.
This commit is contained in:
Björn Spruck 2012-03-25 17:16:21 +02:00
parent 81fddfa67e
commit f69be7b571
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libdivecomputer.c
View file

@ -67,6 +67,9 @@ static parser_status_t create_parser(device_data_t *devdata, parser_t **parser)
case DEVICE_TYPE_OCEANIC_ATOM2: case DEVICE_TYPE_OCEANIC_ATOM2:
return oceanic_atom2_parser_create(parser, devdata->devinfo.model); 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_NEMO:
case DEVICE_TYPE_MARES_PUCK: case DEVICE_TYPE_MARES_PUCK:
return mares_nemo_parser_create(parser, devdata->devinfo.model); return mares_nemo_parser_create(parser, devdata->devinfo.model);
@ -385,6 +388,9 @@ static device_status_t device_open(const char *devname,
case DEVICE_TYPE_OCEANIC_ATOM2: case DEVICE_TYPE_OCEANIC_ATOM2:
return oceanic_atom2_device_open(device, devname); 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: case DEVICE_TYPE_MARES_NEMO:
return mares_nemo_device_open(device, devname); return mares_nemo_device_open(device, devname);
@ -533,8 +539,9 @@ struct device_list device_list[] = {
{ "Oceanic VT Pro", DEVICE_TYPE_OCEANIC_VTPRO }, { "Oceanic VT Pro", DEVICE_TYPE_OCEANIC_VTPRO },
{ "Oceanic Veo250", DEVICE_TYPE_OCEANIC_VEO250 }, { "Oceanic Veo250", DEVICE_TYPE_OCEANIC_VEO250 },
{ "Oceanic Atom 2", DEVICE_TYPE_OCEANIC_ATOM2 }, { "Oceanic Atom 2", DEVICE_TYPE_OCEANIC_ATOM2 },
{ "Mares Nemo", DEVICE_TYPE_MARES_NEMO }, { "Mares Darwin, M1, M2, Airlab", DEVICE_TYPE_MARES_DARWIN },
{ "Mares Puck", DEVICE_TYPE_MARES_PUCK }, { "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 }, { "Mares Icon HD", DEVICE_TYPE_MARES_ICONHD },
{ "OSTC", DEVICE_TYPE_HW_OSTC }, { "OSTC", DEVICE_TYPE_HW_OSTC },
{ "Cressi Edy", DEVICE_TYPE_CRESSI_EDY }, { "Cressi Edy", DEVICE_TYPE_CRESSI_EDY },