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

Merge branch 'temperature'

Browse Source
This commit is contained in:
Jef Driesen 2014-11-07 21:59:31 +01:00
commit ed0cbf818d
11 changed files with 110 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
examples/universal.c
View File

@ -361,6 +361,28 @@ doparse (FILE *fp, dc_device_t *device, const unsigned char data[], unsigned int
fprintf (fp, "<divetime>%02u:%02u</divetime>\n",
divetime / 60, divetime % 60);
// Parse the temperature.
message ("Parsing the temperature.\n");
for (unsigned int i = 0; i < 3; ++i) {
dc_field_type_t fields[] = {DC_FIELD_TEMPERATURE_SURFACE,
DC_FIELD_TEMPERATURE_MINIMUM,
DC_FIELD_TEMPERATURE_MAXIMUM};
const char *names[] = {"surface", "minimum", "maximum"};
double temperature = 0.0;
rc = dc_parser_get_field (parser, fields[i], 0, &temperature);
if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) {
WARNING ("Error parsing the temperature.");
dc_parser_destroy (parser);
return rc;
}
if (rc != DC_STATUS_UNSUPPORTED) {
fprintf (fp, "<temperature type=\"%s\">%.1f</temperature>\n",
names[i], temperature);
}
}
// Parse the maxdepth.
message ("Parsing the maxdepth.\n");
double maxdepth = 0.0;

5
include/libdivecomputer/parser.h
View File

@ -53,7 +53,10 @@ typedef enum dc_field_type_t {
DC_FIELD_GASMIX_COUNT,
DC_FIELD_GASMIX,
DC_FIELD_SALINITY,
DC_FIELD_ATMOSPHERIC
DC_FIELD_ATMOSPHERIC,
DC_FIELD_TEMPERATURE_SURFACE,
DC_FIELD_TEMPERATURE_MINIMUM,
DC_FIELD_TEMPERATURE_MAXIMUM
} dc_field_type_t;
typedef enum parser_sample_event_t {

3
src/atomics_cobalt_parser.c
View File

@ -173,6 +173,9 @@ atomics_cobalt_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, un
gasmix->oxygen = p[SZ_HEADER + SZ_GASMIX * flags + 4] / 100.0;
gasmix->nitrogen = 1.0 - gasmix->oxygen - gasmix->helium;
break;
case DC_FIELD_TEMPERATURE_SURFACE:
*((double *) value) = (p[0x1B] - 32.0) * (5.0 / 9.0);
break;
default:
return DC_STATUS_UNSUPPORTED;
}

3
src/cressi_leonardo_parser.c
View File

@ -139,6 +139,9 @@ cressi_leonardo_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, u
gasmix->oxygen = data[0x19] / 100.0;
gasmix->nitrogen = 1.0 - gasmix->oxygen - gasmix->helium;
break;
case DC_FIELD_TEMPERATURE_MINIMUM:
*((double *) value) = data[0x22];
break;
default:
return DC_STATUS_UNSUPPORTED;
}

7
src/hw_ostc_parser.c
View File

