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

Add support for the Scubapro Aladin A2

Browse Source
This commit is contained in:
Nick Shore 2020-10-13 09:04:32 +02:00 committed by Jef Driesen
parent c6ea7afb76
commit 625f56b494
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/descriptor.c
View File

@ -167,6 +167,7 @@ static const dc_descriptor_t g_descriptors[] = {
{"Scubapro", "Chromis", DC_FAMILY_UWATEC_SMART, 0x24, DC_TRANSPORT_SERIAL, NULL}, {"Scubapro", "Chromis", DC_FAMILY_UWATEC_SMART, 0x24, DC_TRANSPORT_SERIAL, NULL},
{"Scubapro", "Aladin A1", DC_FAMILY_UWATEC_SMART, 0x25, DC_TRANSPORT_BLE, dc_filter_uwatec}, {"Scubapro", "Aladin A1", DC_FAMILY_UWATEC_SMART, 0x25, DC_TRANSPORT_BLE, dc_filter_uwatec},
{"Scubapro", "Mantis 2", DC_FAMILY_UWATEC_SMART, 0x26, DC_TRANSPORT_SERIAL, NULL}, {"Scubapro", "Mantis 2", DC_FAMILY_UWATEC_SMART, 0x26, DC_TRANSPORT_SERIAL, NULL},
{"Scubapro", "Aladin A2", DC_FAMILY_UWATEC_SMART, 0x28, DC_TRANSPORT_BLE, dc_filter_uwatec},
{"Scubapro", "G2", DC_FAMILY_UWATEC_SMART, 0x32, DC_TRANSPORT_USBHID | DC_TRANSPORT_BLE, dc_filter_uwatec}, {"Scubapro", "G2", DC_FAMILY_UWATEC_SMART, 0x32, DC_TRANSPORT_USBHID | DC_TRANSPORT_BLE, dc_filter_uwatec},
{"Scubapro", "G2 Console", DC_FAMILY_UWATEC_SMART, 0x32, DC_TRANSPORT_USBHID | DC_TRANSPORT_BLE, dc_filter_uwatec}, {"Scubapro", "G2 Console", DC_FAMILY_UWATEC_SMART, 0x32, DC_TRANSPORT_USBHID | DC_TRANSPORT_BLE, dc_filter_uwatec},
{"Scubapro", "G2 HUD", DC_FAMILY_UWATEC_SMART, 0x42, DC_TRANSPORT_USBHID | DC_TRANSPORT_BLE, dc_filter_uwatec}, {"Scubapro", "G2 HUD", DC_FAMILY_UWATEC_SMART, 0x42, DC_TRANSPORT_USBHID | DC_TRANSPORT_BLE, dc_filter_uwatec},
@ -521,6 +522,7 @@ static int dc_filter_uwatec (dc_transport_t transport, const void *userdata, voi
"Aladin", "Aladin",
"HUD", "HUD",
"A1", "A1",
"A2",
}; };
if (transport == DC_TRANSPORT_IRDA) { if (transport == DC_TRANSPORT_IRDA) {

6
src/uwatec_smart_parser.c
View File

@ -50,6 +50,7 @@
#define CHROMIS 0x24 #define CHROMIS 0x24
#define ALADINA1 0x25 #define ALADINA1 0x25
#define MANTIS2 0x26 #define MANTIS2 0x26
#define ALADINA2 0x28
#define G2 0x32 #define G2 0x32
#define G2HUD 0x42 #define G2HUD 0x42
@ -532,7 +533,7 @@ uwatec_smart_parser_cache (uwatec_smart_parser_t *parser)
parser->model == CHROMIS || parser->model == MANTIS2 || parser->model == CHROMIS || parser->model == MANTIS2 ||
parser->model == G2 || parser->model == ALADINSPORTMATRIX || parser->model == G2 || parser->model == ALADINSPORTMATRIX ||
parser->model == ALADINSQUARE || parser->model == G2HUD || parser->model == ALADINSQUARE || parser->model == G2HUD ||
parser->model == ALADINA1) { parser->model == ALADINA1 || parser->model == ALADINA2 ) {
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);
@ -626,6 +627,7 @@ uwatec_smart_parser_create (dc_parser_t **out, dc_context_t *context, unsigned i
case G2HUD: case G2HUD:
case ALADINSPORTMATRIX: case ALADINSPORTMATRIX:
case ALADINA1: case ALADINA1:
case ALADINA2:
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;
@ -969,7 +971,7 @@ uwatec_smart_parse (uwatec_smart_parser_t *parser, dc_sample_callback_t callback
parser->model == CHROMIS || parser->model == MANTIS2 || parser->model == CHROMIS || parser->model == MANTIS2 ||
parser->model == G2 || parser->model == ALADINSPORTMATRIX || parser->model == G2 || parser->model == ALADINSPORTMATRIX ||
parser->model == ALADINSQUARE || parser->model == G2HUD || parser->model == ALADINSQUARE || parser->model == G2HUD ||
parser->model == ALADINA1) { parser->model == ALADINA1 || parser->model == ALADINA2 ) {
// Uwatec Galileo // Uwatec Galileo
id = uwatec_galileo_identify (data[offset]); id = uwatec_galileo_identify (data[offset]);
} else { } else {