From d344d15a905576ca25a0585e6beb554388628bc6 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 22 Sep 2011 16:55:55 -0700 Subject: [PATCH] Improve libdivecomputer event printout Ignore surface events - they are meaningless anyway and just add noise. Print out other events properly, including correct time offset etc. We still don't actually *save* the events, but now it might be worth doign so. Signed-off-by: Linus Torvalds --- libdivecomputer.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/libdivecomputer.c b/libdivecomputer.c index d405253..b20acdb 100644 --- a/libdivecomputer.c +++ b/libdivecomputer.c @@ -120,17 +120,42 @@ static int parse_gasmixes(struct dive *dive, parser_t *parser, int ngases) static void handle_event(struct dive **divep, struct sample *sample, parser_sample_value_t value) { + int type, time; static const char *events[] = { "none", "deco", "rbt", "ascent", "ceiling", "workload", "transmitter", "violation", "bookmark", "surface", "safety stop", "gaschange", "safety stop (voluntary)", "safety stop (mandatory)", "deepstop", "ceiling (safety stop)", "unknown", "divetime", "maxdepth", - "OLF", "PO2", "airtime", "rgbm", "heading", "tissue level warning"}; + "OLF", "PO2", "airtime", "rgbm", "heading", "tissue level warning" + }; + const int nr_events = sizeof(events) / sizeof(const char *); + const char *name; - printf(" %s\n", - value.event.type, value.event.time, value.event.flags, value.event.value, events[value.event.type]); -} + /* + * Just ignore surface events. They are pointless. What "surface" + * means depends on the dive computer (and possibly even settings + * in the dive computer). It does *not* necessarily mean "depth 0", + * so don't even turn it into that. + */ + if (value.event.type == SAMPLE_EVENT_SURFACE) + return; + /* + * Other evens might be more interesting, but for now we just print them out. + */ + type = value.event.type; + name = "invalid event number"; + if (type < nr_events) + name = events[type]; + + time = value.event.time; + if (sample) + time += sample->time.seconds; + + printf(" \n", + type, time / 60, time % 60, + value.event.flags, value.event.value, name); +} void sample_cb(parser_sample_type_t type, parser_sample_value_t value, void *userdata) -- 2.43.0