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

Support for the Scubapro Aladin Sport Matrix.

Browse Source 
The protocol is identical to the G2 protocol, with the exception of a
missing handshake.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2017-10-23 20:55:19 +02:00 committed by Jef Driesen
parent a196255841
commit d0d4c7b994
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/descriptor.c
View File

@ -138,7 +138,8 @@ static const dc_descriptor_t g_descriptors[] = {
{"Scubapro", "Mantis 2", DC_FAMILY_UWATEC_MERIDIAN, 0x26}, {"Scubapro", "Mantis 2", DC_FAMILY_UWATEC_MERIDIAN, 0x26},
/* Scubapro G2 */ /* Scubapro G2 */
#ifdef USBHID #ifdef USBHID
{"Scubapro", "G2", DC_FAMILY_UWATEC_G2, 0x32}, {"Scubapro", "Aladin Sport Matrix", DC_FAMILY_UWATEC_G2, 0x17},
{"Scubapro", "G2", DC_FAMILY_UWATEC_G2, 0x32},
#endif #endif
/* Reefnet */ /* Reefnet */
{"Reefnet", "Sensus", DC_FAMILY_REEFNET_SENSUS, 1}, {"Reefnet", "Sensus", DC_FAMILY_REEFNET_SENSUS, 1},

32
src/uwatec_smart_parser.c
View File

@ -35,19 +35,20 @@
#define NBITS 8 #define NBITS 8
#define SMARTPRO 0x10 #define SMARTPRO 0x10
#define GALILEO 0x11 #define GALILEO 0x11
#define ALADINTEC 0x12 #define ALADINTEC 0x12
#define ALADINTEC2G 0x13 #define ALADINTEC2G 0x13
#define SMARTCOM 0x14 #define SMARTCOM 0x14
#define ALADIN2G 0x15 #define ALADIN2G 0x15
#define SMARTTEC 0x18 #define ALADINSPORTMATRIX 0x17
#define GALILEOTRIMIX 0x19 #define SMARTTEC 0x18
#define SMARTZ 0x1C #define GALILEOTRIMIX 0x19
#define MERIDIAN 0x20 #define SMARTZ 0x1C
#define CHROMIS 0x24 #define MERIDIAN 0x20
#define MANTIS2 0x26 #define CHROMIS 0x24
#define G2 0x32 #define MANTIS2 0x26
#define G2 0x32
#define UNSUPPORTED 0xFFFFFFFF #define UNSUPPORTED 0xFFFFFFFF
@ -521,7 +522,7 @@ uwatec_smart_parser_cache (uwatec_smart_parser_t *parser)
if (parser->model == GALILEO || parser->model == GALILEOTRIMIX || if (parser->model == GALILEO || parser->model == GALILEOTRIMIX ||
parser->model == ALADIN2G || parser->model == MERIDIAN || parser->model == ALADIN2G || parser->model == MERIDIAN ||
parser->model == CHROMIS || parser->model == MANTIS2 || parser->model == CHROMIS || parser->model == MANTIS2 ||
parser->model == G2) { parser->model == G2 || parser->model == ALADINSPORTMATRIX) {
unsigned int offset = header->tankpressure + 2 * i; unsigned int offset = header->tankpressure + 2 * i;
endpressure = array_uint16_le(data + offset); endpressure = array_uint16_le(data + offset);
beginpressure = array_uint16_le(data + offset + 2 * header->ngases); beginpressure = array_uint16_le(data + offset + 2 * header->ngases);
@ -611,6 +612,7 @@ uwatec_smart_parser_create (dc_parser_t **out, dc_context_t *context, unsigned i
parser->nevents[2] = C_ARRAY_SIZE (uwatec_smart_galileo_events_2); parser->nevents[2] = C_ARRAY_SIZE (uwatec_smart_galileo_events_2);
break; break;
case G2: case G2:
case ALADINSPORTMATRIX:
parser->headersize = 84; parser->headersize = 84;
parser->header = &uwatec_smart_trimix_header; parser->header = &uwatec_smart_trimix_header;
parser->samples = uwatec_smart_galileo_samples; parser->samples = uwatec_smart_galileo_samples;
@ -950,7 +952,7 @@ uwatec_smart_parse (uwatec_smart_parser_t *parser, dc_sample_callback_t callback
if (parser->model == GALILEO || parser->model == GALILEOTRIMIX || if (parser->model == GALILEO || parser->model == GALILEOTRIMIX ||
parser->model == ALADIN2G || parser->model == MERIDIAN || parser->model == ALADIN2G || parser->model == MERIDIAN ||
parser->model == CHROMIS || parser->model == MANTIS2 || parser->model == CHROMIS || parser->model == MANTIS2 ||
parser->model == G2) { parser->model == G2 || parser->model == ALADINSPORTMATRIX) {
// Uwatec Galileo // Uwatec Galileo
id = uwatec_galileo_identify (data[offset]); id = uwatec_galileo_identify (data[offset]);
} else { } else {