FlapJackApps/libdivecomputer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for the Subgear XP-Air

Browse Source
This commit is contained in:
Janice 2016-09-23 17:27:31 -07:00 committed by Jef Driesen
parent 03c252335b
commit 3cb29abfaa
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/descriptor.c
View File

@ -194,6 +194,7 @@ static const dc_descriptor_t g_descriptors[] = {
{"Aeris", "A300CS", DC_FAMILY_OCEANIC_ATOM2, 0x454C}, {"Aeris", "A300CS", DC_FAMILY_OCEANIC_ATOM2, 0x454C},
{"Beuchat", "Mundial 3", DC_FAMILY_OCEANIC_ATOM2, 0x4550}, {"Beuchat", "Mundial 3", DC_FAMILY_OCEANIC_ATOM2, 0x4550},
{"Oceanic", "F11", DC_FAMILY_OCEANIC_ATOM2, 0x4554}, {"Oceanic", "F11", DC_FAMILY_OCEANIC_ATOM2, 0x4554},
{"Subgear", "XP-Air", DC_FAMILY_OCEANIC_ATOM2, 0x4555},
{"Sherwood", "Vision", DC_FAMILY_OCEANIC_ATOM2, 0x4556}, {"Sherwood", "Vision", DC_FAMILY_OCEANIC_ATOM2, 0x4556},
{"Oceanic", "VTX", DC_FAMILY_OCEANIC_ATOM2, 0x4557}, {"Oceanic", "VTX", DC_FAMILY_OCEANIC_ATOM2, 0x4557},
{"Aqualung", "i300", DC_FAMILY_OCEANIC_ATOM2, 0x4559}, {"Aqualung", "i300", DC_FAMILY_OCEANIC_ATOM2, 0x4559},

1
src/oceanic_atom2.c
View File

@ -163,6 +163,7 @@ static const oceanic_common_version_t oceanic_vt4_version[] = {
{"OCEAVT41 \0\0 1024"}, {"OCEAVT41 \0\0 1024"},
{"AERISAIR \0\0 1024"}, {"AERISAIR \0\0 1024"},
{"SWVISION \0\0 1024"}, {"SWVISION \0\0 1024"},
{"XPSUBAIR \0\0 1024"},
}; };
static const oceanic_common_version_t hollis_tx1_version[] = { static const oceanic_common_version_t hollis_tx1_version[] = {

18
src/oceanic_atom2_parser.c
View File

@ -76,6 +76,7 @@
#define A300CS 0x454C #define A300CS 0x454C
#define MUNDIAL3 0x4550 #define MUNDIAL3 0x4550
#define F11B 0x4554 #define F11B 0x4554
#define XPAIR 0x4555
#define VISION 0x4556 #define VISION 0x4556
#define VTX 0x4557 #define VTX 0x4557
#define I300 0x4559 #define I300 0x4559
@ -242,6 +243,7 @@ oceanic_atom2_parser_get_datetime (dc_parser_t *abstract, dc_datetime_t *datetim
case OCI: case OCI:
case I550T: case I550T:
case VISION: case VISION:
case XPAIR:
datetime->year = ((p[5] & 0xE0) >> 5) + ((p[7] & 0xE0) >> 2) + 2000; datetime->year = ((p[5] & 0xE0) >> 5) + ((p[7] & 0xE0) >> 2) + 2000;
datetime->month = (p[3] & 0x0F); datetime->month = (p[3] & 0x0F);
datetime->day = ((p[0] & 0x80) >> 3) + ((p[3] & 0xF0) >> 4); datetime->day = ((p[0] & 0x80) >> 3) + ((p[3] & 0xF0) >> 4);
@ -375,7 +377,8 @@ oceanic_atom2_parser_cache (oceanic_atom2_parser_t *parser)
unsigned int header = headersize - PAGESIZE / 2; unsigned int header = headersize - PAGESIZE / 2;
unsigned int footer = size - footersize; unsigned int footer = size - footersize;
if (parser->model == VT4 || parser->model == VT41 || if (parser->model == VT4 || parser->model == VT41 ||
parser->model == A300AI || parser->model == VISION) { parser->model == A300AI || parser->model == VISION ||
parser->model == XPAIR) {
header = 3 * PAGESIZE; header = 3 * PAGESIZE;
} }
@ -402,7 +405,8 @@ oceanic_atom2_parser_cache (oceanic_atom2_parser_t *parser)
ngasmixes = 1; ngasmixes = 1;
o2_offset = header + 3; o2_offset = header + 3;
} else if (parser->model == VT4 || parser->model == VT41 || } else if (parser->model == VT4 || parser->model == VT41 ||
parser->model == A300AI || parser->model == VISION) { parser->model == A300AI || parser->model == VISION ||
parser->model == XPAIR) {
o2_offset = header + 4; o2_offset = header + 4;
ngasmixes = 4; ngasmixes = 4;
} else if (parser->model == OCI) { } else if (parser->model == OCI) {
@ -752,7 +756,8 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
temperature = data[offset + 1]; temperature = data[offset + 1];
} else if (parser->model == VT4 || parser->model == VT41 || } else if (parser->model == VT4 || parser->model == VT41 ||
parser->model == ATOM3 || parser->model == ATOM31 || parser->model == ATOM3 || parser->model == ATOM31 ||
parser->model == A300AI || parser->model == VISION) { parser->model == A300AI || parser->model == VISION ||
parser->model == XPAIR) {
temperature = ((data[offset + 7] & 0xF0) >> 4) | ((data[offset + 7] & 0x0C) << 2) | ((data[offset + 5] & 0x0C) << 4); temperature = ((data[offset + 7] & 0xF0) >> 4) | ((data[offset + 7] & 0x0C) << 2) | ((data[offset + 5] & 0x0C) << 4);
} else if (parser->model == A300CS || parser->model == VTX) { } else if (parser->model == A300CS || parser->model == VTX) {
temperature = data[offset + 11]; temperature = data[offset + 11];
@ -791,7 +796,7 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
parser->model == ZENAIR ||parser->model == A300AI || parser->model == ZENAIR ||parser->model == A300AI ||
parser->model == DG03 || parser->model == PROPLUS3 || parser->model == DG03 || parser->model == PROPLUS3 ||
parser->model == AMPHOSAIR || parser->model == I550T || parser->model == AMPHOSAIR || parser->model == I550T ||
parser->model == VISION) parser->model == VISION || parser->model == XPAIR)
pressure = (((data[offset + 0] & 0x03) << 8) + data[offset + 1]) * 5; pressure = (((data[offset + 0] & 0x03) << 8) + data[offset + 1]) * 5;
else if (parser->model == TX1 || parser->model == A300CS || parser->model == VTX) else if (parser->model == TX1 || parser->model == A300CS || parser->model == VTX)
pressure = array_uint16_le (data + offset + 4); pressure = array_uint16_le (data + offset + 4);
@ -860,7 +865,8 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
decostop = data[offset + 10]; decostop = data[offset + 10];
decotime = array_uint16_le(data + offset + 6); decotime = array_uint16_le(data + offset + 6);
have_deco = 1; have_deco = 1;
} else if (parser->model == ATOM31 || parser->model == VISION) { } else if (parser->model == ATOM31 || parser->model == VISION ||
parser->model == XPAIR) {
decostop = (data[offset + 5] & 0xF0) >> 4; decostop = (data[offset + 5] & 0xF0) >> 4;
decotime = array_uint16_le(data + offset + 4) & 0x03FF; decotime = array_uint16_le(data + offset + 4) & 0x03FF;
have_deco = 1; have_deco = 1;
@ -892,7 +898,7 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
} else if (parser->model == I550T) { } else if (parser->model == I550T) {
rbt = array_uint16_le(data + offset + 4) & 0x03FF; rbt = array_uint16_le(data + offset + 4) & 0x03FF;
have_rbt = 1; have_rbt = 1;
} else if (parser->model == VISION) { } else if (parser->model == VISION || parser->model == XPAIR) {
rbt = array_uint16_le(data + offset + 6) & 0x03FF; rbt = array_uint16_le(data + offset + 6) & 0x03FF;
have_rbt = 1; have_rbt = 1;
} }