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

Add support for yet another Oceanic OC1 variant.

Browse Source 
The only difference with the two other Oceanic OC1 variants is the new
model number. I have absolutely no idea what's the purpose of such a
silly change.
This commit is contained in:
Jef Driesen 2013-05-09 12:59:15 +02:00
parent c195404920
commit 1572a91f62
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/descriptor.c
View File

@ -147,6 +147,7 @@ static const dc_descriptor_t g_descriptors[] = {
{"Oceanic", "Atom 3.0", DC_FAMILY_OCEANIC_ATOM2, 0x444C}, {"Oceanic", "Atom 3.0", DC_FAMILY_OCEANIC_ATOM2, 0x444C},
{"Hollis", "DG03", DC_FAMILY_OCEANIC_ATOM2, 0x444D}, {"Hollis", "DG03", DC_FAMILY_OCEANIC_ATOM2, 0x444D},
{"Oceanic", "OCS", DC_FAMILY_OCEANIC_ATOM2, 0x4450}, {"Oceanic", "OCS", DC_FAMILY_OCEANIC_ATOM2, 0x4450},
{"Oceanic", "OC1", DC_FAMILY_OCEANIC_ATOM2, 0x4451},
{"Oceanic", "VT 4.1", DC_FAMILY_OCEANIC_ATOM2, 0x4452}, {"Oceanic", "VT 4.1", DC_FAMILY_OCEANIC_ATOM2, 0x4452},
{"Aeris", "Epic", DC_FAMILY_OCEANIC_ATOM2, 0x4453}, {"Aeris", "Epic", DC_FAMILY_OCEANIC_ATOM2, 0x4453},
{"Aeris", "Elite T3", DC_FAMILY_OCEANIC_ATOM2, 0x4455}, {"Aeris", "Elite T3", DC_FAMILY_OCEANIC_ATOM2, 0x4455},

10
src/oceanic_atom2_parser.c
View File

@ -49,6 +49,7 @@
#define ATOM3 0x444C #define ATOM3 0x444C
#define DG03 0x444D #define DG03 0x444D
#define OCS 0x4450 #define OCS 0x4450
#define OC1C 0x4451
#define VT41 0x4452 #define VT41 0x4452
#define EPICB 0x4453 #define EPICB 0x4453
#define ATOM31 0x4456 #define ATOM31 0x4456
@ -171,6 +172,7 @@ oceanic_atom2_parser_get_datetime (dc_parser_t *abstract, dc_datetime_t *datetim
switch (parser->model) { switch (parser->model) {
case OC1A: case OC1A:
case OC1B: case OC1B:
case OC1C:
case OCS: case OCS:
case VT4: case VT4:
case VT41: case VT41:
@ -408,7 +410,7 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
} }
unsigned int samplesize = PAGESIZE / 2; unsigned int samplesize = PAGESIZE / 2;
if (parser->model == OC1A || parser->model == OC1B) if (parser->model == OC1A || parser->model == OC1B || parser->model == OC1C)
samplesize = PAGESIZE; samplesize = PAGESIZE;
else if (parser->model == F10) else if (parser->model == F10)
samplesize = 2; samplesize = 2;
@ -516,7 +518,7 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
temperature = data[offset + 6]; temperature = data[offset + 6];
} else if (parser->model == GEO20 || parser->model == VEO20 || } else if (parser->model == GEO20 || parser->model == VEO20 ||
parser->model == VEO30 || parser->model == OC1A || parser->model == VEO30 || parser->model == OC1A ||
parser->model == OC1B) { parser->model == OC1B || parser->model == OC1C) {
temperature = data[offset + 3]; temperature = data[offset + 3];
} else if (parser->model == OCS) { } else if (parser->model == OCS) {
temperature = data[offset + 1]; temperature = data[offset + 1];
@ -542,7 +544,7 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
// Tank Pressure (psi) // Tank Pressure (psi)
if (have_pressure) { if (have_pressure) {
if (parser->model == OC1A || parser->model == OC1B) if (parser->model == OC1A || parser->model == OC1B || parser->model == OC1C)
pressure = (data[offset + 10] + (data[offset + 11] << 8)) & 0x0FFF; pressure = (data[offset + 10] + (data[offset + 11] << 8)) & 0x0FFF;
else if (parser->model == VT4 || parser->model == VT41|| else if (parser->model == VT4 || parser->model == VT41||
parser->model == ATOM3 || parser->model == ATOM31 || parser->model == ATOM3 || parser->model == ATOM31 ||
@ -560,7 +562,7 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
unsigned int depth; unsigned int depth;
if (parser->model == GEO20 || parser->model == VEO20 || if (parser->model == GEO20 || parser->model == VEO20 ||
parser->model == VEO30 || parser->model == OC1A || parser->model == VEO30 || parser->model == OC1A ||
parser->model == OC1B) parser->model == OC1B || parser->model == OC1C)
depth = (data[offset + 4] + (data[offset + 5] << 8)) & 0x0FFF; depth = (data[offset + 4] + (data[offset + 5] << 8)) & 0x0FFF;
else if (parser->model == ATOM1) else if (parser->model == ATOM1)
depth = data[offset + 3] * 16; depth = data[offset + 3] * 16;