X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=libdivecomputer.c;h=806ea651f108497f748e4b56f6d6252fdc821817;hb=3a77eb85101a5fb1dc186b88a3a02d2ae27690c7;hp=d405253d43a6128363fd8e6862ae7baa615ca4e9;hpb=d463cace5ee1ac38928921ea4d47b6e38ce29c45;p=ext%2Fsubsurface.git

diff --git a/libdivecomputer.c b/libdivecomputer.c
index d405253..806ea65 100644
--- a/libdivecomputer.c
+++ b/libdivecomputer.c
@@ -118,19 +118,42 @@ static int parse_gasmixes(struct dive *dive, parser_t *parser, int ngases)
 	return PARSER_STATUS_SUCCESS;
 }
 
-static void handle_event(struct dive **divep, struct sample *sample, parser_sample_value_t value)
+static void handle_event(struct dive *dive, 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("   <event type=\"%u\" time=\"%u\" flags=\"%u\" value=\"%u\">%s</event>\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;
+
+	add_event(dive, time, type, value.event.flags, value.event.value, name);
+}
 
 void
 sample_cb(parser_sample_type_t type, parser_sample_value_t value, void *userdata)
@@ -163,7 +186,7 @@ sample_cb(parser_sample_type_t type, parser_sample_value_t value, void *userdata
 		sample->temperature.mkelvin = (value.temperature + 273.15) * 1000 + 0.5;
 		break;
 	case SAMPLE_TYPE_EVENT:
-		handle_event(divep, sample, value);
+		handle_event(dive, sample, value);
 		break;
 	case SAMPLE_TYPE_RBT:
 		printf("   <rbt>%u</rbt>\n", value.rbt);