From 8eebc0abd8148745684374961e3413683017a84b Mon Sep 17 00:00:00 2001 From: Jef Driesen Date: Wed, 14 May 2014 13:55:58 +0200 Subject: [PATCH] Add support for the Beuchat Voyager 2G. --- src/descriptor.c | 1 + src/oceanic_atom2.c | 1 + src/oceanic_atom2_parser.c | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/src/descriptor.c b/src/descriptor.c index 18532c2..658d8d8 100644 --- a/src/descriptor.c +++ b/src/descriptor.c @@ -154,6 +154,7 @@ static const dc_descriptor_t g_descriptors[] = { {"Oceanic", "Geo 2.0", DC_FAMILY_OCEANIC_ATOM2, 0x4446}, {"Oceanic", "VT4", DC_FAMILY_OCEANIC_ATOM2, 0x4447}, {"Oceanic", "OC1", DC_FAMILY_OCEANIC_ATOM2, 0x4449}, + {"Beuchat", "Voyager 2G", DC_FAMILY_OCEANIC_ATOM2, 0x444B}, {"Oceanic", "Atom 3.0", DC_FAMILY_OCEANIC_ATOM2, 0x444C}, {"Hollis", "DG03", DC_FAMILY_OCEANIC_ATOM2, 0x444D}, {"Oceanic", "OCS", DC_FAMILY_OCEANIC_ATOM2, 0x4450}, diff --git a/src/oceanic_atom2.c b/src/oceanic_atom2.c index 6094b41..17e1958 100644 --- a/src/oceanic_atom2.c +++ b/src/oceanic_atom2.c @@ -112,6 +112,7 @@ static const oceanic_common_version_t oceanic_default_version[] = { static const oceanic_common_version_t tusa_zenair_version[] = { {"TUZENAIR \0\0 512K"}, {"AMPHOSSW \0\0 512K"}, + {"VOYAGE2G \0\0 512K"}, }; static const oceanic_common_version_t oceanic_oc1_version[] = { diff --git a/src/oceanic_atom2_parser.c b/src/oceanic_atom2_parser.c index 9c0be30..53232e0 100644 --- a/src/oceanic_atom2_parser.c +++ b/src/oceanic_atom2_parser.c @@ -50,6 +50,7 @@ #define GEO20 0x4446 #define VT4 0x4447 #define OC1B 0x4449 +#define VOYAGER2G 0x444B #define ATOM3 0x444C #define DG03 0x444D #define OCS 0x4450 @@ -190,6 +191,7 @@ oceanic_atom2_parser_get_datetime (dc_parser_t *abstract, dc_datetime_t *datetim break; case ZENAIR: case AMPHOS: + case VOYAGER2G: datetime->year = (p[3] & 0x0F) + 2000; datetime->month = (p[7] & 0xF0) >> 4; datetime->day = ((p[3] & 0x80) >> 3) + ((p[5] & 0xF0) >> 4); @@ -546,6 +548,8 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_ unsigned int sign; if (parser->model == DG03 || parser->model == PROPLUS3) sign = (~data[offset + 5] & 0x04) >> 2; + else if (parser->model == VOYAGER2G) + sign = (data[offset + 5] & 0x04) >> 2; else if (parser->model == ATOM2 || parser->model == PROPLUS21 || parser->model == EPICA || parser->model == EPICB || parser->model == ATMOSAI2 || parser->model == AMPHOS)