mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Restructure DLF sample parsing

Browse source 
There are more event types than 1, so parse that as a unsigned char and
not as a bool.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2014-12-29 23:43:30 +01:00 • committed by Dirk Hohndel
parent 3e5c1713d2
commit ab208c8fef
1 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
parse-xml.c
View file

@ -2534,7 +2534,8 @@ int parse_cobalt_buffer(sqlite3 *handle, const char *url, const char *buffer, in
int parse_dlf_buffer(unsigned char *buffer, size_t size) int parse_dlf_buffer(unsigned char *buffer, size_t size)
{ {
unsigned char *ptr = buffer; unsigned char *ptr = buffer;
bool event, found; unsigned char event;
bool found;
unsigned int time = 0; unsigned int time = 0;
int i; int i;
char serial[6]; char serial[6];
@ -2584,16 +2585,23 @@ int parse_dlf_buffer(unsigned char *buffer, size_t size)
((ptr[1] << 4) & 0xff0) + ((ptr[1] << 4) & 0xff0) +
(ptr[2] & 0x0f) * 3600; /* hours */ (ptr[2] & 0x0f) * 3600; /* hours */
event = ptr[0] & 0x0f; event = ptr[0] & 0x0f;
if (event == 1) { switch (event) {
case 0:
/* Regular sample */
sample_start();
cur_sample->time.seconds = time;
cur_sample->depth.mm = ((ptr[4] & 0xff) + ((ptr[5] << 8) & 0xff00)) * 10;
sample_end();
break;
case 1:
/* dive event */ /* dive event */
switch(ptr[4]) { event_start();
cur_event.time.seconds = time;
switch (ptr[4]) {
case 5: case 5:
event_start();
cur_event.time.seconds = time;
strcpy(cur_event.name, "gaschange"); strcpy(cur_event.name, "gaschange");
cur_event.type = 25; cur_event.type = 25;
cur_event.value = ptr[6]; cur_event.value = ptr[6];
event_end();
found = false; found = false;
for (i = 0; i < cur_cylinder_index; ++i) { for (i = 0; i < cur_cylinder_index; ++i) {
@ -2609,19 +2617,17 @@ int parse_dlf_buffer(unsigned char *buffer, size_t size)
} }
break; break;
case 6: case 6:
event_start();
cur_event.time.seconds = time;
strcpy(cur_event.name, "start"); strcpy(cur_event.name, "start");
event_end();
break; break;
default: default:
fprintf(stderr, "DEBUG (event): %d at time %d\n", ptr[4], time); fprintf(stderr, "DEBUG (event): %d at time %d\n", ptr[4], time);
break;
} }
} else { event_end();
sample_start(); break;
cur_sample->time.seconds = time; default:
cur_sample->depth.mm = ((ptr[4] & 0xff) + ((ptr[5] << 8) & 0xff00)) * 10; /* Unknown... */
sample_end(); break;
} }
ptr += 16; ptr += 16;
} }