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

Use the new settings field for the salinity.

Browse Source 
Since the salinity bit is stored in the settings, there is no need for a
separate salinity entry in the header tables.
This commit is contained in:
Jef Driesen 2016-08-15 10:56:04 +02:00
parent bfcd707889
commit 0ab2d8ccda
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/uwatec_smart_parser.c
View File

@ -62,6 +62,7 @@
#define FREEDIVE1 0x00000080
#define FREEDIVE2 0x00000200
#define GAUGE 0x00001000
#define SALINITY 0x00100000
typedef enum {
PRESSURE_DEPTH,
@ -96,7 +97,6 @@ typedef struct uwatec_smart_header_info_t {
unsigned int temp_maximum;
unsigned int temp_surface;
unsigned int tankpressure;
unsigned int salinity;
unsigned int timezone;
unsigned int settings;
} uwatec_smart_header_info_t;
@ -177,7 +177,6 @@ uwatec_smart_header_info_t uwatec_smart_pro_header = {
UNSUPPORTED, /* temp_maximum */
UNSUPPORTED, /* temp_surface */
UNSUPPORTED, /* tankpressure */
UNSUPPORTED, /* salinity */
UNSUPPORTED, /* timezone */
UNSUPPORTED, /* settings */
};
@ -191,7 +190,6 @@ uwatec_smart_header_info_t uwatec_smart_galileo_header = {
28, /* temp_maximum */
32, /* temp_surface */
50, /* tankpressure */
94, /* salinity */
16, /* timezone */
92, /* settings */
};
@ -205,7 +203,6 @@ uwatec_smart_header_info_t uwatec_smart_aladin_tec_header = {
28, /* temp_maximum */
32, /* temp_surface */
UNSUPPORTED, /* tankpressure */
54, /* salinity */
16, /* timezone */
52, /* settings */
};
@ -219,7 +216,6 @@ uwatec_smart_header_info_t uwatec_smart_aladin_tec2g_header = {
28, /* temp_maximum */
32, /* temp_surface */
UNSUPPORTED, /* tankpressure */
62, /* salinity */
16, /* timezone */
60, /* settings */
};
@ -233,7 +229,6 @@ uwatec_smart_header_info_t uwatec_smart_com_header = {
UNSUPPORTED, /* temp_maximum */
UNSUPPORTED, /* temp_surface */
30, /* tankpressure */
UNSUPPORTED, /* salinity */
UNSUPPORTED, /* timezone */
UNSUPPORTED, /* settings */
};
@ -247,7 +242,6 @@ uwatec_smart_header_info_t uwatec_smart_tec_header = {
UNSUPPORTED, /* temp_maximum */
UNSUPPORTED, /* temp_surface */
34, /* tankpressure */
UNSUPPORTED, /* salinity */
UNSUPPORTED, /* timezone */
UNSUPPORTED, /* settings */
};
@ -450,6 +444,7 @@ 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);
@ -474,6 +469,11 @@ uwatec_smart_parser_cache (uwatec_smart_parser_t *parser)
} else {
divemode = DC_DIVEMODE_OC;
}
// Get the water type.
if (settings & SALINITY) {
watertype = DC_WATER_SALT;
}
}
// Get the gas mixes and tanks.
@ -526,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.
parser->trimix = trimix;
parser->ngasmixes = ngasmixes;
@ -805,7 +797,7 @@ uwatec_smart_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsi
*((dc_divemode_t *) value) = parser->divemode;
break;
case DC_FIELD_SALINITY:
if (table->salinity == UNSUPPORTED)
if (table->settings == UNSUPPORTED)
return DC_STATUS_UNSUPPORTED;
water->type = parser->watertype;
water->density = salinity * 1000.0;