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

Fix deco/ndl support for libdivecomputer

Browse source 
Several blatant mistakes prevented this from ever working.
Now we correctly record ndl / stoptime / stopdepth in every sample and no
longer issue bogus events.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2012-12-05 14:35:49 -08:00
parent afb53e387b
commit c1aacc05d1
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libdivecomputer.c
View file

@ -22,6 +22,7 @@
static const char *progress_bar_text = ""; static const char *progress_bar_text = "";
static double progress_bar_fraction = 0.0; static double progress_bar_fraction = 0.0;
static int stoptime, stopdepth, ndl;
static GError *error(const char *fmt, ...) static GError *error(const char *fmt, ...)
{ {
@ -87,7 +88,6 @@ static void handle_event(struct divecomputer *dc, struct sample *sample, dc_samp
}; };
const int nr_events = sizeof(events) / sizeof(const char *); const int nr_events = sizeof(events) / sizeof(const char *);
const char *name; const char *name;
static int stoptime = 0, stopdepth = 0, ndl = 0;
/* /*
* Just ignore surface events. They are pointless. What "surface" * Just ignore surface events. They are pointless. What "surface"
* means depends on the dive computer (and possibly even settings * means depends on the dive computer (and possibly even settings
@ -105,7 +105,7 @@ static void handle_event(struct divecomputer *dc, struct sample *sample, dc_samp
/* packed value - time in seconds in high 16 bit /* packed value - time in seconds in high 16 bit
* depth in m(!) in low 16 bits */ * depth in m(!) in low 16 bits */
stoptime = value.event.value >> 16; stoptime = value.event.value >> 16;
stopdepth = (value.event.value && 0xFFFF) * 1000; stopdepth = (value.event.value & 0xFFFF) * 1000;
ndl = 0; ndl = 0;
} }
if (value.event.type == SAMPLE_EVENT_NDL) { if (value.event.type == SAMPLE_EVENT_NDL) {
@ -113,9 +113,9 @@ static void handle_event(struct divecomputer *dc, struct sample *sample, dc_samp
stoptime = 0; stoptime = 0;
ndl = value.event.value; ndl = value.event.value;
} }
sample->stoptime.seconds = stoptime; if (value.event.type == SAMPLE_EVENT_DECOSTOP || value.event.type == SAMPLE_EVENT_NDL)
sample->stopdepth.mm = stopdepth; /* don't create a Subsurface event for these */
sample->ndl.seconds = ndl; return;
#endif #endif
/* /*
@ -148,6 +148,11 @@ sample_cb(dc_sample_type_t type, dc_sample_value_t value, void *userdata)
switch (type) { switch (type) {
case DC_SAMPLE_TIME: case DC_SAMPLE_TIME:
if (sample) {
sample->ndl.seconds = ndl;
sample->stoptime.seconds = stoptime;
sample->stopdepth.mm = stopdepth;
}
sample = prepare_sample(dc); sample = prepare_sample(dc);
sample->time.seconds = value.time; sample->time.seconds = value.time;
finish_sample(dc); finish_sample(dc);
@ -290,6 +295,9 @@ static int dive_cb(const unsigned char *data, unsigned int size,
struct tm tm; struct tm tm;
struct dive *dive; struct dive *dive;
/* reset the deco / ndl data */
ndl = stoptime = stopdepth = 0;
rc = create_parser(devdata, &parser); rc = create_parser(devdata, &parser);
if (rc != DC_STATUS_SUCCESS) { if (rc != DC_STATUS_SUCCESS) {
dev_info(devdata, _("Unable to create parser for %s %s"), devdata->vendor, devdata->product); dev_info(devdata, _("Unable to create parser for %s %s"), devdata->vendor, devdata->product);