@ -53,6 +53,7 @@ typedef struct hw_ostc_layout_t {
unsigned int atmospheric;
unsigned int salinity;
unsigned int duration;
unsigned int temperature;
} hw_ostc_layout_t;
typedef struct hw_ostc_gasmix_t {
@ -82,6 +83,7 @@ static const hw_ostc_layout_t hw_ostc_layout_ostc = {
15, /* atmospheric */
43, /* salinity */
47, /* duration */
13, /* temperature */
};
static const hw_ostc_layout_t hw_ostc_layout_frog = {
@ -91,6 +93,7 @@ static const hw_ostc_layout_t hw_ostc_layout_frog = {
21, /* atmospheric */
43, /* salinity */
47, /* duration */
19, /* temperature */
};
static const hw_ostc_layout_t hw_ostc_layout_ostc3 = {
@ -100,6 +103,7 @@ static const hw_ostc_layout_t hw_ostc_layout_ostc3 = {
24, /* atmospheric */
70, /* salinity */
75, /* duration */
22, /* temperature */
};
dc_status_t
@ -316,6 +320,9 @@ hw_ostc_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsigned
case DC_FIELD_ATMOSPHERIC:
*((double *) value) = array_uint16_le (data + layout->atmospheric) / 1000.0;
break;
case DC_FIELD_TEMPERATURE_MINIMUM:
*((double *) value) = (signed short) array_uint16_le (data + layout->temperature) / 10.0;
break;
default:
return DC_STATUS_UNSUPPORTED;
}

3
src/mares_darwin_parser.c
View File

@ -156,6 +156,9 @@ mares_darwin_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsi
gasmix->oxygen = 0.21;
gasmix->nitrogen = 1.0 - gasmix->oxygen - gasmix->helium;
break;
case DC_FIELD_TEMPERATURE_MINIMUM:
*((double *) value) = (signed char) p[0x0A];
break;
default:
return DC_STATUS_UNSUPPORTED;
}

6
src/mares_iconhd_parser.c
View File

@ -252,6 +252,12 @@ mares_iconhd_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsi
// Pressure (1/8 millibar)
*((double *) value) = array_uint16_le (p + 0x26) / 8000.0;
break;
case DC_FIELD_TEMPERATURE_MINIMUM:
*((double *) value) = (signed short) array_uint16_le (p + 0x46) / 10.0;
break;
case DC_FIELD_TEMPERATURE_MAXIMUM:
*((double *) value) = (signed short) array_uint16_le (p + 0x48) / 10.0;
break;
default:
return DC_STATUS_UNSUPPORTED;
}

6
src/mares_nemo_parser.c
View File

@ -253,6 +253,9 @@ mares_nemo_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsign
gasmix->helium = 0.0;
gasmix->nitrogen = 1.0 - gasmix->oxygen - gasmix->helium;
break;
case DC_FIELD_TEMPERATURE_MINIMUM:
*((double *) value) = (signed char) p[53 - 11];
break;
default:
return DC_STATUS_UNSUPPORTED;
}
@ -272,6 +275,9 @@ mares_nemo_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsign
case DC_FIELD_GASMIX_COUNT:
*((unsigned int *) value) = 0;
break;
case DC_FIELD_TEMPERATURE_MINIMUM:
*((double *) value) = (signed char) p[28 - 11];
break;
default:
return DC_STATUS_UNSUPPORTED;
}

11
src/suunto_vyper_parser.c
View File

@ -37,6 +37,7 @@ struct suunto_vyper_parser_t {
unsigned int cached;
unsigned int divetime;
unsigned int maxdepth;
unsigned int marker;
};
static dc_status_t suunto_vyper_parser_set_data (dc_parser_t *abstract, const unsigned char *data, unsigned int size);
@ -75,6 +76,7 @@ suunto_vyper_parser_create (dc_parser_t **out, dc_context_t *context)
parser->cached = 0;
parser->divetime = 0;
parser->maxdepth = 0;
parser->marker = 0;
*out = (dc_parser_t*) parser;
@ -101,6 +103,7 @@ suunto_vyper_parser_set_data (dc_parser_t *abstract, const unsigned char *data,
parser->cached = 0;
parser->divetime = 0;
parser->maxdepth = 0;
parser->marker = 0;
return DC_STATUS_SUCCESS;
}
@ -138,6 +141,7 @@ suunto_vyper_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsi
if (size < 18)
return DC_STATUS_DATAFORMAT;
if (!parser->cached) {
unsigned int interval = data[3];
unsigned int nsamples = 0;
@ -161,6 +165,7 @@ suunto_vyper_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsi
parser->cached = 1;
parser->divetime = nsamples * interval;
parser->maxdepth = maxdepth;
parser->marker = marker;
}
dc_gasmix_t *gas = (dc_gasmix_t *) value;
@ -187,6 +192,12 @@ suunto_vyper_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsi
gas->oxygen = 0.21;
gas->nitrogen = 1.0 - gas->oxygen;
break;
case DC_FIELD_TEMPERATURE_SURFACE:
*((double *) value) = (signed char) data[8];
break;
case DC_FIELD_TEMPERATURE_MINIMUM:
*((double *) value) = (signed char) data[parser->marker + 1];
break;
default:
return DC_STATUS_UNSUPPORTED;
}

