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

Add support for a new Uwatec Aladin 2G variant.

Browse Source 
This new variant has a different model number and has switched to the
Uwatec Galileo data format.
This commit is contained in:
Jef Driesen 2013-09-17 11:44:33 +02:00
parent 043fc4166c
commit 6f7495dd3e
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

@ -99,6 +99,7 @@ static const dc_descriptor_t g_descriptors[] = {
{"Uwatec", "Aladin 2G", DC_FAMILY_UWATEC_SMART, 0x13}, {"Uwatec", "Aladin 2G", DC_FAMILY_UWATEC_SMART, 0x13},
{"Subgear","XP-10", DC_FAMILY_UWATEC_SMART, 0x13}, {"Subgear","XP-10", DC_FAMILY_UWATEC_SMART, 0x13},
{"Uwatec", "Smart Com", DC_FAMILY_UWATEC_SMART, 0x14}, {"Uwatec", "Smart Com", DC_FAMILY_UWATEC_SMART, 0x14},
{"Uwatec", "Aladin 2G", DC_FAMILY_UWATEC_SMART, 0x15},
{"Uwatec", "Smart Tec", DC_FAMILY_UWATEC_SMART, 0x18}, {"Uwatec", "Smart Tec", DC_FAMILY_UWATEC_SMART, 0x18},
{"Uwatec", "Galileo Trimix",DC_FAMILY_UWATEC_SMART, 0x19}, {"Uwatec", "Galileo Trimix",DC_FAMILY_UWATEC_SMART, 0x19},
{"Uwatec", "Smart Z", DC_FAMILY_UWATEC_SMART, 0x1C}, {"Uwatec", "Smart Z", DC_FAMILY_UWATEC_SMART, 0x1C},

5
src/uwatec_smart_parser.c
View File

@ -39,6 +39,7 @@
#define ALADINTEC 0x12 #define ALADINTEC 0x12
#define ALADINTEC2G 0x13 #define ALADINTEC2G 0x13
#define SMARTCOM 0x14 #define SMARTCOM 0x14
#define ALADIN2G 0x15
#define SMARTTEC 0x18 #define SMARTTEC 0x18
#define GALILEOTRIMIX 0x19 #define GALILEOTRIMIX 0x19
#define SMARTZ 0x1C #define SMARTZ 0x1C
@ -206,6 +207,7 @@ uwatec_smart_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsi
break; break;
case GALILEO: case GALILEO:
case GALILEOTRIMIX: case GALILEOTRIMIX:
case ALADIN2G:
header = 152; header = 152;
if (data[43] & 0x80) { if (data[43] & 0x80) {
header = 0xB1; header = 0xB1;
@ -454,6 +456,7 @@ uwatec_smart_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t
break; break;
case GALILEO: case GALILEO:
case GALILEOTRIMIX: case GALILEOTRIMIX:
case ALADIN2G:
header = 152; header = 152;
if (data[43] & 0x80) { if (data[43] & 0x80) {
header = 0xB1; header = 0xB1;
@ -519,7 +522,7 @@ uwatec_smart_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t
// Process the type bits in the bitstream. // Process the type bits in the bitstream.
unsigned int id = 0; unsigned int id = 0;
if (parser->model == GALILEO || parser->model == GALILEOTRIMIX) { if (parser->model == GALILEO || parser->model == GALILEOTRIMIX || parser->model == ALADIN2G) {
// Uwatec Galileo // Uwatec Galileo
id = uwatec_galileo_identify (data[offset]); id = uwatec_galileo_identify (data[offset]);
} else { } else {