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

Add support for the Aqualung i550C

Browse Source
This commit is contained in:
Janice McLaughlin 2019-05-28 18:36:32 -07:00 committed by Jef Driesen
parent 07dff48a3b
commit d5aa15c1c5
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/descriptor.c
View File

@ -239,6 +239,7 @@ static const dc_descriptor_t g_descriptors[] = {
{"Aqualung", "i300C", DC_FAMILY_OCEANIC_ATOM2, 0x4648, DC_TRANSPORT_SERIAL, NULL}, {"Aqualung", "i300C", DC_FAMILY_OCEANIC_ATOM2, 0x4648, DC_TRANSPORT_SERIAL, NULL},
{"Aqualung", "i100", DC_FAMILY_OCEANIC_ATOM2, 0x464E, DC_TRANSPORT_SERIAL, NULL}, {"Aqualung", "i100", DC_FAMILY_OCEANIC_ATOM2, 0x464E, DC_TRANSPORT_SERIAL, NULL},
{"Aqualung", "i770R", DC_FAMILY_OCEANIC_ATOM2, 0x4651, DC_TRANSPORT_SERIAL, NULL}, {"Aqualung", "i770R", DC_FAMILY_OCEANIC_ATOM2, 0x4651, DC_TRANSPORT_SERIAL, NULL},
{"Aqualung", "i550C", DC_FAMILY_OCEANIC_ATOM2, 0x4652, DC_TRANSPORT_SERIAL, NULL},
/* Mares Nemo */ /* Mares Nemo */
{"Mares", "Nemo", DC_FAMILY_MARES_NEMO, 0, DC_TRANSPORT_SERIAL, NULL}, {"Mares", "Nemo", DC_FAMILY_MARES_NEMO, 0, DC_TRANSPORT_SERIAL, NULL},
{"Mares", "Nemo Steel", DC_FAMILY_MARES_NEMO, 0, DC_TRANSPORT_SERIAL, NULL}, {"Mares", "Nemo Steel", DC_FAMILY_MARES_NEMO, 0, DC_TRANSPORT_SERIAL, NULL},

1
src/oceanic_atom2.c
View File

@ -159,6 +159,7 @@ static const oceanic_common_version_t oceanic_oc1_version[] = {
{"OC1WATCH \0\0 1024"}, {"OC1WATCH \0\0 1024"},
{"OCSWATCH \0\0 1024"}, {"OCSWATCH \0\0 1024"},
{"AQUAI550 \0\0 1024"}, {"AQUAI550 \0\0 1024"},
{"AQUA550C \0\0 1024"},
}; };
static const oceanic_common_version_t oceanic_oci_version[] = { static const oceanic_common_version_t oceanic_oci_version[] = {

14
src/oceanic_atom2_parser.c
View File

@ -90,6 +90,7 @@
#define I300C 0x4648 #define I300C 0x4648
#define I100 0x464E #define I100 0x464E
#define I770R 0x4651 #define I770R 0x4651
#define I550C 0x4652
#define NORMAL 0 #define NORMAL 0
#define GAUGE 1 #define GAUGE 1
@ -182,6 +183,8 @@ oceanic_atom2_parser_create (dc_parser_t **out, dc_context_t *context, unsigned
parser->headersize = 5 * PAGESIZE; parser->headersize = 5 * PAGESIZE;
} else if (model == PROPLUSX) { } else if (model == PROPLUSX) {
parser->headersize = 3 * PAGESIZE; parser->headersize = 3 * PAGESIZE;
} else if (model == I550C) {
parser->headersize = 5 * PAGESIZE / 2;
} }
parser->cached = 0; parser->cached = 0;
@ -256,6 +259,7 @@ oceanic_atom2_parser_get_datetime (dc_parser_t *abstract, dc_datetime_t *datetim
case A300AI: case A300AI:
case OCI: case OCI:
case I550: case I550:
case I550C:
case VISION: case VISION:
case XPAIR: case XPAIR:
datetime->year = ((p[5] & 0xE0) >> 5) + ((p[7] & 0xE0) >> 2) + 2000; datetime->year = ((p[5] & 0xE0) >> 5) + ((p[7] & 0xE0) >> 2) + 2000;
@ -888,7 +892,7 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
} else { } else {
unsigned int sign; unsigned int sign;
if (parser->model == DG03 || parser->model == PROPLUS3 || if (parser->model == DG03 || parser->model == PROPLUS3 ||
parser->model == I550) parser->model == I550 || parser->model == I550C)
sign = (~data[offset + 5] & 0x04) >> 2; sign = (~data[offset + 5] & 0x04) >> 2;
else if (parser->model == VOYAGER2G || parser->model == AMPHOS || else if (parser->model == VOYAGER2G || parser->model == AMPHOS ||
parser->model == AMPHOSAIR || parser->model == ZENAIR) parser->model == AMPHOSAIR || parser->model == ZENAIR)
@ -920,7 +924,8 @@ 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 == I550 || parser->model == AMPHOSAIR || parser->model == I550 ||
parser->model == VISION || parser->model == XPAIR) parser->model == VISION || parser->model == XPAIR ||
parser->model == I550C)
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 || else if (parser->model == TX1 || parser->model == A300CS ||
parser->model == VTX || parser->model == I750TC || parser->model == VTX || parser->model == I750TC ||
@ -987,7 +992,8 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
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 || parser->model == I550) { parser->model == XPAIR || parser->model == I550 ||
parser->model == I550C) {
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;
@ -1024,7 +1030,7 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
rbt = array_uint16_le(data + offset + 8) & 0x01FF; rbt = array_uint16_le(data + offset + 8) & 0x01FF;
have_rbt = 1; have_rbt = 1;
} else if (parser->model == VISION || parser->model == XPAIR || } else if (parser->model == VISION || parser->model == XPAIR ||
parser->model == I550) { parser->model == I550 || parser->model == I550C) {
rbt = array_uint16_le(data + offset + 6) & 0x03FF; rbt = array_uint16_le(data + offset + 6) & 0x03FF;
have_rbt = 1; have_rbt = 1;
} }