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

Add support for a new Aqualung i200C variant

Browse Source 
There is a new variant of the i200C with a different model number
(0x4749) and double the amount of memory (128K).
This commit is contained in:
Jef Driesen 2022-06-16 22:28:55 +02:00
parent 4b4efb2c07
commit 4616e2ed21
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/descriptor.c
View File

@ -269,6 +269,7 @@ static const dc_descriptor_t g_descriptors[] = {
{"Sherwood", "Amphos 2.0", DC_FAMILY_OCEANIC_ATOM2, 0x4657, DC_TRANSPORT_SERIAL, NULL}, {"Sherwood", "Amphos 2.0", DC_FAMILY_OCEANIC_ATOM2, 0x4657, DC_TRANSPORT_SERIAL, NULL},
{"Sherwood", "Beacon", DC_FAMILY_OCEANIC_ATOM2, 0x4742, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, dc_filter_oceanic}, {"Sherwood", "Beacon", DC_FAMILY_OCEANIC_ATOM2, 0x4742, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, dc_filter_oceanic},
{"Aqualung", "i470TC", DC_FAMILY_OCEANIC_ATOM2, 0x4743, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, dc_filter_oceanic}, {"Aqualung", "i470TC", DC_FAMILY_OCEANIC_ATOM2, 0x4743, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, dc_filter_oceanic},
{"Aqualung", "i200C", DC_FAMILY_OCEANIC_ATOM2, 0x4749, 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},
{"Mares", "Nemo Steel", DC_FAMILY_MARES_NEMO, 0, DC_TRANSPORT_SERIAL, NULL}, {"Mares", "Nemo Steel", DC_FAMILY_MARES_NEMO, 0, DC_TRANSPORT_SERIAL, NULL},
@ -690,6 +691,7 @@ static int dc_filter_oceanic (dc_transport_t transport, const void *userdata, vo
0x4656, // Oceanic Pro Plus 4 0x4656, // Oceanic Pro Plus 4
0x4742, // Sherwood Beacon 0x4742, // Sherwood Beacon
0x4743, // Aqualung i470TC 0x4743, // Aqualung i470TC
0x4749, // Aqualung i200C
}; };
if (transport == DC_TRANSPORT_BLE) { if (transport == DC_TRANSPORT_BLE) {

1
src/oceanic_atom2.c
View File

@ -477,6 +477,7 @@ static const oceanic_common_version_t versions[] = {
{"AQUA550C \0\0 1024", 0, &oceanic_oc1_layout}, {"AQUA550C \0\0 1024", 0, &oceanic_oc1_layout},
{"WISDOM04 \0\0 1024", 0, &oceanic_oc1_layout}, {"WISDOM04 \0\0 1024", 0, &oceanic_oc1_layout},
{"AQUA470C \0\0 1024", 0, &oceanic_oc1_layout}, {"AQUA470C \0\0 1024", 0, &oceanic_oc1_layout},
{"AQUA200C \0\0 1024", 0, &oceanic_oc1_layout},
{"OCEANOCI \0\0 1024", 0, &oceanic_oci_layout}, {"OCEANOCI \0\0 1024", 0, &oceanic_oci_layout},

15
src/oceanic_atom2_parser.c
View File

@ -100,6 +100,7 @@
#define AMPHOS2 0x4657 #define AMPHOS2 0x4657
#define BEACON 0x4742 #define BEACON 0x4742
#define I470TC 0x4743 #define I470TC 0x4743
#define I200CV2 0x4749
#define NORMAL 0 #define NORMAL 0
#define GAUGE 1 #define GAUGE 1
@ -196,7 +197,8 @@ 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 || model == WISDOM4) { } else if (model == I550C || model == WISDOM4 ||
model == I200CV2) {
parser->headersize = 5 * PAGESIZE / 2; parser->headersize = 5 * PAGESIZE / 2;
} }
@ -277,6 +279,7 @@ oceanic_atom2_parser_get_datetime (dc_parser_t *abstract, dc_datetime_t *datetim
case XPAIR: case XPAIR:
case WISDOM4: case WISDOM4:
case I470TC: case I470TC:
case I200CV2:
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);
@ -749,8 +752,8 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
parser->model == MANTA || parser->model == I300 || parser->model == MANTA || parser->model == I300 ||
parser->model == I200 || parser->model == I100 || parser->model == I200 || parser->model == I100 ||
parser->model == I300C || parser->model == TALIS || parser->model == I300C || parser->model == TALIS ||
parser->model == I200C || parser->model == GEO40 || parser->model == I200C || parser->model == I200CV2 ||
parser->model == VEO40) { parser->model == GEO40 || parser->model == VEO40) {
have_pressure = 0; have_pressure = 0;
} }
@ -911,7 +914,7 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
parser->model == I200 || parser->model == I100 || parser->model == I200 || parser->model == I100 ||
parser->model == I300C || parser->model == I200C || parser->model == I300C || parser->model == I200C ||
parser->model == GEO40 || parser->model == VEO40 || parser->model == GEO40 || parser->model == VEO40 ||
parser->model == I470TC) { parser->model == I470TC || parser->model == I200CV2) {
temperature = data[offset + 3]; temperature = data[offset + 3];
} else if (parser->model == OCS || parser->model == TX1) { } else if (parser->model == OCS || parser->model == TX1) {
temperature = data[offset + 1]; temperature = data[offset + 1];
@ -990,7 +993,7 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
parser->model == I200 || parser->model == I100 || parser->model == I200 || parser->model == I100 ||
parser->model == I300C || parser->model == I200C || parser->model == I300C || parser->model == I200C ||
parser->model == GEO40 || parser->model == VEO40 || parser->model == GEO40 || parser->model == VEO40 ||
parser->model == I470TC) parser->model == I470TC || parser->model == I200CV2)
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;
@ -1046,7 +1049,7 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
parser->model == I100 || parser->model == I300C || parser->model == I100 || parser->model == I300C ||
parser->model == I450T || parser->model == I200C || parser->model == I450T || parser->model == I200C ||
parser->model == GEO40 || parser->model == VEO40 || parser->model == GEO40 || parser->model == VEO40 ||
parser->model == I470TC) { parser->model == I470TC || parser->model == I200CV2) {
decostop = (data[offset + 7] & 0xF0) >> 4; decostop = (data[offset + 7] & 0xF0) >> 4;
decotime = array_uint16_le(data + offset + 6) & 0x0FFF; decotime = array_uint16_le(data + offset + 6) & 0x0FFF;
have_deco = 1; have_deco = 1;