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

Associate the events with the correct sample timestamp.

Browse Source
This commit is contained in:
Jef Driesen 2010-05-21 23:12:24 +02:00
parent 441aad3a40
commit fd9390e8a8
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/suunto_eon_parser.c
View File

@ -152,21 +152,27 @@ suunto_eon_parser_samples_foreach (parser_t *abstract, sample_callback_t callbac
unsigned int time = 0, depth = 0; unsigned int time = 0, depth = 0;
unsigned int interval = data[3]; unsigned int interval = data[3];
unsigned int complete = 1;
unsigned int offset = 11; unsigned int offset = 11;
while (offset < size && data[offset] != 0x80) { while (offset < size && data[offset] != 0x80) {
parser_sample_value_t sample = {0}; parser_sample_value_t sample = {0};
unsigned char value = data[offset++]; unsigned char value = data[offset++];
if (value < 0x7d || value > 0x82) {
if (complete) {
// Time (seconds). // Time (seconds).
time += interval; time += interval;
sample.time = time; sample.time = time;
if (callback) callback (SAMPLE_TYPE_TIME, sample, userdata); if (callback) callback (SAMPLE_TYPE_TIME, sample, userdata);
complete = 0;
}
if (value < 0x7d || value > 0x82) {
// Depth (ft). // Depth (ft).
depth += (signed char) value; depth += (signed char) value;
sample.depth = depth * FEET; sample.depth = depth * FEET;
if (callback) callback (SAMPLE_TYPE_DEPTH, sample, userdata); if (callback) callback (SAMPLE_TYPE_DEPTH, sample, userdata);
complete = 1;
} else { } else {
// Event. // Event.
sample.event.time = 0; sample.event.time = 0;

8
src/suunto_vyper_parser.c
View File

@ -137,21 +137,27 @@ suunto_vyper_parser_samples_foreach (parser_t *abstract, sample_callback_t callb
unsigned int time = 0, depth = 0; unsigned int time = 0, depth = 0;
unsigned int interval = data[3]; unsigned int interval = data[3];
unsigned int complete = 1;
unsigned int offset = 14; unsigned int offset = 14;
while (offset < size && data[offset] != 0x80) { while (offset < size && data[offset] != 0x80) {
parser_sample_value_t sample = {0}; parser_sample_value_t sample = {0};
unsigned char value = data[offset++]; unsigned char value = data[offset++];
if (value < 0x79 || value > 0x87) {
if (complete) {
// Time (seconds). // Time (seconds).
time += interval; time += interval;
sample.time = time; sample.time = time;
if (callback) callback (SAMPLE_TYPE_TIME, sample, userdata); if (callback) callback (SAMPLE_TYPE_TIME, sample, userdata);
complete = 0;
}
if (value < 0x79 || value > 0x87) {
// Depth (ft). // Depth (ft).
depth += (signed char) value; depth += (signed char) value;
sample.depth = depth * FEET; sample.depth = depth * FEET;
if (callback) callback (SAMPLE_TYPE_DEPTH, sample, userdata); if (callback) callback (SAMPLE_TYPE_DEPTH, sample, userdata);
complete = 1;
} else { } else {
// Event. // Event.
sample.event.time = 0; sample.event.time = 0;