3
src/uwatec_memomouse_parser.c
View File

@ -167,6 +167,9 @@ uwatec_memomouse_parser_get_field (dc_parser_t *abstract, dc_field_type_t type,
}
gasmix->nitrogen = 1.0 - gasmix->oxygen - gasmix->helium;
break;
case DC_FIELD_TEMPERATURE_MINIMUM:
*((double *) value) = (signed char) data[15] / 4.0;
break;
default:
return DC_STATUS_UNSUPPORTED;
}

48
src/uwatec_smart_parser.c
View File

@ -46,6 +46,8 @@
#define SMARTZ 0x1C
#define MERIDIAN 0x20
#define UNSUPPORTED 0xFFFFFFFF
typedef enum {
PRESSURE_DEPTH,
RBT,
@ -65,6 +67,9 @@ typedef struct uwatec_smart_header_info_t {
unsigned int divetime;
unsigned int gasmix;
unsigned int ngases;
unsigned int temp_minimum;
unsigned int temp_maximum;
unsigned int temp_surface;
} uwatec_smart_header_info_t;
typedef struct uwatec_smart_sample_info_t {
@ -108,42 +113,60 @@ static const
uwatec_smart_header_info_t uwatec_smart_pro_header = {
18,
20,
24, 1
24, 1,
22, /* temp_minimum */
UNSUPPORTED, /* temp_maximum */
UNSUPPORTED, /* temp_surface */
};
static const
uwatec_smart_header_info_t uwatec_smart_galileo_header = {
22,
26,
44, 3
44, 3,
30, /* temp_minimum */
28, /* temp_maximum */
32, /* temp_surface */
};
static const
uwatec_smart_header_info_t uwatec_smart_aladin_tec_header = {
22,
24,
30, 1
30, 1,
26, /* temp_minimum */
28, /* temp_maximum */
32, /* temp_surface */
};
static const
uwatec_smart_header_info_t uwatec_smart_aladin_tec2g_header = {
22,
26,
34, 3
34, 3,
30, /* temp_minimum */
28, /* temp_maximum */
32, /* temp_surface */
};
static const
uwatec_smart_header_info_t uwatec_smart_com_header = {
18,
20,
24, 1
24, 1,
22, /* temp_minimum */
UNSUPPORTED, /* temp_maximum */
UNSUPPORTED, /* temp_surface */
};
static const
uwatec_smart_header_info_t uwatec_smart_tec_header = {
18,
20,
28, 3
28, 3,
22, /* temp_minimum */
UNSUPPORTED, /* temp_maximum */
UNSUPPORTED, /* temp_surface */
};
static const
@ -384,6 +407,19 @@ uwatec_smart_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsi
gasmix->oxygen = data[table->gasmix + flags * 2] / 100.0;
gasmix->nitrogen = 1.0 - gasmix->oxygen - gasmix->helium;
break;
case DC_FIELD_TEMPERATURE_MINIMUM:
*((double *) value) = (signed short) array_uint16_le (data + table->temp_minimum) / 10.0;
break;
case DC_FIELD_TEMPERATURE_MAXIMUM:
if (table->temp_maximum == UNSUPPORTED)
return DC_STATUS_UNSUPPORTED;
*((double *) value) = (signed short) array_uint16_le (data + table->temp_maximum) / 10.0;
break;
case DC_FIELD_TEMPERATURE_SURFACE:
if (table->temp_surface == UNSUPPORTED)
return DC_STATUS_UNSUPPORTED;
*((double *) value) = (signed short) array_uint16_le (data + table->temp_surface) / 10.0;
break;
default:
return DC_STATUS_UNSUPPORTED;
}