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

Merge branch 'uwatec'

Browse Source
This commit is contained in:
Jef Driesen 2016-08-18 23:32:41 +02:00
commit 2e40d35da4
1 changed files with 62 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/uwatec_smart_parser.c
View File

@ -59,6 +59,11 @@
#define FRESH 1.000 #define FRESH 1.000
#define SALT 1.025 #define SALT 1.025
#define FREEDIVE1 0x00000080
#define FREEDIVE2 0x00000200
#define GAUGE 0x00001000
#define SALINITY 0x00100000
typedef enum { typedef enum {
PRESSURE_DEPTH, PRESSURE_DEPTH,
RBT, RBT,
@ -92,8 +97,8 @@ typedef struct uwatec_smart_header_info_t {
unsigned int temp_maximum; unsigned int temp_maximum;
unsigned int temp_surface; unsigned int temp_surface;
unsigned int tankpressure; unsigned int tankpressure;
unsigned int salinity;
unsigned int timezone; unsigned int timezone;
unsigned int settings;
} uwatec_smart_header_info_t; } uwatec_smart_header_info_t;
typedef struct uwatec_smart_sample_info_t { typedef struct uwatec_smart_sample_info_t {
@ -145,6 +150,7 @@ struct uwatec_smart_parser_t {
unsigned int ntanks; unsigned int ntanks;
uwatec_smart_tank_t tank[NGASMIXES]; uwatec_smart_tank_t tank[NGASMIXES];
dc_water_t watertype; dc_water_t watertype;
dc_divemode_t divemode;
}; };
static dc_status_t uwatec_smart_parser_set_data (dc_parser_t *abstract, const unsigned char *data, unsigned int size); static dc_status_t uwatec_smart_parser_set_data (dc_parser_t *abstract, const unsigned char *data, unsigned int size);
@ -171,8 +177,8 @@ uwatec_smart_header_info_t uwatec_smart_pro_header = {
UNSUPPORTED, /* temp_maximum */ UNSUPPORTED, /* temp_maximum */
UNSUPPORTED, /* temp_surface */ UNSUPPORTED, /* temp_surface */
UNSUPPORTED, /* tankpressure */ UNSUPPORTED, /* tankpressure */
UNSUPPORTED, /* salinity */
UNSUPPORTED, /* timezone */ UNSUPPORTED, /* timezone */
UNSUPPORTED, /* settings */
}; };
static const static const
@ -184,8 +190,8 @@ uwatec_smart_header_info_t uwatec_smart_galileo_header = {
28, /* temp_maximum */ 28, /* temp_maximum */
32, /* temp_surface */ 32, /* temp_surface */
50, /* tankpressure */ 50, /* tankpressure */
94, /* salinity */
16, /* timezone */ 16, /* timezone */
92, /* settings */
}; };
static const static const
@ -197,8 +203,8 @@ uwatec_smart_header_info_t uwatec_smart_aladin_tec_header = {
28, /* temp_maximum */ 28, /* temp_maximum */
32, /* temp_surface */ 32, /* temp_surface */
UNSUPPORTED, /* tankpressure */ UNSUPPORTED, /* tankpressure */
UNSUPPORTED, /* salinity */
16, /* timezone */ 16, /* timezone */
52, /* settings */
}; };
static const static const
@ -210,8 +216,8 @@ uwatec_smart_header_info_t uwatec_smart_aladin_tec2g_header = {
28, /* temp_maximum */ 28, /* temp_maximum */
32, /* temp_surface */ 32, /* temp_surface */
UNSUPPORTED, /* tankpressure */ UNSUPPORTED, /* tankpressure */
62, /* salinity */
16, /* timezone */ 16, /* timezone */
60, /* settings */
}; };
static const static const
@ -223,8 +229,8 @@ uwatec_smart_header_info_t uwatec_smart_com_header = {
UNSUPPORTED, /* temp_maximum */ UNSUPPORTED, /* temp_maximum */
UNSUPPORTED, /* temp_surface */ UNSUPPORTED, /* temp_surface */
30, /* tankpressure */ 30, /* tankpressure */
UNSUPPORTED, /* salinity */
UNSUPPORTED, /* timezone */ UNSUPPORTED, /* timezone */
UNSUPPORTED, /* settings */
}; };
static const static const
@ -236,8 +242,8 @@ uwatec_smart_header_info_t uwatec_smart_tec_header = {
UNSUPPORTED, /* temp_maximum */ UNSUPPORTED, /* temp_maximum */
UNSUPPORTED, /* temp_surface */ UNSUPPORTED, /* temp_surface */
34, /* tankpressure */ 34, /* tankpressure */
UNSUPPORTED, /* salinity */
UNSUPPORTED, /* timezone */ UNSUPPORTED, /* timezone */
UNSUPPORTED, /* settings */
}; };
static const static const
@ -436,6 +442,40 @@ uwatec_smart_parser_cache (uwatec_smart_parser_t *parser)
} }
} }
// Get the settings.
dc_divemode_t divemode = DC_DIVEMODE_OC;
dc_water_t watertype = DC_WATER_FRESH;
if (header->settings != UNSUPPORTED) {
unsigned int settings = array_uint32_le (data + header->settings);
// Get the freedive/gauge bits.
unsigned int freedive = 0;
unsigned int gauge = (settings & GAUGE) != 0;
if (parser->model == ALADINTEC) {
freedive = 0;
} else if (parser->model == ALADINTEC2G) {
freedive = (settings & FREEDIVE2) != 0;
} else {
freedive = (settings & FREEDIVE1) != 0;
}
// Get the dive mode. The freedive bit needs to be checked
// first, because freedives have both the freedive and gauge
// bits set.
if (freedive) {
divemode = DC_DIVEMODE_FREEDIVE;
} else if (gauge) {
divemode = DC_DIVEMODE_GAUGE;
} else {
divemode = DC_DIVEMODE_OC;
}
// Get the water type.
if (settings & SALINITY) {
watertype = DC_WATER_SALT;
}
}
// Get the gas mixes and tanks. // Get the gas mixes and tanks.
unsigned int ntanks = 0; unsigned int ntanks = 0;
unsigned int ngasmixes = 0; unsigned int ngasmixes = 0;
@ -461,7 +501,8 @@ uwatec_smart_parser_cache (uwatec_smart_parser_t *parser)
unsigned int beginpressure = 0; unsigned int beginpressure = 0;
unsigned int endpressure = 0; unsigned int endpressure = 0;
if (header->tankpressure != UNSUPPORTED) { if (header->tankpressure != UNSUPPORTED &&
divemode != DC_DIVEMODE_FREEDIVE) {
if (parser->model == GALILEO || parser->model == GALILEOTRIMIX || if (parser->model == GALILEO || parser->model == GALILEOTRIMIX ||
parser->model == ALADIN2G || parser->model == MERIDIAN || parser->model == ALADIN2G || parser->model == MERIDIAN ||
parser->model == CHROMIS || parser->model == MANTIS2) { parser->model == CHROMIS || parser->model == MANTIS2) {
@ -485,14 +526,6 @@ uwatec_smart_parser_cache (uwatec_smart_parser_t *parser)
} }
} }
// Get the water type.
dc_water_t watertype = DC_WATER_FRESH;
if (header->salinity != UNSUPPORTED) {
if (data[header->salinity] & 0x10) {
watertype = DC_WATER_SALT;
}
}
// Cache the data for later use. // Cache the data for later use.
parser->trimix = trimix; parser->trimix = trimix;
parser->ngasmixes = ngasmixes; parser->ngasmixes = ngasmixes;
@ -504,6 +537,7 @@ uwatec_smart_parser_cache (uwatec_smart_parser_t *parser)
parser->tank[i] = tank[i]; parser->tank[i] = tank[i];
} }
parser->watertype = watertype; parser->watertype = watertype;
parser->divemode = divemode;
parser->cached = HEADER; parser->cached = HEADER;
return DC_STATUS_SUCCESS; return DC_STATUS_SUCCESS;
@ -614,6 +648,7 @@ uwatec_smart_parser_create (dc_parser_t **out, dc_context_t *context, unsigned i
parser->tank[i].gasmix = 0; parser->tank[i].gasmix = 0;
} }
parser->watertype = DC_WATER_FRESH; parser->watertype = DC_WATER_FRESH;
parser->divemode = DC_DIVEMODE_OC;
*out = (dc_parser_t*) parser; *out = (dc_parser_t*) parser;
@ -645,6 +680,7 @@ uwatec_smart_parser_set_data (dc_parser_t *abstract, const unsigned char *data,
parser->tank[i].gasmix = 0; parser->tank[i].gasmix = 0;
} }
parser->watertype = DC_WATER_FRESH; parser->watertype = DC_WATER_FRESH;
parser->divemode = DC_DIVEMODE_OC;
return DC_STATUS_SUCCESS; return DC_STATUS_SUCCESS;
} }
@ -756,13 +792,12 @@ uwatec_smart_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsi
*((double *) value) = (signed short) array_uint16_le (data + table->temp_surface) / 10.0; *((double *) value) = (signed short) array_uint16_le (data + table->temp_surface) / 10.0;
break; break;
case DC_FIELD_DIVEMODE: case DC_FIELD_DIVEMODE:
if (parser->ngasmixes) if (table->settings == UNSUPPORTED)
*((dc_divemode_t *) value) = DC_DIVEMODE_OC; return DC_STATUS_UNSUPPORTED;
else *((dc_divemode_t *) value) = parser->divemode;
*((dc_divemode_t *) value) = DC_DIVEMODE_GAUGE;
break; break;
case DC_FIELD_SALINITY: case DC_FIELD_SALINITY:
if (table->salinity == UNSUPPORTED) if (table->settings == UNSUPPORTED)
return DC_STATUS_UNSUPPORTED; return DC_STATUS_UNSUPPORTED;
water->type = parser->watertype; water->type = parser->watertype;
water->density = salinity * 1000.0; water->density = salinity * 1000.0;
@ -882,6 +917,11 @@ uwatec_smart_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t
double salinity = (parser->watertype == DC_WATER_SALT ? SALT : FRESH); double salinity = (parser->watertype == DC_WATER_SALT ? SALT : FRESH);
unsigned int interval = 4;
if (parser->divemode == DC_DIVEMODE_FREEDIVE) {
interval = 1;
}
int have_depth = 0, have_temperature = 0, have_pressure = 0, have_rbt = 0, int have_depth = 0, have_temperature = 0, have_pressure = 0, have_rbt = 0,
have_heartrate = 0, have_bearing = 0; have_heartrate = 0, have_bearing = 0;
@ -1168,7 +1208,7 @@ uwatec_smart_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t
if (callback) callback (DC_SAMPLE_DEPTH, sample, userdata); if (callback) callback (DC_SAMPLE_DEPTH, sample, userdata);
} }
time += 4; time += interval;
complete--; complete--;
} }
} }