diff --git a/src/oceanic_atom2.c b/src/oceanic_atom2.c index c5d7a46..22c5baa 100644 --- a/src/oceanic_atom2.c +++ b/src/oceanic_atom2.c @@ -69,6 +69,7 @@ static const unsigned char oceanic_proplus2_version[] = "PROPLUS2 \0\0 512K"; static const unsigned char oceanic_atom1_version[] = "ATOM rev\0\0 256K"; static const unsigned char oceanic_atom2_version[] = "2M ATOM r\0\0 512K"; static const unsigned char oceanic_atom3_version[] = "OCEATOM3 \0\0 1024"; +static const unsigned char oceanic_atom31_version[] = "ATOM31 \0\0 1024"; static const unsigned char oceanic_vt4_version[] = "OCEANVT4 \0\0 1024"; static const unsigned char oceanic_vt41_version[] = "OCEAVT41 \0\0 1024"; static const unsigned char oceanic_geo2_version[] = "OCEGEO20 \0\0 512K"; @@ -333,6 +334,7 @@ oceanic_atom2_device_open (device_t **out, const char* name) if (oceanic_common_match (oceanic_oc1a_version, device->version, sizeof (device->version)) || oceanic_common_match (oceanic_oc1b_version, device->version, sizeof (device->version)) || oceanic_common_match (oceanic_atom3_version, device->version, sizeof (device->version)) || + oceanic_common_match (oceanic_atom31_version, device->version, sizeof (device->version)) || oceanic_common_match (oceanic_vt4_version, device->version, sizeof (device->version)) || oceanic_common_match (oceanic_vt41_version, device->version, sizeof (device->version))) device->base.layout = &oceanic_oc1_layout; diff --git a/src/oceanic_atom2_parser.c b/src/oceanic_atom2_parser.c index 96a0159..3ae3888 100644 --- a/src/oceanic_atom2_parser.c +++ b/src/oceanic_atom2_parser.c @@ -46,6 +46,7 @@ #define OC1B 0x4449 #define ATOM3 0x444C #define VT41 0x4452 +#define ATOM31 0x4456 typedef struct oceanic_atom2_parser_t oceanic_atom2_parser_t; @@ -159,6 +160,7 @@ oceanic_atom2_parser_get_datetime (parser_t *abstract, dc_datetime_t *datetime) case VT4: case VT41: case ATOM3: + case ATOM31: datetime->year = ((p[5] & 0xE0) >> 5) + ((p[7] & 0xE0) >> 2) + 2000; datetime->month = (p[3] & 0x0F); datetime->day = ((p[0] & 0x80) >> 3) + ((p[3] & 0xF0) >> 4); @@ -437,7 +439,7 @@ oceanic_atom2_parser_samples_foreach (parser_t *abstract, sample_callback_t call parser->model == VEO30 || parser->model == OC1A || parser->model == OC1B) { temperature = data[offset + 3]; - } else if (parser->model == VT4 || parser->model == VT41 || parser->model == ATOM3) { + } else if (parser->model == VT4 || parser->model == VT41 || parser->model == ATOM3 || parser->model == ATOM31) { temperature = ((data[offset + 7] & 0xF0) >> 4) | ((data[offset + 7] & 0x0C) << 2) | ((data[offset + 5] & 0x0C) << 4); } else { unsigned int sign; @@ -456,7 +458,7 @@ oceanic_atom2_parser_samples_foreach (parser_t *abstract, sample_callback_t call // Tank Pressure (psi) if (parser->model == OC1A || parser->model == OC1B) pressure = (data[offset + 10] + (data[offset + 11] << 8)) & 0x0FFF; - else if (parser->model == ZENAIR || parser->model == VT4 || parser->model == VT41|| parser->model == ATOM3) + else if (parser->model == ZENAIR || parser->model == VT4 || parser->model == VT41|| parser->model == ATOM3 || parser->model == ATOM31) pressure = (((data[offset + 0] & 0x03) << 8) + data[offset + 1]) * 5; else pressure -= data[offset + 1];