From 368c138858a6fef139743af89ed24d6be3df2061 Mon Sep 17 00:00:00 2001 From: Jef Driesen Date: Mon, 23 Jun 2014 18:04:17 +0200 Subject: [PATCH] Fix the gas mixes for a few models. For the Aeris Manta and Sherwood Insight, the header size should be 16 bytes smaller. Due to this mistake not only two samples were missing, but also the byte offset for the gas mixes were wrong. This resulted in invalid gas mixes, with oxygen percentages exceeding 100%. --- src/oceanic_atom2_parser.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/oceanic_atom2_parser.c b/src/oceanic_atom2_parser.c index 548db29..e20d823 100644 --- a/src/oceanic_atom2_parser.c +++ b/src/oceanic_atom2_parser.c @@ -37,11 +37,13 @@ #define T3 0x4259 #define ATOM2 0x4342 #define GEO 0x4344 +#define MANTA 0x4345 #define DATAMASK 0x4347 #define COMPUMASK 0x4348 #define OC1A 0x434E #define F10 0x434D #define WISDOM2 0x4350 +#define INSIGHT2 0x4353 #define ELEMENT2 0x4357 #define VEO20 0x4359 #define VEO30 0x435A @@ -283,7 +285,8 @@ oceanic_atom2_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, uns parser->model == GEO || parser->model == GEO20 || parser->model == VEO20 || parser->model == VEO30 || parser->model == OCS || parser->model == PROPLUS3 || - parser->model == A300) { + parser->model == A300 || parser->model == MANTA || + parser->model == INSIGHT2) { headersize -= PAGESIZE; } else if (parser->model == VT4 || parser->model == VT41) { headersize += PAGESIZE; @@ -386,7 +389,8 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_ parser->model == GEO || parser->model == GEO20 || parser->model == VEO20 || parser->model == VEO30 || parser->model == OCS || parser->model == PROPLUS3 || - parser->model == A300) { + parser->model == A300 || parser->model == MANTA || + parser->model == INSIGHT2) { headersize -= PAGESIZE; } else if (parser->model == VT4 || parser->model == VT41) { headersize += PAGESIZE;