diff --git a/src/descriptor.c b/src/descriptor.c index 85f6622..c474e35 100644 --- a/src/descriptor.c +++ b/src/descriptor.c @@ -174,6 +174,7 @@ static const dc_descriptor_t g_descriptors[] = { {"Aeris", "A300", DC_FAMILY_OCEANIC_ATOM2, 0x445A}, {"Hollis", "TX1", DC_FAMILY_OCEANIC_ATOM2, 0x4542}, {"Sherwood", "Amphos", DC_FAMILY_OCEANIC_ATOM2, 0x4545}, + {"Sherwood", "Amphos Air", DC_FAMILY_OCEANIC_ATOM2, 0x4546}, {"Oceanic", "Pro Plus 3", DC_FAMILY_OCEANIC_ATOM2, 0x4548}, {"Aeris", "F11", DC_FAMILY_OCEANIC_ATOM2, 0x4549}, {"Oceanic", "OCi", DC_FAMILY_OCEANIC_ATOM2, 0x454B}, diff --git a/src/oceanic_atom2.c b/src/oceanic_atom2.c index 25e9d9f..7e97858 100644 --- a/src/oceanic_atom2.c +++ b/src/oceanic_atom2.c @@ -131,6 +131,7 @@ static const oceanic_common_version_t oceanic_default_version[] = { static const oceanic_common_version_t tusa_zenair_version[] = { {"TUZENAIR \0\0 512K"}, {"AMPHOSSW \0\0 512K"}, + {"AMPHOAIR \0\0 512K"}, {"VOYAGE2G \0\0 512K"}, }; diff --git a/src/oceanic_atom2_parser.c b/src/oceanic_atom2_parser.c index efe4635..fac1fe2 100644 --- a/src/oceanic_atom2_parser.c +++ b/src/oceanic_atom2_parser.c @@ -68,6 +68,7 @@ #define A300 0x445A #define TX1 0x4542 #define AMPHOS 0x4545 +#define AMPHOSAIR 0x4546 #define PROPLUS3 0x4548 #define F11 0x4549 #define OCI 0x454B @@ -204,6 +205,7 @@ oceanic_atom2_parser_get_datetime (dc_parser_t *abstract, dc_datetime_t *datetim break; case ZENAIR: case AMPHOS: + case AMPHOSAIR: case VOYAGER2G: datetime->year = (p[3] & 0x0F) + 2000; datetime->month = (p[7] & 0xF0) >> 4; @@ -671,7 +673,8 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_ unsigned int sign; if (parser->model == DG03 || parser->model == PROPLUS3) 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) sign = (data[offset + 5] & 0x04) >> 2; else if (parser->model == ATOM2 || parser->model == PROPLUS21 || parser->model == EPICA || parser->model == EPICB || @@ -697,7 +700,8 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_ else if (parser->model == VT4 || parser->model == VT41|| parser->model == ATOM3 || parser->model == ATOM31 || parser->model == ZENAIR ||parser->model == A300AI || - parser->model == DG03 || parser->model == PROPLUS3) + parser->model == DG03 || parser->model == PROPLUS3 || + parser->model == AMPHOSAIR) pressure = (((data[offset + 0] & 0x03) << 8) + data[offset + 1]) * 5; else if (parser->model == TX1 || parser->model == A300CS || parser->model == VTX) pressure = array_uint16_le (data + offset + 4);