summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-10-04 12:13:10 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-10-04 12:13:10 +0100
commita39038a902a88cc0ad5d71362342fe1aa0071e6b (patch)
tree5aaa8ca756b4cedf446e3990e6a1e8e610dc449c
parent76b31aa76ac3b29f3c41bc6ac72d6be524170ff3 (diff)
downloadsubsurface-a39038a902a88cc0ad5d71362342fe1aa0071e6b.tar.gz
In free dive mode split dives with only a 10 second surface interval
If the dive computer tells us that this was free diving we should be a lot more aggressive splitting dives. For scuba dives a minute seems more reasonable (to avoid splitting dives when you pop to the surface to get the bearing and continue the dive after a few second). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--dive.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/dive.c b/dive.c
index bbb1ff4ac..ea97833ea 100644
--- a/dive.c
+++ b/dive.c
@@ -2941,6 +2941,15 @@ static int split_dive_at(struct dive *dive, int a, int b)
return 1;
}
+/* in freedive mode we split for as little as 10 seconds on the surface,
+ * otherwise we use a minute */
+static bool should_split(struct divecomputer *dc, int t1, int t2)
+{
+ int threshold = dc->divemode == FREEDIVE ? 10 : 60;
+
+ return t2 - t1 >= threshold;
+}
+
/*
* Try to split a dive into multiple dives at a surface interval point.
*
@@ -2983,7 +2992,7 @@ int split_dive(struct dive *dive)
// the surface start.
if (!surface_start)
continue;
- if (sample->time.seconds - dc->sample[surface_start].time.seconds < 60)
+ if (!should_split(dc, dc->sample[surface_start].time.seconds, sample[i - 1].time.seconds))
continue;
return split_dive_at(dive, surface_start, i-1);