From 3afc32b499a53406ffb86f55e41610b99218c69d Mon Sep 17 00:00:00 2001 From: Jef Driesen Date: Sun, 19 Dec 2010 10:14:58 +0100 Subject: [PATCH] Change the sample timestamps to the end of the interval. --- src/reefnet_sensus_parser.c | 2 +- src/reefnet_sensuspro_parser.c | 2 +- src/reefnet_sensusultra_parser.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/reefnet_sensus_parser.c b/src/reefnet_sensus_parser.c index 768f79d..4f667d1 100644 --- a/src/reefnet_sensus_parser.c +++ b/src/reefnet_sensus_parser.c @@ -175,6 +175,7 @@ reefnet_sensus_parser_samples_foreach (parser_t *abstract, sample_callback_t cal parser_sample_value_t sample = {0}; // Time (seconds) + time += interval; sample.time = time; if (callback) callback (SAMPLE_TYPE_TIME, sample, userdata); @@ -193,7 +194,6 @@ reefnet_sensus_parser_samples_foreach (parser_t *abstract, sample_callback_t cal // Current sample is complete. nsamples++; - time += interval; // The end of a dive is reached when 17 consecutive // depth samples of less than 3 feet have been found. diff --git a/src/reefnet_sensuspro_parser.c b/src/reefnet_sensuspro_parser.c index 0d9a57e..27ceb87 100644 --- a/src/reefnet_sensuspro_parser.c +++ b/src/reefnet_sensuspro_parser.c @@ -183,6 +183,7 @@ reefnet_sensuspro_parser_samples_foreach (parser_t *abstract, sample_callback_t parser_sample_value_t sample = {0}; // Time (seconds) + time += interval; sample.time = time; if (callback) callback (SAMPLE_TYPE_TIME, sample, userdata); @@ -194,7 +195,6 @@ reefnet_sensuspro_parser_samples_foreach (parser_t *abstract, sample_callback_t sample.depth = (depth * FSW - parser->atmospheric) / parser->hydrostatic; if (callback) callback (SAMPLE_TYPE_DEPTH, sample, userdata); - time += interval; offset += 2; } break; diff --git a/src/reefnet_sensusultra_parser.c b/src/reefnet_sensusultra_parser.c index e65ad76..5da94e0 100644 --- a/src/reefnet_sensusultra_parser.c +++ b/src/reefnet_sensusultra_parser.c @@ -179,6 +179,7 @@ reefnet_sensusultra_parser_samples_foreach (parser_t *abstract, sample_callback_ parser_sample_value_t sample = {0}; // Time (seconds) + time += interval; sample.time = time; if (callback) callback (SAMPLE_TYPE_TIME, sample, userdata); @@ -192,7 +193,6 @@ reefnet_sensusultra_parser_samples_foreach (parser_t *abstract, sample_callback_ sample.depth = (depth * BAR / 1000.0 - parser->atmospheric) / parser->hydrostatic; if (callback) callback (SAMPLE_TYPE_DEPTH, sample, userdata); - time += interval; offset += 4; } break;