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

Add support for the Sherwood Wisdom 4

Browse Source
This commit is contained in:
Janice McLaughlin 2020-02-04 08:17:19 +01:00 committed by Jef Driesen
parent ba96b3092d
commit 4a60f89f4a
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/descriptor.c
View File

@ -244,6 +244,7 @@ static const dc_descriptor_t g_descriptors[] = {
{"Aqualung", "i550C", DC_FAMILY_OCEANIC_ATOM2, 0x4652, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, dc_filter_oceanic}, {"Aqualung", "i550C", DC_FAMILY_OCEANIC_ATOM2, 0x4652, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, dc_filter_oceanic},
{"Oceanic", "Geo 4.0", DC_FAMILY_OCEANIC_ATOM2, 0x4653, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, dc_filter_oceanic}, {"Oceanic", "Geo 4.0", DC_FAMILY_OCEANIC_ATOM2, 0x4653, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, dc_filter_oceanic},
{"Oceanic", "Veo 4.0", DC_FAMILY_OCEANIC_ATOM2, 0x4654, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, dc_filter_oceanic}, {"Oceanic", "Veo 4.0", DC_FAMILY_OCEANIC_ATOM2, 0x4654, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, dc_filter_oceanic},
{"Sherwood", "Wisdom 4", DC_FAMILY_OCEANIC_ATOM2, 0x4655, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, dc_filter_oceanic},
{"Oceanic", "Pro Plus 4", DC_FAMILY_OCEANIC_ATOM2, 0x4656, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, dc_filter_oceanic}, {"Oceanic", "Pro Plus 4", DC_FAMILY_OCEANIC_ATOM2, 0x4656, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, dc_filter_oceanic},
/* 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},
@ -615,6 +616,7 @@ static int dc_filter_oceanic (dc_transport_t transport, const void *userdata)
0x4652, // Aqualung i550C 0x4652, // Aqualung i550C
0x4653, // Oceanic Geo 4.0 0x4653, // Oceanic Geo 4.0
0x4654, // Oceanic Veo 4.0 0x4654, // Oceanic Veo 4.0
0x4655, // Sherwood Wisdom 4
0x4656, // Oceanic Pro Plus 4 0x4656, // Oceanic Pro Plus 4
}; };

1
src/oceanic_atom2.c
View File

@ -174,6 +174,7 @@ static const oceanic_common_version_t oceanic_oc1_version[] = {
{"OCSWATCH \0\0 1024"}, {"OCSWATCH \0\0 1024"},
{"AQUAI550 \0\0 1024"}, {"AQUAI550 \0\0 1024"},
{"AQUA550C \0\0 1024"}, {"AQUA550C \0\0 1024"},
{"WISDOM04 \0\0 1024"},
}; };
static const oceanic_common_version_t oceanic_oci_version[] = { static const oceanic_common_version_t oceanic_oci_version[] = {

17
src/oceanic_atom2_parser.c
View File

@ -94,6 +94,7 @@
#define I550C 0x4652 #define I550C 0x4652
#define GEO40 0x4653 #define GEO40 0x4653
#define VEO40 0x4654 #define VEO40 0x4654
#define WISDOM4 0x4655
#define PROPLUS4 0x4656 #define PROPLUS4 0x4656
#define NORMAL 0 #define NORMAL 0
@ -190,7 +191,7 @@ oceanic_atom2_parser_create (dc_parser_t **out, dc_context_t *context, unsigned
parser->headersize = 5 * PAGESIZE; parser->headersize = 5 * PAGESIZE;
} else if (model == PROPLUSX) { } else if (model == PROPLUSX) {
parser->headersize = 3 * PAGESIZE; parser->headersize = 3 * PAGESIZE;
} else if (model == I550C) { } else if (model == I550C || model == WISDOM4) {
parser->headersize = 5 * PAGESIZE / 2; parser->headersize = 5 * PAGESIZE / 2;
} }
@ -269,6 +270,7 @@ oceanic_atom2_parser_get_datetime (dc_parser_t *abstract, dc_datetime_t *datetim
case I550C: case I550C:
case VISION: case VISION:
case XPAIR: case XPAIR:
case WISDOM4:
datetime->year = ((p[5] & 0xE0) >> 5) + ((p[7] & 0xE0) >> 2) + 2000; datetime->year = ((p[5] & 0xE0) >> 5) + ((p[7] & 0xE0) >> 2) + 2000;
datetime->month = (p[3] & 0x0F); datetime->month = (p[3] & 0x0F);
datetime->day = ((p[0] & 0x80) >> 3) + ((p[3] & 0xF0) >> 4); datetime->day = ((p[0] & 0x80) >> 3) + ((p[3] & 0xF0) >> 4);
@ -481,6 +483,9 @@ oceanic_atom2_parser_cache (oceanic_atom2_parser_t *parser)
o2_offset = 0x30; o2_offset = 0x30;
ngasmixes = 4; ngasmixes = 4;
o2_step = 2; o2_step = 2;
} else if (parser->model == WISDOM4) {
o2_offset = header + 4;
ngasmixes = 1;
} else { } else {
o2_offset = header + 4; o2_offset = header + 4;
ngasmixes = 3; ngasmixes = 3;
@ -907,7 +912,7 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
unsigned int sign; unsigned int sign;
if (parser->model == DG03 || parser->model == PROPLUS3 || if (parser->model == DG03 || parser->model == PROPLUS3 ||
parser->model == I550 || parser->model == I550C || parser->model == I550 || parser->model == I550C ||
parser->model == PROPLUS4) parser->model == PROPLUS4 || parser->model == WISDOM4)
sign = (~data[offset + 5] & 0x04) >> 2; sign = (~data[offset + 5] & 0x04) >> 2;
else if (parser->model == VOYAGER2G || parser->model == AMPHOS || else if (parser->model == VOYAGER2G || parser->model == AMPHOS ||
parser->model == AMPHOSAIR || parser->model == ZENAIR) parser->model == AMPHOSAIR || parser->model == ZENAIR)
@ -940,7 +945,8 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
parser->model == DG03 || parser->model == PROPLUS3 || parser->model == DG03 || parser->model == PROPLUS3 ||
parser->model == AMPHOSAIR || parser->model == I550 || parser->model == AMPHOSAIR || parser->model == I550 ||
parser->model == VISION || parser->model == XPAIR || parser->model == VISION || parser->model == XPAIR ||
parser->model == I550C || parser->model == PROPLUS4) parser->model == I550C || parser->model == PROPLUS4 ||
parser->model == WISDOM4)
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 ||
@ -1009,7 +1015,7 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
have_deco = 1; have_deco = 1;
} else if (parser->model == ATOM31 || parser->model == VISION || } else if (parser->model == ATOM31 || parser->model == VISION ||
parser->model == XPAIR || parser->model == I550 || parser->model == XPAIR || parser->model == I550 ||
parser->model == I550C) { parser->model == I550C || parser->model == WISDOM4) {
decostop = (data[offset + 5] & 0xF0) >> 4; decostop = (data[offset + 5] & 0xF0) >> 4;
decotime = array_uint16_le(data + offset + 4) & 0x03FF; decotime = array_uint16_le(data + offset + 4) & 0x03FF;
have_deco = 1; have_deco = 1;
@ -1047,7 +1053,8 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
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 ||
parser->model == I550 || parser->model == I550C) { parser->model == I550 || parser->model == I550C ||
parser->model == WISDOM4) {
rbt = array_uint16_le(data + offset + 6) & 0x03FF; rbt = array_uint16_le(data + offset + 6) & 0x03FF;
have_rbt = 1; have_rbt = 1;
} }