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

Merge https://github.com/libdivecomputer/libdivecomputer into Subsurface-NG

Browse Source 
Merge upstream updates from Jef Driesen.

This fixes the parsing of the Uwatec Aladin Tec (and Tec 2G) by adding a
missing event descriptor.

* 'master' of https://github.com/libdivecomputer/libdivecomputer:
  Add a missing event descriptor
This commit is contained in:
Linus Torvalds 2018-06-21 07:56:13 +09:00
commit 5255ba5448
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/uwatec_smart_parser.c
View File

@ -365,6 +365,11 @@ uwatec_smart_event_info_t uwatec_smart_aladintec_events_0[] = {
{EV_UNKNOWN, 0x08, 3}, {EV_UNKNOWN, 0x08, 3},
}; };
static const
uwatec_smart_event_info_t uwatec_smart_aladintec_events_1[] = {
{EV_UNKNOWN, 0xFF, 0},
};
static const static const
uwatec_smart_event_info_t uwatec_smart_aladintec2g_events_0[] = { uwatec_smart_event_info_t uwatec_smart_aladintec2g_events_0[] = {
{EV_WARNING, 0x01, 0}, {EV_WARNING, 0x01, 0},
@ -634,7 +639,9 @@ uwatec_smart_parser_create (dc_parser_t **out, dc_context_t *context, unsigned i
parser->samples = uwatec_smart_aladin_samples; parser->samples = uwatec_smart_aladin_samples;
parser->nsamples = C_ARRAY_SIZE (uwatec_smart_aladin_samples); parser->nsamples = C_ARRAY_SIZE (uwatec_smart_aladin_samples);
parser->events[0] = uwatec_smart_aladintec_events_0; parser->events[0] = uwatec_smart_aladintec_events_0;
parser->events[1] = uwatec_smart_aladintec_events_1;
parser->nevents[0] = C_ARRAY_SIZE (uwatec_smart_aladintec_events_0); parser->nevents[0] = C_ARRAY_SIZE (uwatec_smart_aladintec_events_0);
parser->nevents[1] = C_ARRAY_SIZE (uwatec_smart_aladintec_events_1);
break; break;
case ALADINTEC2G: case ALADINTEC2G:
parser->headersize = 116; parser->headersize = 116;