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

Start adding IDs for the Oceanic Geo 4.0

Browse Source 
There's a new dive computer in town: the Oceanic Geo 4.0.  It looks like
it should support BLE, and is probably fairly similar to the Pro Plus X.
Or so this initial support trial just assumes.

I don't have the version string for this device yet, so that hasn't been
added at all.  A full dump is required, the initial report only (almost
accidentally) gave the model numbers thanks to the BLE scan data.

Reported-by: George Rocks <jrroques2004@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2019-05-31 10:03:06 -07:00
parent 8fb2b75c25
commit e38406b353
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/descriptor.c
View File

@ -228,6 +228,7 @@ static const dc_descriptor_t g_descriptors[] = {
{"Aqualung", "i300C", DC_FAMILY_OCEANIC_ATOM2, 0x4648, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, NULL}, {"Aqualung", "i300C", DC_FAMILY_OCEANIC_ATOM2, 0x4648, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, NULL},
{"Aqualung", "i100", DC_FAMILY_OCEANIC_ATOM2, 0x464E, DC_TRANSPORT_SERIAL, NULL}, {"Aqualung", "i100", DC_FAMILY_OCEANIC_ATOM2, 0x464E, DC_TRANSPORT_SERIAL, NULL},
{"Aqualung", "i770R", DC_FAMILY_OCEANIC_ATOM2, 0x4651, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, NULL}, {"Aqualung", "i770R", DC_FAMILY_OCEANIC_ATOM2, 0x4651, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, NULL},
{"Oceanic", "Geo 4.0", DC_FAMILY_OCEANIC_ATOM2, 0x4653, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, NULL},
/* Mares Nemo */ /* Mares Nemo */
{"Mares", "Nemo", DC_FAMILY_MARES_NEMO, 0, DC_TRANSPORT_SERIAL, NULL}, {"Mares", "Nemo", DC_FAMILY_MARES_NEMO, 0, DC_TRANSPORT_SERIAL, NULL},
{"Mares", "Nemo Steel", DC_FAMILY_MARES_NEMO, 0, DC_TRANSPORT_SERIAL, NULL}, {"Mares", "Nemo Steel", DC_FAMILY_MARES_NEMO, 0, DC_TRANSPORT_SERIAL, NULL},

5
src/oceanic_atom2.c
View File

@ -36,6 +36,7 @@
#define VTX 0x4557 #define VTX 0x4557
#define I750TC 0x455A #define I750TC 0x455A
#define I770R 0x4651 #define I770R 0x4651
#define GEO40 0x4653
#define MAXRETRIES 2 #define MAXRETRIES 2
#define MAXDELAY 16 #define MAXDELAY 16
@ -875,7 +876,7 @@ oceanic_atom2_device_open (dc_device_t **out, dc_context_t *context, dc_iostream
// Get the correct baudrate. // Get the correct baudrate.
unsigned int baudrate = 38400; unsigned int baudrate = 38400;
if (model == VTX || model == I750TC || model == PROPLUSX || model == I770R) { if (model == VTX || model == I750TC || model == PROPLUSX || model == I770R || model == GEO40) {
baudrate = 115200; baudrate = 115200;
} }
@ -989,7 +990,7 @@ oceanic_atom2_device_open (dc_device_t **out, dc_context_t *context, dc_iostream
} else if (OCEANIC_COMMON_MATCH (device->base.version, oceanic_default_version)) { } else if (OCEANIC_COMMON_MATCH (device->base.version, oceanic_default_version)) {
device->base.layout = &oceanic_default_layout; device->base.layout = &oceanic_default_layout;
} else { } else {
WARNING (context, "Unsupported device detected!"); WARNING (context, "Unsupported device detected (%s)!", device->base.version);
device->base.layout = &oceanic_default_layout; device->base.layout = &oceanic_default_layout;
if (memcmp(device->base.version + 12, "256K", 4) == 0) { if (memcmp(device->base.version + 12, "256K", 4) == 0) {
device->base.layout = &oceanic_atom1_layout; device->base.layout = &oceanic_atom1_layout;

22
src/oceanic_atom2_parser.c
View File

@ -92,6 +92,7 @@
#define I300C 0x4648 #define I300C 0x4648
#define I100 0x464E #define I100 0x464E
#define I770R 0x4651 #define I770R 0x4651
#define GEO40 0x4653
#define NORMAL 0 #define NORMAL 0
#define GAUGE 1 #define GAUGE 1
@ -183,7 +184,7 @@ oceanic_atom2_parser_create (dc_parser_t **out, dc_context_t *context, unsigned
model == I450T || model == I750TC || model == I450T || model == I750TC ||
model == I770R) { model == I770R) {
parser->headersize = 5 * PAGESIZE; parser->headersize = 5 * PAGESIZE;
} else if (model == PROPLUSX) { } else if (model == PROPLUSX || model == GEO40) {
parser->headersize = 3 * PAGESIZE; parser->headersize = 3 * PAGESIZE;
} }
@ -325,6 +326,7 @@ oceanic_atom2_parser_get_datetime (dc_parser_t *abstract, dc_datetime_t *datetim
case I450T: case I450T:
case I750TC: case I750TC:
case PROPLUSX: case PROPLUSX:
case GEO40:
case I770R: case I770R:
datetime->year = (p[10]) + 2000; datetime->year = (p[10]) + 2000;
datetime->month = (p[8]); datetime->month = (p[8]);
@ -464,7 +466,7 @@ oceanic_atom2_parser_cache (oceanic_atom2_parser_t *parser)
} else if (parser->model == ZEN) { } else if (parser->model == ZEN) {
o2_offset = header + 4; o2_offset = header + 4;
ngasmixes = 2; ngasmixes = 2;
} else if (parser->model == PROPLUSX) { } else if (parser->model == PROPLUSX || parser->model == GEO40) {
o2_offset = 0x24; o2_offset = 0x24;
ngasmixes = 4; ngasmixes = 4;
} else if (parser->model == I770R) { } else if (parser->model == I770R) {
@ -663,7 +665,8 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
unsigned int idx = 0x17; unsigned int idx = 0x17;
if (parser->model == A300CS || parser->model == VTX || if (parser->model == A300CS || parser->model == VTX ||
parser->model == I450T || parser->model == I750TC || parser->model == I450T || parser->model == I750TC ||
parser->model == PROPLUSX || parser->model == I770R) parser->model == PROPLUSX || parser->model == I770R ||
parser->model == GEO40)
idx = 0x1f; idx = 0x1f;
switch (data[idx] & 0x03) { switch (data[idx] & 0x03) {
case 0: case 0:
@ -719,7 +722,7 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
parser->model == TX1 || parser->model == A300CS || parser->model == TX1 || parser->model == A300CS ||
parser->model == VTX || parser->model == I450T || parser->model == VTX || parser->model == I450T ||
parser->model == I750TC || parser->model == PROPLUSX || parser->model == I750TC || parser->model == PROPLUSX ||
parser->model == I770R) { parser->model == GEO40 || parser->model == I770R) {
samplesize = PAGESIZE; samplesize = PAGESIZE;
} }
@ -902,7 +905,7 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
temperature = ((data[offset + 7] & 0xF0) >> 4) | ((data[offset + 7] & 0x0C) << 2) | ((data[offset + 5] & 0x0C) << 4); temperature = ((data[offset + 7] & 0xF0) >> 4) | ((data[offset + 7] & 0x0C) << 2) | ((data[offset + 5] & 0x0C) << 4);
} else if (parser->model == A300CS || parser->model == VTX || } else if (parser->model == A300CS || parser->model == VTX ||
parser->model == I750TC || parser->model == PROPLUSX || parser->model == I750TC || parser->model == PROPLUSX ||
parser->model == I770R) { parser->model == GEO40 || parser->model == I770R) {
temperature = data[offset + 11]; temperature = data[offset + 11];
} else { } else {
unsigned int sign; unsigned int sign;
@ -943,7 +946,8 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
pressure = (((data[offset + 0] & 0x03) << 8) + data[offset + 1]) * 5; pressure = (((data[offset + 0] & 0x03) << 8) + data[offset + 1]) * 5;
else if (parser->model == TX1 || parser->model == A300CS || else if (parser->model == TX1 || parser->model == A300CS ||
parser->model == VTX || parser->model == I750TC || parser->model == VTX || parser->model == I750TC ||
parser->model == PROPLUSX || parser->model == I770R) parser->model == PROPLUSX || parser->model == GEO40 ||
parser->model == I770R)
pressure = array_uint16_le (data + offset + 4); pressure = array_uint16_le (data + offset + 4);
else else
pressure -= data[offset + 1]; pressure -= data[offset + 1];
@ -993,7 +997,9 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
unsigned int decostop = 0, decotime = 0; unsigned int decostop = 0, decotime = 0;
if (parser->model == A300CS || parser->model == VTX || if (parser->model == A300CS || parser->model == VTX ||
parser->model == I750TC || parser->model == I750TC ||
parser->model == PROPLUSX || parser->model == I770R) { parser->model == PROPLUSX ||
parser->model == GEO40 ||
parser->model == I770R) {
decostop = (data[offset + 15] & 0x70) >> 4; decostop = (data[offset + 15] & 0x70) >> 4;
decotime = array_uint16_le(data + offset + 6) & 0x03FF; decotime = array_uint16_le(data + offset + 6) & 0x03FF;
have_deco = 1; have_deco = 1;
@ -1039,7 +1045,7 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
} else if (parser->model == I450T || parser->model == OC1A || } else if (parser->model == I450T || parser->model == OC1A ||
parser->model == OC1B || parser->model == OC1C || parser->model == OC1B || parser->model == OC1C ||
parser->model == OCI || parser->model == PROPLUSX || parser->model == OCI || parser->model == PROPLUSX ||
parser->model == I770R) { parser->model == GEO40 || parser->model == I770R) {
rbt = array_uint16_le(data + offset + 8) & 0x01FF; rbt = array_uint16_le(data + offset + 8) & 0x01FF;
have_rbt = 1; have_rbt = 1;
} else if (parser->model == VISION || parser->model == XPAIR || } else if (parser->model == VISION || parser->model == XPAIR ||