From f8d25fc49f2ed52e780865a929f4cf294aa9f49d Mon Sep 17 00:00:00 2001 From: Jef Driesen Date: Thu, 9 Jul 2015 23:43:34 +0200 Subject: [PATCH] Remove the event bytes from the vendor sample. 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. --- src/uwatec_smart_parser.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/uwatec_smart_parser.c b/src/uwatec_smart_parser.c index d9e18de..b8813dd 100644 --- a/src/uwatec_smart_parser.c +++ b/src/uwatec_smart_parser.c @@ -866,7 +866,6 @@ uwatec_smart_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t double pressure = 0; unsigned int heartrate = 0; unsigned int bearing = 0; - unsigned char alarms[3] = {0, 0, 0}; unsigned int bookmark = 0; // 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); 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; while (offset < size) { @@ -1001,8 +1000,6 @@ uwatec_smart_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t have_bearing = 1; break; case ALARMS: - alarms[table[id].index] = value; - have_alarms = 1; idx = table[id].index; if (idx >= NEVENTS || parser->events[idx] == NULL) { 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 (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) { sample.rbt = rbt; if (callback) callback (DC_SAMPLE_RBT, sample, userdata);