summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Michael Andreen <harv@ruin.nu>2013-07-26 20:51:27 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-09-19 13:31:31 -0500
commit169d9e9c015efa779ec67abdfb27ca6c462c3d63 (patch)
treea70df71e4d31d26ce0bfa04936eda84dc7f66d21
parent583cea0e2ca78a9dda6d2e6f4ba4d0af3372b435 (diff)
downloadsubsurface-169d9e9c015efa779ec67abdfb27ca6c462c3d63.tar.gz
Identify below floor event type properly.
This event is on when accumulating deco time. Once you reach the floor deco time will start decreasing and the event will stop. Going below the floor again will re-activate the event. Also identify event type 13 in DM4 imports as airtime. Signed-off-by: Michael Andreen <harv@ruin.nu> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--libdivecomputer.c2
-rw-r--r--parse-xml.c8
2 files changed, 9 insertions, 1 deletions
diff --git a/libdivecomputer.c b/libdivecomputer.c
index 0a8ba0487..6f2f1f66c 100644
--- a/libdivecomputer.c
+++ b/libdivecomputer.c
@@ -153,7 +153,7 @@ static void handle_event(struct divecomputer *dc, struct sample *sample, dc_samp
N_("none"), N_("deco stop"), N_("rbt"), N_("ascent"), N_("ceiling"), N_("workload"),
N_("transmitter"), N_("violation"), N_("bookmark"), N_("surface"), N_("safety stop"),
N_("gaschange"), N_("safety stop (voluntary)"), N_("safety stop (mandatory)"),
- N_("deepstop"), N_("ceiling (safety stop)"), N_("unknown"), N_("divetime"),
+ N_("deepstop"), N_("ceiling (safety stop)"), N_("below floor"), N_("divetime"),
N_("maxdepth"), N_("OLF"), N_("PO2"), N_("airtime"), N_("rgbm"), N_("heading"),
N_("tissue level warning"), N_("gaschange"), N_("non stop time")
};
diff --git a/parse-xml.c b/parse-xml.c
index 5c031fcac..370388f4f 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -1635,6 +1635,10 @@ extern int dm4_events(void *handle, int columns, char **data, char **column)
/* 6 Mandatory safety stop ceiling error */
cur_event.name = strdup("violation");
break;
+ case 7:
+ /* 7 Below deco floor */
+ cur_event.name = strdup("below floor");
+ break;
case 8:
/* 8 Dive time alarm */
cur_event.name = strdup("divetime");
@@ -1653,6 +1657,10 @@ extern int dm4_events(void *handle, int columns, char **data, char **column)
/* 12 High ppO2 */
cur_event.name = strdup("PO2");
break;
+ case 13:
+ /* 13 Air time */
+ cur_event.name = strdup("airtime");
+ break;
case 18:
/* 18 Ceiling error */
cur_event.name = strdup("ceiling");