From 680752bc0fd5351e881c106883157cef55590cc9 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 7 May 2020 14:37:04 -0700 Subject: [PATCH] i770R: parse tank pressure and water salinity like the i750tc This needs to be checked. I'm not sure why Jef has different code here, but I'm keeping our Subsurface branch differences around. Signed-off-by: Linus Torvalds --- src/oceanic_atom2_parser.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/oceanic_atom2_parser.c b/src/oceanic_atom2_parser.c index 83b2588..a53d2af 100644 --- a/src/oceanic_atom2_parser.c +++ b/src/oceanic_atom2_parser.c @@ -580,7 +580,7 @@ oceanic_atom2_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, uns break; case DC_FIELD_SALINITY: if (parser->model == A300CS || parser->model == VTX || - parser->model == I750TC) { + parser->model == I750TC || parser->model == I770R) { if (data[0x18] & 0x80) { water->type = DC_WATER_FRESH; } else { @@ -771,7 +771,7 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_ if (have_pressure) { unsigned int idx = 2; if (parser->model == A300CS || parser->model == VTX || - parser->model == I750TC) + parser->model == I750TC || parser->model == I770R) idx = 16; pressure = array_uint16_le(data + parser->header + idx); if (pressure == 10000) @@ -824,7 +824,7 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_ tank = 0; pressure = (((data[offset + 7] << 8) + data[offset + 6]) & 0x0FFF); } else if (parser->model == A300CS || parser->model == VTX || - parser->model == I750TC) { + parser->model == I750TC || parser->model == I770R) { // Tank pressure (1 psi) and number (one based index) tank = (data[offset + 1] & 0x03) - 1; pressure = ((data[offset + 7] << 8) + data[offset + 6]) & 0x0FFF;