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

Add support for the Scubapro Chromis.

Browse Source
This commit is contained in:
Jef Driesen 2015-01-08 08:26:30 +01:00
parent 6ad341d0c7
commit b6a3c9b237
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/descriptor.c
View File

@ -112,6 +112,7 @@ static const dc_descriptor_t g_descriptors[] = {
#endif
/* Scubapro/Uwatec Meridian */
{"Scubapro", "Meridian", DC_FAMILY_UWATEC_MERIDIAN, 0x20},
{"Scubapro", "Chromis", DC_FAMILY_UWATEC_MERIDIAN, 0x24},
/* Reefnet */
{"Reefnet", "Sensus", DC_FAMILY_REEFNET_SENSUS, 1},
{"Reefnet", "Sensus Pro", DC_FAMILY_REEFNET_SENSUSPRO, 2},

5
src/uwatec_smart_parser.c
View File

@ -45,6 +45,7 @@
#define GALILEOTRIMIX 0x19
#define SMARTZ 0x1C
#define MERIDIAN 0x20
#define CHROMIS 0x24
#define UNSUPPORTED 0xFFFFFFFF
@ -284,6 +285,7 @@ uwatec_smart_parser_create (dc_parser_t **out, dc_context_t *context, unsigned i
case GALILEOTRIMIX:
case ALADIN2G:
case MERIDIAN:
case CHROMIS:
parser->headersize = 152;
parser->header = &uwatec_smart_galileo_header;
parser->samples = uwatec_smart_galileo_samples;
@ -553,7 +555,8 @@ uwatec_smart_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t
// Process the type bits in the bitstream.
unsigned int id = 0;
if (parser->model == GALILEO || parser->model == GALILEOTRIMIX ||
parser->model == ALADIN2G || parser->model == MERIDIAN) {
parser->model == ALADIN2G || parser->model == MERIDIAN ||
parser->model == CHROMIS) {
// Uwatec Galileo
id = uwatec_galileo_identify (data[offset]);
} else {