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

Remove the event bytes from the vendor sample.

Browse Source 
Now that we are able to parse the event bytes properly, there is no need
to pass the raw event bytes to the application.

In the current implementation, the vendor event was broken for devices
with multiple event bytes anyway. Because we deliver all event bytes at
once, the application doesn't know which bytes contain a valid value
(originating from the profile data) or just a dummy zero value.
This commit is contained in:
Jef Driesen 2015-07-09 23:43:34 +02:00
parent efe7e52bbe
commit f8d25fc49f
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/uwatec_smart_parser.c
View File

@ -866,7 +866,6 @@ uwatec_smart_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t
double pressure = 0; double pressure = 0;
unsigned int heartrate = 0; unsigned int heartrate = 0;
unsigned int bearing = 0; unsigned int bearing = 0;
unsigned char alarms[3] = {0, 0, 0};
unsigned int bookmark = 0; unsigned int bookmark = 0;
// Previous gas mix - initialize with impossible value // Previous gas mix - initialize with impossible value
@ -875,7 +874,7 @@ 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);
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_alarms = 0, have_bearing = 0; have_heartrate = 0, have_bearing = 0;
unsigned int offset = header; unsigned int offset = header;
while (offset < size) { while (offset < size) {
@ -1001,8 +1000,6 @@ uwatec_smart_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t
have_bearing = 1; have_bearing = 1;
break; break;
case ALARMS: case ALARMS:
alarms[table[id].index] = value;
have_alarms = 1;
idx = table[id].index; idx = table[id].index;
if (idx >= NEVENTS || parser->events[idx] == NULL) { if (idx >= NEVENTS || parser->events[idx] == NULL) {
ERROR (abstract->context, "Unexpected event index."); ERROR (abstract->context, "Unexpected event index.");
@ -1127,15 +1124,6 @@ uwatec_smart_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t
if (callback) callback (DC_SAMPLE_EVENT, sample, userdata); if (callback) callback (DC_SAMPLE_EVENT, sample, userdata);
} }
if (have_alarms) {
sample.vendor.type = SAMPLE_VENDOR_UWATEC_SMART;
sample.vendor.size = nalarms;
sample.vendor.data = alarms;
if (callback) callback (DC_SAMPLE_VENDOR, sample, userdata);
memset (alarms, 0, sizeof (alarms));
have_alarms = 0;
}
if (have_rbt || have_pressure) { if (have_rbt || have_pressure) {
sample.rbt = rbt; sample.rbt = rbt;
if (callback) callback (DC_SAMPLE_RBT, sample, userdata); if (callback) callback (DC_SAMPLE_RBT, sample, userdata);