From f7bcbb5828646f319487c084749cbc63f6b89ba9 Mon Sep 17 00:00:00 2001 From: Jef Driesen Date: Fri, 11 Aug 2017 21:04:46 +0200 Subject: [PATCH] Add support for the Aqualung i200 --- src/descriptor.c | 1 + src/oceanic_atom2.c | 1 + src/oceanic_atom2_parser.c | 18 ++++++++++++++---- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/descriptor.c b/src/descriptor.c index 8ae0842..54959b0 100644 --- a/src/descriptor.c +++ b/src/descriptor.c @@ -218,6 +218,7 @@ static const dc_descriptor_t g_descriptors[] = { {"Aqualung", "i750TC", DC_FAMILY_OCEANIC_ATOM2, 0x455A}, {"Aqualung", "i450T", DC_FAMILY_OCEANIC_ATOM2, 0x4641}, {"Aqualung", "i550", DC_FAMILY_OCEANIC_ATOM2, 0x4642}, + {"Aqualung", "i200", DC_FAMILY_OCEANIC_ATOM2, 0x4646}, /* Mares Nemo */ {"Mares", "Nemo", DC_FAMILY_MARES_NEMO, 0}, {"Mares", "Nemo Steel", DC_FAMILY_MARES_NEMO, 0}, diff --git a/src/oceanic_atom2.c b/src/oceanic_atom2.c index da19e7f..d9e8d5a 100644 --- a/src/oceanic_atom2.c +++ b/src/oceanic_atom2.c @@ -107,6 +107,7 @@ static const oceanic_common_version_t oceanic_atom2a_version[] = { {"PROPLUS2 \0\0 512K"}, {"OCEGEO20 \0\0 512K"}, {"OCE GEO R\0\0 512K"}, + {"AQUAI200 \0\0 512K"}, }; static const oceanic_common_version_t oceanic_atom2b_version[] = { diff --git a/src/oceanic_atom2_parser.c b/src/oceanic_atom2_parser.c index d63b568..9133984 100644 --- a/src/oceanic_atom2_parser.c +++ b/src/oceanic_atom2_parser.c @@ -84,6 +84,7 @@ #define I750TC 0x455A #define I450T 0x4641 #define I550 0x4642 +#define I200 0x4646 #define NORMAL 0 #define GAUGE 1 @@ -154,7 +155,8 @@ oceanic_atom2_parser_create (dc_parser_t **out, dc_context_t *context, unsigned model == OCS || model == PROPLUS3 || model == A300 || model == MANTA || model == INSIGHT2 || model == ZEN || - model == I300 || model == I550) { + model == I300 || model == I550 || + model == I200) { parser->headersize -= PAGESIZE; } else if (model == VT4 || model == VT41) { parser->headersize += PAGESIZE; @@ -266,6 +268,7 @@ oceanic_atom2_parser_get_datetime (dc_parser_t *abstract, dc_datetime_t *datetim case COMPUMASK: case INSIGHT2: case I300: + case I200: datetime->year = ((p[3] & 0xE0) >> 1) + (p[4] & 0x0F) + 2000; datetime->month = (p[4] & 0xF0) >> 4; datetime->day = p[3] & 0x1F; @@ -685,7 +688,8 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_ parser->model == ELEMENT2 || parser->model == VEO20 || parser->model == A300 || parser->model == ZEN || parser->model == GEO || parser->model == GEO20 || - parser->model == MANTA || parser->model == I300) { + parser->model == MANTA || parser->model == I300 || + parser->model == I200) { have_pressure = 0; } @@ -839,7 +843,8 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_ parser->model == VEO30 || parser->model == OC1A || parser->model == OC1B || parser->model == OC1C || parser->model == OCI || parser->model == A300 || - parser->model == I450T || parser->model == I300) { + parser->model == I450T || parser->model == I300 || + parser->model == I200) { temperature = data[offset + 3]; } else if (parser->model == OCS || parser->model == TX1) { temperature = data[offset + 1]; @@ -906,7 +911,8 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_ parser->model == VEO30 || parser->model == OC1A || parser->model == OC1B || parser->model == OC1C || parser->model == OCI || parser->model == A300 || - parser->model == I450T || parser->model == I300) + parser->model == I450T || parser->model == I300 || + parser->model == I200) depth = (data[offset + 4] + (data[offset + 5] << 8)) & 0x0FFF; else if (parser->model == ATOM1) depth = data[offset + 3] * 16; @@ -953,6 +959,10 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_ decostop = (data[offset + 5] & 0xF0) >> 4; decotime = array_uint16_le(data + offset + 4) & 0x03FF; have_deco = 1; + } else if (parser->model == I200) { + decostop = (data[offset + 7] & 0xF0) >> 4; + decotime = array_uint16_le(data + offset + 6) & 0x0FFF; + have_deco = 1; } if (have_deco) { if (decostop) {