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

Fix the iX3M 2 decompression algorithms

Browse Source 
The iX3M 2021 and iX3M 2 models use different values for the
decompression algorithm.
This commit is contained in:
Jef Driesen 2023-01-18 19:12:30 +01:00
parent bf268d79b4
commit 90bb40e5ea
1 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/divesystem_idive_parser.c
View File

@ -29,6 +29,7 @@
#define ISINSTANCE(parser) dc_device_isinstance((parser), &divesystem_idive_parser_vtable) #define ISINSTANCE(parser) dc_device_isinstance((parser), &divesystem_idive_parser_vtable)
#define ISIX3M(model) ((model) >= 0x21) #define ISIX3M(model) ((model) >= 0x21)
#define ISIX3M2(model) ((model) >= 0x60 && (model) < 0x1000)
#define SZ_HEADER_IDIVE 0x32 #define SZ_HEADER_IDIVE 0x32
#define SZ_SAMPLE_IDIVE 0x2A #define SZ_SAMPLE_IDIVE 0x2A
@ -52,6 +53,11 @@
#define VPM 1 #define VPM 1
#define DUAL 2 #define DUAL 2
#define IX3M2_BUHLMANN 0
#define IX3M2_ZHL16B 1
#define IX3M2_ZHL16C 2
#define IX3M2_VPM 3
typedef struct divesystem_idive_parser_t divesystem_idive_parser_t; typedef struct divesystem_idive_parser_t divesystem_idive_parser_t;
typedef struct divesystem_idive_gasmix_t { typedef struct divesystem_idive_gasmix_t {
@ -364,21 +370,41 @@ divesystem_idive_parser_get_field (dc_parser_t *abstract, dc_field_type_t type,
case DC_FIELD_DECOMODEL: case DC_FIELD_DECOMODEL:
if (parser->algorithm == INVALID) if (parser->algorithm == INVALID)
return DC_STATUS_UNSUPPORTED; return DC_STATUS_UNSUPPORTED;
switch (parser->algorithm) { if (ISIX3M2(parser->model)) {
case BUHLMANN: switch (parser->algorithm) {
case DUAL: case IX3M2_BUHLMANN:
decomodel->type = DC_DECOMODEL_BUHLMANN; case IX3M2_ZHL16B:
decomodel->conservatism = 0; case IX3M2_ZHL16C:
decomodel->params.gf.low = parser->gf_low; decomodel->type = DC_DECOMODEL_BUHLMANN;
decomodel->params.gf.high = parser->gf_high; decomodel->conservatism = 0;
break; decomodel->params.gf.low = parser->gf_low;
case VPM: decomodel->params.gf.high = parser->gf_high;
decomodel->type = DC_DECOMODEL_VPM; break;
decomodel->conservatism = 0; case IX3M2_VPM:
break; decomodel->type = DC_DECOMODEL_VPM;
default: decomodel->conservatism = 0;
ERROR (abstract->context, "Unknown deco algorithm %02x.", parser->algorithm); break;
return DC_STATUS_DATAFORMAT; default:
ERROR (abstract->context, "Unknown deco algorithm %02x.", parser->algorithm);
return DC_STATUS_DATAFORMAT;
}
} else {
switch (parser->algorithm) {
case BUHLMANN:
case DUAL:
decomodel->type = DC_DECOMODEL_BUHLMANN;
decomodel->conservatism = 0;
decomodel->params.gf.low = parser->gf_low;
decomodel->params.gf.high = parser->gf_high;
break;
case VPM:
decomodel->type = DC_DECOMODEL_VPM;
decomodel->conservatism = 0;
break;
default:
ERROR (abstract->context, "Unknown deco algorithm %02x.", parser->algorithm);
return DC_STATUS_DATAFORMAT;
}
} }
break; break;
default: default: